Merge branch 'compat/4' into compat4/btasker

code/search/SearchIntrospection.php

@@ -1,5 +1,5 @@
 <?php
-
+namespace SilverStripe\FullTextSearch\Search;
 use SilverStripe\Core\ClassInfo;
 use SilverStripe\ORM\DataObject;
 /**

code/search/SearchQuery.php

@@ -1,5 +1,5 @@
 <?php
-
+namespace SilverStripe\FullTextSearch\Search;
 /**
  * Represents a search query
  *

code/search/SearchUpdater.php

@@ -1,5 +1,5 @@
 <?php
-
+namespace SilverStripe\FullTextSearch\Search;
 /**
  * This class is responsible for capturing changes to DataObjects and triggering index updates of the resulting dirty index
  * items.

code/search/SearchVariant.php

@@ -1,5 +1,5 @@
 <?php
-
+namespace SilverStripe\FullTextSearch\Search;
 use SilverStripe\Core\ClassInfo;
 /**
  * A Search Variant handles decorators and other situations where the items to reindex or search through are modified

code/search/SearchVariantSiteTreeSubsitesPolyhome.php

@@ -1,4 +1,5 @@
 <?php
+namespace SilverStripe\FullTextSearch\Search;
 
 class SearchVariantSiteTreeSubsitesPolyhome extends SearchVariant
 {

code/search/SearchVariantSubsites.php

@@ -1,5 +1,5 @@
 <?php
-
+namespace SilverStripe\FullTextSearch\Search;
 class SearchVariantSubsites extends SearchVariant
 {
     public function appliesToEnvironment()

code/search/SearchVariantVersioned.php

@@ -1,5 +1,5 @@
 <?php
-
+namespace SilverStripe\FullTextSearch\Search;
 class SearchVariantVersioned extends SearchVariant
 {
     public function appliesToEnvironment()

code/search/processors/SearchUpdateBatchedProcessor.php

@@ -1,5 +1,5 @@
 <?php
-
+namespace SilverStripe\FullTextSearch\Search\Processors;
 /**
  * Provides batching of search updates
  */

code/search/processors/SearchUpdateCommitJobProcessor.php

@@ -1,5 +1,5 @@
 <?php
-
+namespace SilverStripe\FullTextSearch\Search\Processors;
 if (!interface_exists('QueuedJob')) {
     return;
 }

code/search/processors/SearchUpdateImmediateProcessor.php

@@ -1,5 +1,5 @@
 <?php
-
+namespace SilverStripe\FullTextSearch\Search\Processors;
 class SearchUpdateImmediateProcessor extends SearchUpdateProcessor
 {
     public function triggerProcessing()

code/search/processors/SearchUpdateMessageQueueProcessor.php

@@ -1,5 +1,5 @@
 <?php
-
+namespace SilverStripe\FullTextSearch\Search\Processors;
 class SearchUpdateMessageQueueProcessor extends SearchUpdateProcessor
 {
     /**

code/search/processors/SearchUpdateProcessor.php

@@ -1,5 +1,5 @@
 <?php
-
+namespace SilverStripe\FullTextSearch\Search\Processors;
 abstract class SearchUpdateProcessor
 {
     /**

code/search/processors/SearchUpdateQueuedJobProcessor.php

@@ -1,5 +1,5 @@
 <?php
-
+namespace SilverStripe\FullTextSearch\Search\Processors;
 if (!interface_exists('QueuedJob')) {
     return;
 }

code/solr/Solr.php

@@ -1,5 +1,5 @@
 <?php
-
+namespace SilverStripe\FullTextSearch\Solr;
 use Monolog\Formatter\LineFormatter;
 use Monolog\Handler\StreamHandler;
 use Monolog\Logger;

code/solr/Solr3Service.php

@@ -1,5 +1,5 @@
 <?php
-
+namespace SilverStripe\FullTextSearch\Solr;
 class Solr3Service_Core extends SolrService_Core
 {
 }

code/solr/Solr4Service.php

@@ -1,5 +1,5 @@
 <?php
-
+namespace SilverStripe\FullTextSearch\Solr;
 class Solr4Service_Core extends SolrService_Core
 {
     /**

code/solr/SolrConfigStore.php

@@ -1,5 +1,5 @@
 <?php
-
+namespace SilverStripe\FullTextSearch\Solr;
 /**
  * Class SolrConfigStore
  *

code/solr/SolrIndex.php

@@ -1,5 +1,5 @@
 <?php
-
+namespace SilverStripe\FullTextSearch\Solr;
 Solr::include_client_api();
 
 use SilverStripe\Dev\BuildTask;

code/solr/SolrService.php

@@ -1,7 +1,8 @@
 <?php
-
+namespace SilverStripe\FullTextSearch\Solr;
 Solr::include_client_api();
 use SilverStripe\Core\Config\Config;
+use \Apache_Solr_Service;
 
 /**
  * The API for accessing a specific core of a Solr server. Exactly the same as Apache_Solr_Service for now.

code/solr/reindex/handlers/SolrReindexBase.php

@@ -1,5 +1,5 @@
 <?php
-
+namespace SilverStripe\FullTextSearch\Solr\Reindex\Handlers;
 use Psr\Log\LoggerInterface;
 
 /**

code/solr/reindex/handlers/SolrReindexHandler.php

@@ -1,5 +1,5 @@
 <?php
-
+namespace SilverStripe\FullTextSearch\Solr\Reindex\Handlers;
 use Psr\Log\LoggerInterface;
 
 /**

code/solr/reindex/handlers/SolrReindexImmediateHandler.php

@@ -1,5 +1,5 @@
 <?php
-
+namespace SilverStripe\FullTextSearch\Solr\Reindex\Handlers;
 use Psr\Log\LoggerInterface;
 
 /**

code/solr/reindex/handlers/SolrReindexMessageHandler.php

@@ -1,5 +1,5 @@
 <?php
-
+namespace SilverStripe\FullTextSearch\Solr\Reindex\Handlers;
 use Psr\Log\LoggerInterface;
 
 if (!class_exists('MessageQueue')) {

code/solr/reindex/handlers/SolrReindexQueuedHandler.php

@@ -1,5 +1,5 @@
 <?php
-
+namespace SilverStripe\FullTextSearch\Solr\Reindex\Handlers;
 use Psr\Log\LoggerInterface;
 
 if (!interface_exists('QueuedJob')) {

code/solr/reindex/jobs/SolrReindexGroupQueuedJob.php

@@ -1,5 +1,5 @@
 <?php
-
+namespace SilverStripe\FullTextSearch\Solr\Reindex\Jobs;
 if (!interface_exists('QueuedJob')) {
     return;
 }

code/solr/reindex/jobs/SolrReindexQueuedJob.php

@@ -1,5 +1,5 @@
 <?php
-
+namespace SilverStripe\FullTextSearch\Solr\Reindex\Jobs;
 if (!interface_exists('QueuedJob')) {
     return;
 }

code/solr/reindex/jobs/SolrReindexQueuedJobBase.php

@@ -1,5 +1,5 @@
 <?php
-
+namespace SilverStripe\FullTextSearch\Solr\Reindex\Jobs;
 use Monolog\Logger;
 use Psr\Log\LoggerInterface;
 

code/utils/CombinationsArrayIterator.php

@@ -1,5 +1,6 @@
 <?php
-
+namespace SilverStripe\FullTextSearch\Utils;
+use Iterator;
 class CombinationsArrayIterator implements Iterator
 {
     protected $arrays;

code/utils/MultipleArrayIterator.php

@@ -1,5 +1,6 @@
 <?php
-
+namespace SilverStripe\FullTextSearch\Utils;
+use Iterator;
 class MultipleArrayIterator implements Iterator
 {
     protected $arrays;

code/utils/WebDAV.php

@@ -1,5 +1,5 @@
 <?php
-
+namespace SilverStripe\FullTextSearch\Utils;
 class WebDAV
 {
     public static function curl_init($url, $method)

code/utils/logging/MonologFactory.php

@@ -1,5 +1,5 @@
 <?php
-
+namespace SilverStripe\FullTextSearch\Utils\Logging;
 use Monolog\Formatter\FormatterInterface;
 use Monolog\Formatter\LineFormatter;
 use Monolog\Handler\HandlerInterface;

code/utils/logging/QueuedJobLogHandler.php

@@ -1,5 +1,5 @@
 <?php
-
+namespace SilverStripe\FullTextSearch\Utils\Logging;
 use Monolog\Handler\AbstractProcessingHandler;
 use Monolog\Logger;
 

code/utils/logging/SearchLogFactory.php

@@ -1,5 +1,5 @@
 <?php
-
+namespace SilverStripe\FullTextSearch\Utils\Logging;
 use Psr\Log;
 
 interface SearchLogFactory