tonyair
/
silverstripe-fulltextsearch
mirror of https://github.com/silverstripe/silverstripe-fulltextsearch
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

FIX Update namespace references to Symbiote

This commit is contained in:
Raissa North 2017-11-29 15:31:17 +13:00
parent c7343e989d
commit acd8b7b164
12 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
_config/processor.yml
View File

@ -11,7 +11,7 @@ SilverStripe\Core\Injector\Injector:
--- ---
Name: queuedjobprocessor Name: queuedjobprocessor
Only: Only:
ModuleExists: silverstripe/queuedjobs ModuleExists: symbiote/silverstripe-queuedjobs
Except: Except:
Environment: 'dev' Environment: 'dev'
--- ---

6
src/Search/Processors/SearchUpdateCommitJobProcessor.php
View File

@ -10,12 +10,12 @@ use DateTime;
use DateInterval; use DateInterval;
use stdClass; use stdClass;
if (!interface_exists('SilverStripe\QueuedJobs\Services\QueuedJob')) { if (!interface_exists('Symbiote\QueuedJobs\Services\QueuedJob')) {
return; return;
} }
use SilverStripe\QueuedJobs\Services\QueuedJob; use Symbiote\QueuedJobs\Services\QueuedJob;
use SilverStripe\QueuedJobs\Services\QueuedJobService; use Symbiote\QueuedJobs\Services\QueuedJobService;
class SearchUpdateCommitJobProcessor implements QueuedJob class SearchUpdateCommitJobProcessor implements QueuedJob
{ {

6
src/Search/Processors/SearchUpdateQueuedJobProcessor.php
View File

@ -5,12 +5,12 @@ namespace SilverStripe\FullTextSearch\Search\Processors;
use SilverStripe\Core\Config\Config; use SilverStripe\Core\Config\Config;
use stdClass; use stdClass;
if (!interface_exists('SilverStripe\QueuedJobs\Services\QueuedJob')) { if (!interface_exists('Symbiote\QueuedJobs\Services\QueuedJob')) {
return; return;
} }
use SilverStripe\QueuedJobs\Services\QueuedJob; use Symbiote\QueuedJobs\Services\QueuedJob;
use SilverStripe\QueuedJobs\Services\QueuedJobService; use Symbiote\QueuedJobs\Services\QueuedJobService;
class SearchUpdateQueuedJobProcessor extends SearchUpdateBatchedProcessor implements QueuedJob class SearchUpdateQueuedJobProcessor extends SearchUpdateBatchedProcessor implements QueuedJob
{ {

8
src/Solr/Reindex/Handlers/SolrReindexQueuedHandler.php
View File

@ -12,13 +12,13 @@ use SilverStripe\FullTextSearch\Solr\Reindex\Jobs\SolrReindexQueuedJob;
use SilverStripe\FullTextSearch\Solr\Reindex\Jobs\SolrReindexGroupQueuedJob; use SilverStripe\FullTextSearch\Solr\Reindex\Jobs\SolrReindexGroupQueuedJob;
use SilverStripe\FullTextSearch\Search\Processors\SearchUpdateCommitJobProcessor; use SilverStripe\FullTextSearch\Search\Processors\SearchUpdateCommitJobProcessor;
if (!interface_exists('SilverStripe\QueuedJobs\Services\QueuedJob')) { if (!interface_exists('Symbiote\QueuedJobs\Services\QueuedJob')) {
return; return;
} }
use SilverStripe\QueuedJobs\Services\QueuedJob; use Symbiote\QueuedJobs\Services\QueuedJob;
use SilverStripe\QueuedJobs\Services\QueuedJobService; use Symbiote\QueuedJobs\Services\QueuedJobService;
use SilverStripe\QueuedJobs\DataObjects\QueuedJobDescriptor; use Symbiote\QueuedJobs\DataObjects\QueuedJobDescriptor;
/** /**
* Represents a queued task to start the reindex job * Represents a queued task to start the reindex job

2
src/Solr/Reindex/Jobs/SolrReindexGroupQueuedJob.php
View File

@ -2,7 +2,7 @@
namespace SilverStripe\FullTextSearch\Solr\Reindex\Jobs; namespace SilverStripe\FullTextSearch\Solr\Reindex\Jobs;
if (!interface_exists('SilverStripe\QueuedJobs\Services\QueuedJob')) { if (!interface_exists('Symbiote\QueuedJobs\Services\QueuedJob')) {
return; return;
} }

2
src/Solr/Reindex/Jobs/SolrReindexQueuedJob.php
View File

@ -2,7 +2,7 @@
namespace SilverStripe\FullTextSearch\Solr\Reindex\Jobs; namespace SilverStripe\FullTextSearch\Solr\Reindex\Jobs;
if (!interface_exists('SilverStripe\QueuedJobs\Services\QueuedJob')) { if (!interface_exists('Symbiote\QueuedJobs\Services\QueuedJob')) {
return; return;
} }

4
src/Solr/Reindex/Jobs/SolrReindexQueuedJobBase.php
View File

@ -9,11 +9,11 @@ use SilverStripe\FullTextSearch\Solr\Reindex\Handlers\SolrReindexHandler;
use SilverStripe\FullTextSearch\Utils\Logging\SearchLogFactory; use SilverStripe\FullTextSearch\Utils\Logging\SearchLogFactory;
use stdClass; use stdClass;
if (!interface_exists('SilverStripe\QueuedJobs\Services\QueuedJob')) { if (!interface_exists('Symbiote\QueuedJobs\Services\QueuedJob')) {
return; return;
} }
use SilverStripe\QueuedJobs\Services\QueuedJob; use Symbiote\QueuedJobs\Services\QueuedJob;
/** /**
* Base class for jobs which perform re-index * Base class for jobs which perform re-index

4
src/Utils/Logging/QueuedJobLogHandler.php
View File

@ -5,11 +5,11 @@ namespace SilverStripe\FullTextSearch\Utils\Logging;
use Monolog\Handler\AbstractProcessingHandler; use Monolog\Handler\AbstractProcessingHandler;
use Monolog\Logger; use Monolog\Logger;
if (!interface_exists('SilverStripe\QueuedJobs\Services\QueuedJob')) { if (!interface_exists('Symbiote\QueuedJobs\Services\QueuedJob')) {
return; return;
} }
use SilverStripe\QueuedJobs\Services\QueuedJob; use Symbiote\QueuedJobs\Services\QueuedJob;
/** /**
* Handler for logging events into QueuedJob message data * Handler for logging events into QueuedJob message data

6
tests/BatchedProcessorTest.php
View File

@ -16,7 +16,7 @@ use SilverStripe\FullTextSearch\Search\Processors\SearchUpdateQueuedJobProcessor
use SilverStripe\FullTextSearch\Search\Processors\SearchUpdateBatchedProcessor; use SilverStripe\FullTextSearch\Search\Processors\SearchUpdateBatchedProcessor;
use SilverStripe\FullTextSearch\Search\Updaters\SearchUpdater; use SilverStripe\FullTextSearch\Search\Updaters\SearchUpdater;
use SilverStripe\FullTextSearch\Search\Variants\SearchVariantVersioned; use SilverStripe\FullTextSearch\Search\Variants\SearchVariantVersioned;
use SilverStripe\QueuedJobs\Services\QueuedJobService; use Symbiote\QueuedJobs\Services\QueuedJobService;
/** /**
* Tests {@see SearchUpdateQueuedJobProcessor} * Tests {@see SearchUpdateQueuedJobProcessor}
@ -39,7 +39,7 @@ class BatchedProcessorTest extends SapphireTest
public function setUpOnce() public function setUpOnce()
{ {
// Disable illegal extensions if skipping this test // Disable illegal extensions if skipping this test
if (class_exists('Subsite') || !interface_exists('SilverStripe\QueuedJobs\Services\QueuedJob')) { if (class_exists('Subsite') || !interface_exists('Symbiote\QueuedJobs\Services\QueuedJob')) {
$this->illegalExtensions = array(); $this->illegalExtensions = array();
} }
parent::setUpOnce(); parent::setUpOnce();
@ -49,7 +49,7 @@ class BatchedProcessorTest extends SapphireTest
{ {
parent::setUp(); parent::setUp();
if (!interface_exists('SilverStripe\QueuedJobs\Services\QueuedJob')) { if (!interface_exists('Symbiote\QueuedJobs\Services\QueuedJob')) {
$this->skipTest = true; $this->skipTest = true;
$this->markTestSkipped("These tests need the QueuedJobs module installed to run"); $this->markTestSkipped("These tests need the QueuedJobs module installed to run");
} }

2
tests/BatchedProcessorTest/BatchedProcessor_QueuedJobService.php
View File

@ -2,7 +2,7 @@
namespace SilverStripe\FullTextSearch\Tests\BatchedProcessorTest; namespace SilverStripe\FullTextSearch\Tests\BatchedProcessorTest;
use SilverStripe\QueuedJobs\Services\QueuedJob; use Symbiote\QueuedJobs\Services\QueuedJob;
class BatchedProcessor_QueuedJobService class BatchedProcessor_QueuedJobService
{ {

6
tests/SolrReindexQueuedTest.php
View File

@ -18,8 +18,8 @@ use SilverStripe\FullTextSearch\Tests\SolrReindexTest\SolrReindexTest_Index;
use SilverStripe\FullTextSearch\Tests\SolrReindexTest\SolrReindexTest_Item; use SilverStripe\FullTextSearch\Tests\SolrReindexTest\SolrReindexTest_Item;
use SilverStripe\FullTextSearch\Tests\SolrReindexTest\SolrReindexTest_RecordingLogger; use SilverStripe\FullTextSearch\Tests\SolrReindexTest\SolrReindexTest_RecordingLogger;
use SilverStripe\FullTextSearch\Tests\SolrReindexQueuedTest\SolrReindexQueuedTest_Service; use SilverStripe\FullTextSearch\Tests\SolrReindexQueuedTest\SolrReindexQueuedTest_Service;
use SilverStripe\QueuedJobs\Services\QueuedJob; use Symbiote\QueuedJobs\Services\QueuedJob;
use SilverStripe\QueuedJobs\Services\QueuedJobService; use Symbiote\QueuedJobs\Services\QueuedJobService;
/** /**
* Additional tests of solr reindexing processes when run with queuedjobs * Additional tests of solr reindexing processes when run with queuedjobs
@ -50,7 +50,7 @@ class SolrReindexQueuedTest extends SapphireTest
{ {
parent::setUp(); parent::setUp();
if (!interface_exists('SilverStripe\QueuedJobs\Services\QueuedJob')) { if (!interface_exists('Symbiote\QueuedJobs\Services\QueuedJob')) {
$this->skipTest = true; $this->skipTest = true;
return $this->markTestSkipped("These tests need the QueuedJobs module installed to run"); return $this->markTestSkipped("These tests need the QueuedJobs module installed to run");
} }

4
tests/SolrReindexQueuedTest/SolrReindexQueuedTest_Service.php
View File

@ -4,11 +4,11 @@ namespace SilverStripe\FullTextSearch\Tests\SolrReindexQueuedTest;
use SilverStripe\Dev\TestOnly; use SilverStripe\Dev\TestOnly;
if (!class_exists('SilverStripe\QueuedJobs\Services\QueuedJobService')) { if (!class_exists('Symbiote\QueuedJobs\Services\QueuedJobService')) {
return; return;
} }
use SilverStripe\QueuedJobs\Services\QueuedJobService; use Symbiote\QueuedJobs\Services\QueuedJobService;
class SolrReindexQueuedTest_Service extends QueuedJobService implements TestOnly class SolrReindexQueuedTest_Service extends QueuedJobService implements TestOnly
{ {