@@ -6,7 +6,6 @@ |
||
6 | 6 | use SilverStripe\CMS\Model\SiteTree; |
7 | 7 | use SilverStripe\Dev\SapphireTest; |
8 | 8 | use SilverStripe\FullTextSearch\Search\FullTextSearch; |
9 | -use SilverStripe\FullTextSearch\Search\Indexes\SearchIndex_Recording; |
|
10 | 9 | use SilverStripe\FullTextSearch\Search\Variants\SearchVariantVersioned; |
11 | 10 | use SilverStripe\FullTextSearch\Tests\SearchVariantVersionedTest\SearchVariantVersionedTest_Index; |
12 | 11 | use SilverStripe\FullTextSearch\Tests\SearchVariantVersionedTest\SearchVariantVersionedTest_Item; |
@@ -65,6 +65,9 @@ |
||
65 | 65 | parent::tearDown(); |
66 | 66 | } |
67 | 67 | |
68 | + /** |
|
69 | + * @return \SilverStripe\FullTextSearch\Solr\Services\SolrService |
|
70 | + */ |
|
68 | 71 | protected function getServiceMock() |
69 | 72 | { |
70 | 73 | return \Phockito::mock('Solr4Service'); |
@@ -2,7 +2,6 @@ |
||
2 | 2 | |
3 | 3 | namespace SilverStripe\FullTextSearch\Tests; |
4 | 4 | |
5 | -use SilverStripe\Core\Config\Config; |
|
6 | 5 | use SilverStripe\Core\Injector\Injector; |
7 | 6 | use SilverStripe\Core\Kernel; |
8 | 7 | use SilverStripe\Dev\SapphireTest; |
@@ -7,7 +7,6 @@ |
||
7 | 7 | use SilverStripe\ORM\DataObject; |
8 | 8 | use SilverStripe\FullTextSearch\Search\FullTextSearch; |
9 | 9 | use SilverStripe\FullTextSearch\Search\SearchIntrospection; |
10 | -use SilverStripe\FullTextSearch\Search\Indexes\SearchIndex_Recording; |
|
11 | 10 | use SilverStripe\FullTextSearch\Solr\Services\Solr3Service; |
12 | 11 | use SilverStripe\FullTextSearch\Tests\SearchVariantVersionedTest\SearchVariantVersionedTest_Item; |
13 | 12 | use SilverStripe\FullTextSearch\Tests\SolrIndexVersionedTest\SolrIndexVersionedTest_Object; |
@@ -94,7 +94,7 @@ |
||
94 | 94 | * @param DataObject $object Item being added |
95 | 95 | * @param string $value Value for class |
96 | 96 | * @param string $stage Stage updated |
97 | - * @return Apache_Solr_Document |
|
97 | + * @return \Apache_Solr_Document |
|
98 | 98 | */ |
99 | 99 | protected function getSolrDocument($class, $object, $value, $stage) |
100 | 100 | { |
@@ -16,8 +16,6 @@ |
||
16 | 16 | use SilverStripe\FullTextSearch\Solr\Tasks\Solr_Reindex; |
17 | 17 | use SilverStripe\Core\Config\Config; |
18 | 18 | use SilverStripe\Core\Injector\Injector; |
19 | -use SilverStripe\ORM\DataObject; |
|
20 | -use SilverStripe\ORM\DB; |
|
21 | 19 | |
22 | 20 | class SolrReindexTest extends SapphireTest |
23 | 21 | { |
@@ -2,7 +2,6 @@ |
||
2 | 2 | |
3 | 3 | namespace SilverStripe\FullTextSearch\Tests\SolrReindexTest; |
4 | 4 | |
5 | -use SilverStripe\Dev\TestOnly; |
|
6 | 5 | use SilverStripe\ORM\DataObject; |
7 | 6 | use SilverStripe\FullTextSearch\Tests\SolrReindexTest\SolrReindexTest_ItemExtension; |
8 | 7 |
@@ -3,7 +3,6 @@ |
||
3 | 3 | |
4 | 4 | use SilverStripe\Core\ClassInfo; |
5 | 5 | use SilverStripe\Core\Config\Config; |
6 | -use SilverStripe\ORM\DataObject; |
|
7 | 6 | use SilverStripe\FullTextSearch\Search\Indexes\SearchIndex; |
8 | 7 | use ReflectionClass; |
9 | 8 |
@@ -4,7 +4,6 @@ |
||
4 | 4 | |
5 | 5 | use SilverStripe\Core\Config\Configurable; |
6 | 6 | use SilverStripe\Core\Injector\Injector; |
7 | -use SilverStripe\Dev\SapphireTest; |
|
8 | 7 | use SilverStripe\ORM\DataObject; |
9 | 8 | use SilverStripe\ORM\DB; |
10 | 9 | use SilverStripe\FullTextSearch\Search\FullTextSearch; |
@@ -151,6 +151,7 @@ discard block |
||
151 | 151 | * A shortcut to with when calling without passing in a class, |
152 | 152 | * |
153 | 153 | * SearchVariant::call(...) ==== SearchVariant::with()->call(...); |
154 | + * @param string $method |
|
154 | 155 | */ |
155 | 156 | public static function call($method, &$a1 = null, &$a2 = null, &$a3 = null, &$a4 = null, &$a5 = null, &$a6 = null, &$a7 = null) |
156 | 157 | { |
@@ -160,6 +161,7 @@ discard block |
||
160 | 161 | /** |
161 | 162 | * Get the current state of every variant |
162 | 163 | * @static |
164 | + * @param string $class |
|
163 | 165 | * @return array |
164 | 166 | */ |
165 | 167 | public static function current_state($class = null, $includeSubclasses = true) |
@@ -193,7 +195,7 @@ discard block |
||
193 | 195 | * @static |
194 | 196 | * @param string $class - The class name to get variants for |
195 | 197 | * @param bool $includeSubclasses - True if variants should be included if they apply to at least one subclass of $class |
196 | - * @return SearchVariant_ReindexStateIteratorRet - The iterator to foreach loop over |
|
198 | + * @return \Traversable - The iterator to foreach loop over |
|
197 | 199 | */ |
198 | 200 | public static function reindex_states($class = null, $includeSubclasses = true) |
199 | 201 | { |
@@ -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\FullTextSearch\Utils\CombinationsArrayIterator; |
8 | 7 | use ReflectionClass; |