From 7b72774890c37c9fa0c2499e26ec5154e31a2000 Mon Sep 17 00:00:00 2001 From: Robbie Averill Date: Wed, 29 Nov 2017 15:13:46 +1300 Subject: [PATCH] FIX Update directory structure for PSR-4 compatibility and rename "code" to "src" --- .scrutinizer.yml | 2 +- .travis.yml | 2 +- composer.json | 2 +- phpunit.xml.dist | 2 +- .../Search/Captures}/SearchManipulateCapture_MySQLDatabase.php | 0 .../Captures}/SearchManipulateCapture_PostgreSQLDatabase.php | 0 .../Captures}/SearchManipulateCapture_SQLite3Database.php | 0 {code/search => src/Search}/FullTextSearch.php | 0 {code/search/indexes => src/Search/Indexes}/SearchIndex.php | 0 .../search/indexes => src/Search/Indexes}/SearchIndex_Null.php | 0 .../indexes => src/Search/Indexes}/SearchIndex_Recording.php | 0 .../Search/Processors}/SearchUpdateBatchedProcessor.php | 0 .../Search/Processors}/SearchUpdateCommitJobProcessor.php | 0 .../Search/Processors}/SearchUpdateImmediateProcessor.php | 0 .../Search/Processors}/SearchUpdateProcessor.php | 0 .../Search/Processors}/SearchUpdateQueuedJobProcessor.php | 0 {code/search/queries => src/Search/Queries}/SearchQuery.php | 0 .../search/queries => src/Search/Queries}/SearchQuery_Range.php | 0 {code/search => src/Search}/SearchIntrospection.php | 0 {code/search/updaters => src/Search/Updaters}/SearchUpdater.php | 0 .../Updaters}/SearchUpdater_BindManipulationCaptureFilter.php | 0 .../Search/Updaters}/SearchUpdater_ObjectHandler.php | 0 {code/search/variants => src/Search/Variants}/SearchVariant.php | 0 .../Search/Variants}/SearchVariantSiteTreeSubsitesPolyhome.php | 0 .../variants => src/Search/Variants}/SearchVariantSubsites.php | 0 .../variants => src/Search/Variants}/SearchVariantVersioned.php | 0 .../variants => src/Search/Variants}/SearchVariant_Caller.php | 0 .../handlers => src/Solr/Reindex/Handlers}/SolrReindexBase.php | 0 .../Solr/Reindex/Handlers}/SolrReindexHandler.php | 0 .../Solr/Reindex/Handlers}/SolrReindexImmediateHandler.php | 0 .../Solr/Reindex/Handlers}/SolrReindexQueuedHandler.php | 0 .../Solr/Reindex/Jobs}/SolrReindexGroupQueuedJob.php | 0 .../jobs => src/Solr/Reindex/Jobs}/SolrReindexQueuedJob.php | 0 .../jobs => src/Solr/Reindex/Jobs}/SolrReindexQueuedJobBase.php | 0 {code/solr/services => src/Solr/Services}/Solr3Service.php | 0 {code/solr/services => src/Solr/Services}/Solr3Service_Core.php | 0 {code/solr/services => src/Solr/Services}/Solr4Service.php | 0 {code/solr/services => src/Solr/Services}/Solr4Service_Core.php | 0 {code/solr/services => src/Solr/Services}/SolrService.php | 0 {code/solr/services => src/Solr/Services}/SolrService_Core.php | 0 {code/solr => src/Solr}/Solr.php | 0 {code/solr => src/Solr}/SolrIndex.php | 0 {code/solr/stores => src/Solr/Stores}/SolrConfigStore.php | 0 {code/solr/stores => src/Solr/Stores}/SolrConfigStore_File.php | 0 .../solr/stores => src/Solr/Stores}/SolrConfigStore_WebDAV.php | 0 {code/solr/tasks => src/Solr/Tasks}/Solr_BuildTask.php | 0 {code/solr/tasks => src/Solr/Tasks}/Solr_Configure.php | 0 {code/solr/tasks => src/Solr/Tasks}/Solr_Reindex.php | 0 {code/utils => src/Utils}/CombinationsArrayIterator.php | 0 {code/utils/logging => src/Utils/Logging}/MonologFactory.php | 0 .../utils/logging => src/Utils/Logging}/QueuedJobLogHandler.php | 0 {code/utils/logging => src/Utils/Logging}/SearchLogFactory.php | 0 {code/utils => src/Utils}/MultipleArrayIterator.php | 0 {code/utils => src/Utils}/WebDAV.php | 0 54 files changed, 4 insertions(+), 4 deletions(-) rename {code/search/captures => src/Search/Captures}/SearchManipulateCapture_MySQLDatabase.php (100%) rename {code/search/captures => src/Search/Captures}/SearchManipulateCapture_PostgreSQLDatabase.php (100%) rename {code/search/captures => src/Search/Captures}/SearchManipulateCapture_SQLite3Database.php (100%) rename {code/search => src/Search}/FullTextSearch.php (100%) rename {code/search/indexes => src/Search/Indexes}/SearchIndex.php (100%) rename {code/search/indexes => src/Search/Indexes}/SearchIndex_Null.php (100%) rename {code/search/indexes => src/Search/Indexes}/SearchIndex_Recording.php (100%) rename {code/search/processors => src/Search/Processors}/SearchUpdateBatchedProcessor.php (100%) rename {code/search/processors => src/Search/Processors}/SearchUpdateCommitJobProcessor.php (100%) rename {code/search/processors => src/Search/Processors}/SearchUpdateImmediateProcessor.php (100%) rename {code/search/processors => src/Search/Processors}/SearchUpdateProcessor.php (100%) rename {code/search/processors => src/Search/Processors}/SearchUpdateQueuedJobProcessor.php (100%) rename {code/search/queries => src/Search/Queries}/SearchQuery.php (100%) rename {code/search/queries => src/Search/Queries}/SearchQuery_Range.php (100%) rename {code/search => src/Search}/SearchIntrospection.php (100%) rename {code/search/updaters => src/Search/Updaters}/SearchUpdater.php (100%) rename {code/search/updaters => src/Search/Updaters}/SearchUpdater_BindManipulationCaptureFilter.php (100%) rename {code/search/updaters => src/Search/Updaters}/SearchUpdater_ObjectHandler.php (100%) rename {code/search/variants => src/Search/Variants}/SearchVariant.php (100%) rename {code/search/variants => src/Search/Variants}/SearchVariantSiteTreeSubsitesPolyhome.php (100%) rename {code/search/variants => src/Search/Variants}/SearchVariantSubsites.php (100%) rename {code/search/variants => src/Search/Variants}/SearchVariantVersioned.php (100%) rename {code/search/variants => src/Search/Variants}/SearchVariant_Caller.php (100%) rename {code/solr/reindex/handlers => src/Solr/Reindex/Handlers}/SolrReindexBase.php (100%) rename {code/solr/reindex/handlers => src/Solr/Reindex/Handlers}/SolrReindexHandler.php (100%) rename {code/solr/reindex/handlers => src/Solr/Reindex/Handlers}/SolrReindexImmediateHandler.php (100%) rename {code/solr/reindex/handlers => src/Solr/Reindex/Handlers}/SolrReindexQueuedHandler.php (100%) rename {code/solr/reindex/jobs => src/Solr/Reindex/Jobs}/SolrReindexGroupQueuedJob.php (100%) rename {code/solr/reindex/jobs => src/Solr/Reindex/Jobs}/SolrReindexQueuedJob.php (100%) rename {code/solr/reindex/jobs => src/Solr/Reindex/Jobs}/SolrReindexQueuedJobBase.php (100%) rename {code/solr/services => src/Solr/Services}/Solr3Service.php (100%) rename {code/solr/services => src/Solr/Services}/Solr3Service_Core.php (100%) rename {code/solr/services => src/Solr/Services}/Solr4Service.php (100%) rename {code/solr/services => src/Solr/Services}/Solr4Service_Core.php (100%) rename {code/solr/services => src/Solr/Services}/SolrService.php (100%) rename {code/solr/services => src/Solr/Services}/SolrService_Core.php (100%) rename {code/solr => src/Solr}/Solr.php (100%) rename {code/solr => src/Solr}/SolrIndex.php (100%) rename {code/solr/stores => src/Solr/Stores}/SolrConfigStore.php (100%) rename {code/solr/stores => src/Solr/Stores}/SolrConfigStore_File.php (100%) rename {code/solr/stores => src/Solr/Stores}/SolrConfigStore_WebDAV.php (100%) rename {code/solr/tasks => src/Solr/Tasks}/Solr_BuildTask.php (100%) rename {code/solr/tasks => src/Solr/Tasks}/Solr_Configure.php (100%) rename {code/solr/tasks => src/Solr/Tasks}/Solr_Reindex.php (100%) rename {code/utils => src/Utils}/CombinationsArrayIterator.php (100%) rename {code/utils/logging => src/Utils/Logging}/MonologFactory.php (100%) rename {code/utils/logging => src/Utils/Logging}/QueuedJobLogHandler.php (100%) rename {code/utils/logging => src/Utils/Logging}/SearchLogFactory.php (100%) rename {code/utils => src/Utils}/MultipleArrayIterator.php (100%) rename {code/utils => src/Utils}/WebDAV.php (100%) diff --git a/.scrutinizer.yml b/.scrutinizer.yml index 61b0c9f..de09355 100644 --- a/.scrutinizer.yml +++ b/.scrutinizer.yml @@ -6,4 +6,4 @@ checks: duplication: true filter: - paths: [code/*, tests/*] + paths: [src/*, tests/*] diff --git a/.travis.yml b/.travis.yml index e16aa32..425ed8a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -28,7 +28,7 @@ before_script: script: - if [[ $PHPUNIT_TEST ]]; then vendor/bin/phpunit; fi - if [[ $PHPUNIT_COVERAGE_TEST ]]; then phpdbg -qrr vendor/bin/phpunit --coverage-clover=coverage.xml; fi - - if [[ $PHPCS_TEST ]]; then vendor/bin/phpcs --standard=vendor/silverstripe/framework/phpcs.xml.dist code tests; fi + - if [[ $PHPCS_TEST ]]; then vendor/bin/phpcs --standard=vendor/silverstripe/framework/phpcs.xml.dist src tests; fi after_success: - if [[ $PHPUNIT_COVERAGE_TEST ]]; then bash <(curl -s https://codecov.io/bash) -f coverage.xml; fi diff --git a/composer.json b/composer.json index 74580b0..b33751c 100644 --- a/composer.json +++ b/composer.json @@ -31,7 +31,7 @@ }, "autoload": { "psr-4": { - "SilverStripe\\FullTextSearch\\": "code/", + "SilverStripe\\FullTextSearch\\": "src/", "SilverStripe\\FullTextSearch\\Tests\\": "tests/" } }, diff --git a/phpunit.xml.dist b/phpunit.xml.dist index 737b400..c33da18 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -5,7 +5,7 @@ - code/ + src/ tests/ diff --git a/code/search/captures/SearchManipulateCapture_MySQLDatabase.php b/src/Search/Captures/SearchManipulateCapture_MySQLDatabase.php similarity index 100% rename from code/search/captures/SearchManipulateCapture_MySQLDatabase.php rename to src/Search/Captures/SearchManipulateCapture_MySQLDatabase.php diff --git a/code/search/captures/SearchManipulateCapture_PostgreSQLDatabase.php b/src/Search/Captures/SearchManipulateCapture_PostgreSQLDatabase.php similarity index 100% rename from code/search/captures/SearchManipulateCapture_PostgreSQLDatabase.php rename to src/Search/Captures/SearchManipulateCapture_PostgreSQLDatabase.php diff --git a/code/search/captures/SearchManipulateCapture_SQLite3Database.php b/src/Search/Captures/SearchManipulateCapture_SQLite3Database.php similarity index 100% rename from code/search/captures/SearchManipulateCapture_SQLite3Database.php rename to src/Search/Captures/SearchManipulateCapture_SQLite3Database.php diff --git a/code/search/FullTextSearch.php b/src/Search/FullTextSearch.php similarity index 100% rename from code/search/FullTextSearch.php rename to src/Search/FullTextSearch.php diff --git a/code/search/indexes/SearchIndex.php b/src/Search/Indexes/SearchIndex.php similarity index 100% rename from code/search/indexes/SearchIndex.php rename to src/Search/Indexes/SearchIndex.php diff --git a/code/search/indexes/SearchIndex_Null.php b/src/Search/Indexes/SearchIndex_Null.php similarity index 100% rename from code/search/indexes/SearchIndex_Null.php rename to src/Search/Indexes/SearchIndex_Null.php diff --git a/code/search/indexes/SearchIndex_Recording.php b/src/Search/Indexes/SearchIndex_Recording.php similarity index 100% rename from code/search/indexes/SearchIndex_Recording.php rename to src/Search/Indexes/SearchIndex_Recording.php diff --git a/code/search/processors/SearchUpdateBatchedProcessor.php b/src/Search/Processors/SearchUpdateBatchedProcessor.php similarity index 100% rename from code/search/processors/SearchUpdateBatchedProcessor.php rename to src/Search/Processors/SearchUpdateBatchedProcessor.php diff --git a/code/search/processors/SearchUpdateCommitJobProcessor.php b/src/Search/Processors/SearchUpdateCommitJobProcessor.php similarity index 100% rename from code/search/processors/SearchUpdateCommitJobProcessor.php rename to src/Search/Processors/SearchUpdateCommitJobProcessor.php diff --git a/code/search/processors/SearchUpdateImmediateProcessor.php b/src/Search/Processors/SearchUpdateImmediateProcessor.php similarity index 100% rename from code/search/processors/SearchUpdateImmediateProcessor.php rename to src/Search/Processors/SearchUpdateImmediateProcessor.php diff --git a/code/search/processors/SearchUpdateProcessor.php b/src/Search/Processors/SearchUpdateProcessor.php similarity index 100% rename from code/search/processors/SearchUpdateProcessor.php rename to src/Search/Processors/SearchUpdateProcessor.php diff --git a/code/search/processors/SearchUpdateQueuedJobProcessor.php b/src/Search/Processors/SearchUpdateQueuedJobProcessor.php similarity index 100% rename from code/search/processors/SearchUpdateQueuedJobProcessor.php rename to src/Search/Processors/SearchUpdateQueuedJobProcessor.php diff --git a/code/search/queries/SearchQuery.php b/src/Search/Queries/SearchQuery.php similarity index 100% rename from code/search/queries/SearchQuery.php rename to src/Search/Queries/SearchQuery.php diff --git a/code/search/queries/SearchQuery_Range.php b/src/Search/Queries/SearchQuery_Range.php similarity index 100% rename from code/search/queries/SearchQuery_Range.php rename to src/Search/Queries/SearchQuery_Range.php diff --git a/code/search/SearchIntrospection.php b/src/Search/SearchIntrospection.php similarity index 100% rename from code/search/SearchIntrospection.php rename to src/Search/SearchIntrospection.php diff --git a/code/search/updaters/SearchUpdater.php b/src/Search/Updaters/SearchUpdater.php similarity index 100% rename from code/search/updaters/SearchUpdater.php rename to src/Search/Updaters/SearchUpdater.php diff --git a/code/search/updaters/SearchUpdater_BindManipulationCaptureFilter.php b/src/Search/Updaters/SearchUpdater_BindManipulationCaptureFilter.php similarity index 100% rename from code/search/updaters/SearchUpdater_BindManipulationCaptureFilter.php rename to src/Search/Updaters/SearchUpdater_BindManipulationCaptureFilter.php diff --git a/code/search/updaters/SearchUpdater_ObjectHandler.php b/src/Search/Updaters/SearchUpdater_ObjectHandler.php similarity index 100% rename from code/search/updaters/SearchUpdater_ObjectHandler.php rename to src/Search/Updaters/SearchUpdater_ObjectHandler.php diff --git a/code/search/variants/SearchVariant.php b/src/Search/Variants/SearchVariant.php similarity index 100% rename from code/search/variants/SearchVariant.php rename to src/Search/Variants/SearchVariant.php diff --git a/code/search/variants/SearchVariantSiteTreeSubsitesPolyhome.php b/src/Search/Variants/SearchVariantSiteTreeSubsitesPolyhome.php similarity index 100% rename from code/search/variants/SearchVariantSiteTreeSubsitesPolyhome.php rename to src/Search/Variants/SearchVariantSiteTreeSubsitesPolyhome.php diff --git a/code/search/variants/SearchVariantSubsites.php b/src/Search/Variants/SearchVariantSubsites.php similarity index 100% rename from code/search/variants/SearchVariantSubsites.php rename to src/Search/Variants/SearchVariantSubsites.php diff --git a/code/search/variants/SearchVariantVersioned.php b/src/Search/Variants/SearchVariantVersioned.php similarity index 100% rename from code/search/variants/SearchVariantVersioned.php rename to src/Search/Variants/SearchVariantVersioned.php diff --git a/code/search/variants/SearchVariant_Caller.php b/src/Search/Variants/SearchVariant_Caller.php similarity index 100% rename from code/search/variants/SearchVariant_Caller.php rename to src/Search/Variants/SearchVariant_Caller.php diff --git a/code/solr/reindex/handlers/SolrReindexBase.php b/src/Solr/Reindex/Handlers/SolrReindexBase.php similarity index 100% rename from code/solr/reindex/handlers/SolrReindexBase.php rename to src/Solr/Reindex/Handlers/SolrReindexBase.php diff --git a/code/solr/reindex/handlers/SolrReindexHandler.php b/src/Solr/Reindex/Handlers/SolrReindexHandler.php similarity index 100% rename from code/solr/reindex/handlers/SolrReindexHandler.php rename to src/Solr/Reindex/Handlers/SolrReindexHandler.php diff --git a/code/solr/reindex/handlers/SolrReindexImmediateHandler.php b/src/Solr/Reindex/Handlers/SolrReindexImmediateHandler.php similarity index 100% rename from code/solr/reindex/handlers/SolrReindexImmediateHandler.php rename to src/Solr/Reindex/Handlers/SolrReindexImmediateHandler.php diff --git a/code/solr/reindex/handlers/SolrReindexQueuedHandler.php b/src/Solr/Reindex/Handlers/SolrReindexQueuedHandler.php similarity index 100% rename from code/solr/reindex/handlers/SolrReindexQueuedHandler.php rename to src/Solr/Reindex/Handlers/SolrReindexQueuedHandler.php diff --git a/code/solr/reindex/jobs/SolrReindexGroupQueuedJob.php b/src/Solr/Reindex/Jobs/SolrReindexGroupQueuedJob.php similarity index 100% rename from code/solr/reindex/jobs/SolrReindexGroupQueuedJob.php rename to src/Solr/Reindex/Jobs/SolrReindexGroupQueuedJob.php diff --git a/code/solr/reindex/jobs/SolrReindexQueuedJob.php b/src/Solr/Reindex/Jobs/SolrReindexQueuedJob.php similarity index 100% rename from code/solr/reindex/jobs/SolrReindexQueuedJob.php rename to src/Solr/Reindex/Jobs/SolrReindexQueuedJob.php diff --git a/code/solr/reindex/jobs/SolrReindexQueuedJobBase.php b/src/Solr/Reindex/Jobs/SolrReindexQueuedJobBase.php similarity index 100% rename from code/solr/reindex/jobs/SolrReindexQueuedJobBase.php rename to src/Solr/Reindex/Jobs/SolrReindexQueuedJobBase.php diff --git a/code/solr/services/Solr3Service.php b/src/Solr/Services/Solr3Service.php similarity index 100% rename from code/solr/services/Solr3Service.php rename to src/Solr/Services/Solr3Service.php diff --git a/code/solr/services/Solr3Service_Core.php b/src/Solr/Services/Solr3Service_Core.php similarity index 100% rename from code/solr/services/Solr3Service_Core.php rename to src/Solr/Services/Solr3Service_Core.php diff --git a/code/solr/services/Solr4Service.php b/src/Solr/Services/Solr4Service.php similarity index 100% rename from code/solr/services/Solr4Service.php rename to src/Solr/Services/Solr4Service.php diff --git a/code/solr/services/Solr4Service_Core.php b/src/Solr/Services/Solr4Service_Core.php similarity index 100% rename from code/solr/services/Solr4Service_Core.php rename to src/Solr/Services/Solr4Service_Core.php diff --git a/code/solr/services/SolrService.php b/src/Solr/Services/SolrService.php similarity index 100% rename from code/solr/services/SolrService.php rename to src/Solr/Services/SolrService.php diff --git a/code/solr/services/SolrService_Core.php b/src/Solr/Services/SolrService_Core.php similarity index 100% rename from code/solr/services/SolrService_Core.php rename to src/Solr/Services/SolrService_Core.php diff --git a/code/solr/Solr.php b/src/Solr/Solr.php similarity index 100% rename from code/solr/Solr.php rename to src/Solr/Solr.php diff --git a/code/solr/SolrIndex.php b/src/Solr/SolrIndex.php similarity index 100% rename from code/solr/SolrIndex.php rename to src/Solr/SolrIndex.php diff --git a/code/solr/stores/SolrConfigStore.php b/src/Solr/Stores/SolrConfigStore.php similarity index 100% rename from code/solr/stores/SolrConfigStore.php rename to src/Solr/Stores/SolrConfigStore.php diff --git a/code/solr/stores/SolrConfigStore_File.php b/src/Solr/Stores/SolrConfigStore_File.php similarity index 100% rename from code/solr/stores/SolrConfigStore_File.php rename to src/Solr/Stores/SolrConfigStore_File.php diff --git a/code/solr/stores/SolrConfigStore_WebDAV.php b/src/Solr/Stores/SolrConfigStore_WebDAV.php similarity index 100% rename from code/solr/stores/SolrConfigStore_WebDAV.php rename to src/Solr/Stores/SolrConfigStore_WebDAV.php diff --git a/code/solr/tasks/Solr_BuildTask.php b/src/Solr/Tasks/Solr_BuildTask.php similarity index 100% rename from code/solr/tasks/Solr_BuildTask.php rename to src/Solr/Tasks/Solr_BuildTask.php diff --git a/code/solr/tasks/Solr_Configure.php b/src/Solr/Tasks/Solr_Configure.php similarity index 100% rename from code/solr/tasks/Solr_Configure.php rename to src/Solr/Tasks/Solr_Configure.php diff --git a/code/solr/tasks/Solr_Reindex.php b/src/Solr/Tasks/Solr_Reindex.php similarity index 100% rename from code/solr/tasks/Solr_Reindex.php rename to src/Solr/Tasks/Solr_Reindex.php diff --git a/code/utils/CombinationsArrayIterator.php b/src/Utils/CombinationsArrayIterator.php similarity index 100% rename from code/utils/CombinationsArrayIterator.php rename to src/Utils/CombinationsArrayIterator.php diff --git a/code/utils/logging/MonologFactory.php b/src/Utils/Logging/MonologFactory.php similarity index 100% rename from code/utils/logging/MonologFactory.php rename to src/Utils/Logging/MonologFactory.php diff --git a/code/utils/logging/QueuedJobLogHandler.php b/src/Utils/Logging/QueuedJobLogHandler.php similarity index 100% rename from code/utils/logging/QueuedJobLogHandler.php rename to src/Utils/Logging/QueuedJobLogHandler.php diff --git a/code/utils/logging/SearchLogFactory.php b/src/Utils/Logging/SearchLogFactory.php similarity index 100% rename from code/utils/logging/SearchLogFactory.php rename to src/Utils/Logging/SearchLogFactory.php diff --git a/code/utils/MultipleArrayIterator.php b/src/Utils/MultipleArrayIterator.php similarity index 100% rename from code/utils/MultipleArrayIterator.php rename to src/Utils/MultipleArrayIterator.php diff --git a/code/utils/WebDAV.php b/src/Utils/WebDAV.php similarity index 100% rename from code/utils/WebDAV.php rename to src/Utils/WebDAV.php