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

Merge pull request #177 from creative-commoners/pulls/3.0/symbiote-namespaces-update 

FIX Update namespace references to Symbiote
This commit is contained in:
Robbie Averill 2017-11-30 09:58:54 +13:00 committed by GitHub
parent dffdba0378 c7cbb0190d
commit 7f22cb98c2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
12 changed files with 37 additions and 28 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
Only:
ModuleExists: silverstripe/queuedjobs
ModuleExists: symbiote/silverstripe-queuedjobs
Except:
Environment: 'dev'
---

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

@ -10,12 +10,12 @@ use DateTime;
use DateInterval;
use stdClass;
if (!interface_exists('SilverStripe\QueuedJobs\Services\QueuedJob')) {
if (!interface_exists('Symbiote\QueuedJobs\Services\QueuedJob')) {
return;
}
use SilverStripe\QueuedJobs\Services\QueuedJob;
use SilverStripe\QueuedJobs\Services\QueuedJobService;
use Symbiote\QueuedJobs\Services\QueuedJob;
use Symbiote\QueuedJobs\Services\QueuedJobService;
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 stdClass;
if (!interface_exists('SilverStripe\QueuedJobs\Services\QueuedJob')) {
if (!interface_exists('Symbiote\QueuedJobs\Services\QueuedJob')) {
return;
}
use SilverStripe\QueuedJobs\Services\QueuedJob;
use SilverStripe\QueuedJobs\Services\QueuedJobService;
use Symbiote\QueuedJobs\Services\QueuedJob;
use Symbiote\QueuedJobs\Services\QueuedJobService;
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\Search\Processors\SearchUpdateCommitJobProcessor;
if (!interface_exists('SilverStripe\QueuedJobs\Services\QueuedJob')) {
if (!interface_exists('Symbiote\QueuedJobs\Services\QueuedJob')) {
return;
}
use SilverStripe\QueuedJobs\Services\QueuedJob;
use SilverStripe\QueuedJobs\Services\QueuedJobService;
use SilverStripe\QueuedJobs\DataObjects\QueuedJobDescriptor;
use Symbiote\QueuedJobs\Services\QueuedJob;
use Symbiote\QueuedJobs\Services\QueuedJobService;
use Symbiote\QueuedJobs\DataObjects\QueuedJobDescriptor;
/**
* 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;
if (!interface_exists('SilverStripe\QueuedJobs\Services\QueuedJob')) {
if (!interface_exists('Symbiote\QueuedJobs\Services\QueuedJob')) {
return;
}

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

@ -2,7 +2,7 @@
namespace SilverStripe\FullTextSearch\Solr\Reindex\Jobs;
if (!interface_exists('SilverStripe\QueuedJobs\Services\QueuedJob')) {
if (!interface_exists('Symbiote\QueuedJobs\Services\QueuedJob')) {
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 stdClass;
if (!interface_exists('SilverStripe\QueuedJobs\Services\QueuedJob')) {
if (!interface_exists('Symbiote\QueuedJobs\Services\QueuedJob')) {
return;
}
use SilverStripe\QueuedJobs\Services\QueuedJob;
use Symbiote\QueuedJobs\Services\QueuedJob;
/**
* 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\Logger;
if (!interface_exists('SilverStripe\QueuedJobs\Services\QueuedJob')) {
if (!interface_exists('Symbiote\QueuedJobs\Services\QueuedJob')) {
return;
}
use SilverStripe\QueuedJobs\Services\QueuedJob;
use Symbiote\QueuedJobs\Services\QueuedJob;
/**
* Handler for logging events into QueuedJob message data

12
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\Updaters\SearchUpdater;
use SilverStripe\FullTextSearch\Search\Variants\SearchVariantVersioned;
use SilverStripe\QueuedJobs\Services\QueuedJobService;
use Symbiote\QueuedJobs\Services\QueuedJobService;
/**
* Tests {@see SearchUpdateQueuedJobProcessor}
@ -39,21 +39,25 @@ class BatchedProcessorTest extends SapphireTest
public function setUpOnce()
{
// 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();
}
parent::setUpOnce();
}
public function setUp()
protected function setUp()
{
Config::modify()->set(SearchUpdater::class, 'flush_on_shutdown', false);
parent::setUp();
if (!interface_exists('SilverStripe\QueuedJobs\Services\QueuedJob')) {
if (!interface_exists('Symbiote\QueuedJobs\Services\QueuedJob')) {
$this->skipTest = true;
$this->markTestSkipped("These tests need the QueuedJobs module installed to run");
}
Config::modify()->set(QueuedJobService::class, 'use_shutdown_function', false);
if (class_exists('Subsite')) {
$this->skipTest = true;
$this->markTestSkipped(get_class() . ' skipped when running with subsites');

2
tests/BatchedProcessorTest/BatchedProcessor_QueuedJobService.php
View File

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

13
tests/SolrReindexQueuedTest.php
View File

@ -8,6 +8,7 @@ use SilverStripe\Dev\SapphireTest;
use SilverStripe\ORM\DataObject;
use SilverStripe\ORM\DB;
use SilverStripe\FullTextSearch\Search\FullTextSearch;
use SilverStripe\FullTextSearch\Search\Updaters\SearchUpdater;
use SilverStripe\FullTextSearch\Solr\Reindex\Handlers\SolrReindexQueuedHandler;
use SilverStripe\FullTextSearch\Solr\Reindex\Handlers\SolrReindexHandler;
use SilverStripe\FullTextSearch\Solr\Services\Solr4Service;
@ -18,8 +19,8 @@ use SilverStripe\FullTextSearch\Tests\SolrReindexTest\SolrReindexTest_Index;
use SilverStripe\FullTextSearch\Tests\SolrReindexTest\SolrReindexTest_Item;
use SilverStripe\FullTextSearch\Tests\SolrReindexTest\SolrReindexTest_RecordingLogger;
use SilverStripe\FullTextSearch\Tests\SolrReindexQueuedTest\SolrReindexQueuedTest_Service;
use SilverStripe\QueuedJobs\Services\QueuedJob;
use SilverStripe\QueuedJobs\Services\QueuedJobService;
use Symbiote\QueuedJobs\Services\QueuedJob;
use Symbiote\QueuedJobs\Services\QueuedJobService;
/**
* Additional tests of solr reindexing processes when run with queuedjobs
@ -46,15 +47,19 @@ class SolrReindexQueuedTest extends SapphireTest
*/
protected $service = null;
public function setUp()
protected function setUp()
{
Config::modify()->set(SearchUpdater::class, 'flush_on_shutdown', false);
parent::setUp();
if (!interface_exists('SilverStripe\QueuedJobs\Services\QueuedJob')) {
if (!interface_exists('Symbiote\QueuedJobs\Services\QueuedJob')) {
$this->skipTest = true;
return $this->markTestSkipped("These tests need the QueuedJobs module installed to run");
}
Config::modify()->set(QueuedJobService::class, 'use_shutdown_function', false);
// Set queued handler for reindex
Config::modify()->set(Injector::class, SolrReindexHandler::class, array(
'class' => SolrReindexQueuedHandler::class

4
tests/SolrReindexQueuedTest/SolrReindexQueuedTest_Service.php
View File

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