@@ -2,7 +2,6 @@ |
||
2 | 2 | |
3 | 3 | namespace SilverStripe\FullTextSearch\Search\Variants; |
4 | 4 | |
5 | -use SilverStripe\ORM\DataObject; |
|
6 | 5 | use SilverStripe\Core\ClassInfo; |
7 | 6 | use SilverStripe\Core\Config\Configurable; |
8 | 7 | use SilverStripe\FullTextSearch\Utils\CombinationsArrayIterator; |
@@ -10,6 +10,9 @@ |
||
10 | 10 | |
11 | 11 | class SearchVariantVersioned extends SearchVariant |
12 | 12 | { |
13 | + /** |
|
14 | + * @param boolean $includeSubclasses |
|
15 | + */ |
|
13 | 16 | public function appliesTo($class, $includeSubclasses) |
14 | 17 | { |
15 | 18 | if (!$this->appliesToEnvironment()) { |
@@ -74,6 +74,9 @@ |
||
74 | 74 | parent::tearDown(); |
75 | 75 | } |
76 | 76 | |
77 | + /** |
|
78 | + * @return \SilverStripe\FullTextSearch\Solr\Services\SolrService |
|
79 | + */ |
|
77 | 80 | protected function getServiceMock() |
78 | 81 | { |
79 | 82 | return $this->getMockBuilder(Solr4Service::class) |
@@ -17,7 +17,6 @@ |
||
17 | 17 | use SilverStripe\FullTextSearch\Search\Variants\SearchVariantSubsites; |
18 | 18 | use SilverStripe\FullTextSearch\Solr\Services\Solr4Service; |
19 | 19 | use SilverStripe\FullTextSearch\Tests\SolrIndexSubsitesTest\SolrIndexSubsitesTest_Index; |
20 | -use SilverStripe\FullTextSearch\Tests\SolrIndexVersionedTest\SolrDocumentMatcher; |
|
21 | 20 | use SilverStripe\ORM\DataObject; |
22 | 21 | use SilverStripe\Subsites\Model\Subsite; |
23 | 22 | use SilverStripe\Versioned\Versioned; |
@@ -9,7 +9,6 @@ discard block |
||
9 | 9 | use SilverStripe\ORM\DataObject; |
10 | 10 | use SilverStripe\FullTextSearch\Search\FullTextSearch; |
11 | 11 | use SilverStripe\FullTextSearch\Search\SearchIntrospection; |
12 | -use SilverStripe\FullTextSearch\Search\Indexes\SearchIndex_Recording; |
|
13 | 12 | use SilverStripe\FullTextSearch\Solr\Services\Solr3Service; |
14 | 13 | use SilverStripe\FullTextSearch\Tests\SearchVariantVersionedTest\SearchVariantVersionedTest_Item; |
15 | 14 | use SilverStripe\FullTextSearch\Tests\SolrIndexVersionedTest\SolrIndexVersionedTest_Object; |
@@ -19,7 +18,6 @@ discard block |
||
19 | 18 | use SilverStripe\FullTextSearch\Search\Updaters\SearchUpdater; |
20 | 19 | use SilverStripe\FullTextSearch\Search\Variants\SearchVariantSubsites; |
21 | 20 | use SilverStripe\FullTextSearch\Search\Variants\SearchVariantVersioned; |
22 | -use SilverStripe\Subsites\Model\Subsite; |
|
23 | 21 | use SilverStripe\Versioned\Versioned; |
24 | 22 | |
25 | 23 | class SolrIndexVersionedTest extends SapphireTest |
@@ -8,7 +8,6 @@ discard block |
||
8 | 8 | use SilverStripe\ORM\DataObject; |
9 | 9 | use SilverStripe\ORM\DB; |
10 | 10 | use SilverStripe\FullTextSearch\Search\FullTextSearch; |
11 | -use SilverStripe\FullTextSearch\Search\Updaters\SearchUpdater; |
|
12 | 11 | use SilverStripe\FullTextSearch\Solr\Reindex\Handlers\SolrReindexQueuedHandler; |
13 | 12 | use SilverStripe\FullTextSearch\Solr\Reindex\Handlers\SolrReindexHandler; |
14 | 13 | use SilverStripe\FullTextSearch\Solr\Services\Solr4Service; |
@@ -20,7 +19,6 @@ discard block |
||
20 | 19 | use SilverStripe\FullTextSearch\Tests\SolrReindexTest\SolrReindexTest_RecordingLogger; |
21 | 20 | use SilverStripe\FullTextSearch\Tests\SolrReindexQueuedTest\SolrReindexQueuedTest_Service; |
22 | 21 | use Symbiote\QueuedJobs\Services\QueuedJob; |
23 | -use Symbiote\QueuedJobs\Services\QueuedJobService; |
|
24 | 22 | |
25 | 23 | /** |
26 | 24 | * Additional tests of solr reindexing processes when run with queuedjobs |
@@ -4,7 +4,6 @@ discard block |
||
4 | 4 | |
5 | 5 | use SilverStripe\Dev\SapphireTest; |
6 | 6 | use SilverStripe\FullTextSearch\Search\FullTextSearch; |
7 | -use SilverStripe\FullTextSearch\Search\Updaters\SearchUpdater; |
|
8 | 7 | use SilverStripe\FullTextSearch\Search\Variants\SearchVariant; |
9 | 8 | use SilverStripe\FullTextSearch\Tests\SolrReindexTest\SolrReindexTest_Variant; |
10 | 9 | use SilverStripe\FullTextSearch\Tests\SolrReindexTest\SolrReindexTest_Index; |
@@ -16,8 +15,6 @@ discard block |
||
16 | 15 | use SilverStripe\FullTextSearch\Solr\Tasks\Solr_Reindex; |
17 | 16 | use SilverStripe\Core\Config\Config; |
18 | 17 | use SilverStripe\Core\Injector\Injector; |
19 | -use SilverStripe\ORM\DataObject; |
|
20 | -use SilverStripe\ORM\DB; |
|
21 | 18 | |
22 | 19 | class SolrReindexTest extends SapphireTest |
23 | 20 | { |