@@ -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; |
@@ -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 | |
@@ -2,7 +2,6 @@ |
||
| 2 | 2 | |
| 3 | 3 | namespace SilverStripe\FullTextSearch\Solr; |
| 4 | 4 | |
| 5 | -use SilverStripe\Control\Director; |
|
| 6 | 5 | use SilverStripe\Core\Injector\Injector; |
| 7 | 6 | use SilverStripe\Core\Manifest\Module; |
| 8 | 7 | use SilverStripe\Core\Manifest\ModuleLoader; |
@@ -3,6 +3,9 @@ discard block |
||
| 3 | 3 | |
| 4 | 4 | class WebDAV |
| 5 | 5 | { |
| 6 | + /** |
|
| 7 | + * @param string $method |
|
| 8 | + */ |
|
| 6 | 9 | public static function curl_init($url, $method) |
| 7 | 10 | { |
| 8 | 11 | $ch = curl_init($url); |
@@ -46,6 +49,9 @@ discard block |
||
| 46 | 49 | return $code == 201; |
| 47 | 50 | } |
| 48 | 51 | |
| 52 | + /** |
|
| 53 | + * @param resource $handle |
|
| 54 | + */ |
|
| 49 | 55 | public static function put($handle, $url) |
| 50 | 56 | { |
| 51 | 57 | $ch = curl_init($url); |
@@ -70,6 +76,9 @@ discard block |
||
| 70 | 76 | return self::put($fh, $url); |
| 71 | 77 | } |
| 72 | 78 | |
| 79 | + /** |
|
| 80 | + * @param string $url |
|
| 81 | + */ |
|
| 73 | 82 | public static function upload_from_file($string, $url) |
| 74 | 83 | { |
| 75 | 84 | return self::put(fopen($string, 'rb'), $url); |
@@ -289,7 +289,7 @@ discard block |
||
| 289 | 289 | * @param string $forceType The type to force this field as (required in some cases, when not |
| 290 | 290 | * detectable from metadata) |
| 291 | 291 | * @param array $extraOptions Dependent on search implementation |
| 292 | - * @param float $boost Numeric boosting value (defaults to 2) |
|
| 292 | + * @param integer $boost Numeric boosting value (defaults to 2) |
|
| 293 | 293 | */ |
| 294 | 294 | public function addBoostedField($field, $forceType = null, $extraOptions = array(), $boost = 2) |
| 295 | 295 | { |
@@ -298,6 +298,9 @@ discard block |
||
| 298 | 298 | } |
| 299 | 299 | |
| 300 | 300 | |
| 301 | + /** |
|
| 302 | + * @param string $field |
|
| 303 | + */ |
|
| 301 | 304 | public function fieldData($field, $forceType = null, $extraOptions = array()) |
| 302 | 305 | { |
| 303 | 306 | // Ensure that 'boost' is recorded here without being captured by solr |
@@ -508,6 +511,9 @@ discard block |
||
| 508 | 511 | return $class === $base || is_subclass_of($class, $base); |
| 509 | 512 | } |
| 510 | 513 | |
| 514 | + /** |
|
| 515 | + * @param \Apache_Solr_Document $doc |
|
| 516 | + */ |
|
| 511 | 517 | protected function _addField($doc, $object, $field) |
| 512 | 518 | { |
| 513 | 519 | $class = get_class($object); |
@@ -557,6 +563,9 @@ discard block |
||
| 557 | 563 | } |
| 558 | 564 | } |
| 559 | 565 | |
| 566 | + /** |
|
| 567 | + * @param string $base |
|
| 568 | + */ |
|
| 560 | 569 | protected function _addAs($object, $base, $options) |
| 561 | 570 | { |
| 562 | 571 | $includeSubs = $options['include_children']; |
@@ -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 | |
| 156 | 157 | public static function call($method, &...$args) |
@@ -161,6 +162,7 @@ discard block |
||
| 161 | 162 | /** |
| 162 | 163 | * Get the current state of every variant |
| 163 | 164 | * @static |
| 165 | + * @param string $class |
|
| 164 | 166 | * @return array |
| 165 | 167 | */ |
| 166 | 168 | public static function current_state($class = null, $includeSubclasses = true) |
@@ -194,7 +196,7 @@ discard block |
||
| 194 | 196 | * @static |
| 195 | 197 | * @param string $class - The class name to get variants for |
| 196 | 198 | * @param bool $includeSubclasses - True if variants should be included if they apply to at least one subclass of $class |
| 197 | - * @return SearchVariant_ReindexStateIteratorRet - The iterator to foreach loop over |
|
| 199 | + * @return \Traversable - The iterator to foreach loop over |
|
| 198 | 200 | */ |
| 199 | 201 | public static function reindex_states($class = null, $includeSubclasses = true) |
| 200 | 202 | { |
@@ -4,9 +4,7 @@ |
||
| 4 | 4 | use ReflectionClass; |
| 5 | 5 | use SilverStripe\Core\ClassInfo; |
| 6 | 6 | use SilverStripe\Core\Injector\Injector; |
| 7 | -use SilverStripe\Dev\Debug; |
|
| 8 | 7 | use SilverStripe\FullTextSearch\Search\Variants\SearchVariant; |
| 9 | -use SilverStripe\ORM\DataList; |
|
| 10 | 8 | use SilverStripe\FullTextSearch\Solr\Reindex\Handlers\SolrReindexHandler; |
| 11 | 9 | use SilverStripe\FullTextSearch\Solr\SolrIndex; |
| 12 | 10 | |
@@ -4,15 +4,12 @@ |
||
| 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\Connect\Database; |
| 9 | 8 | use SilverStripe\ORM\DataObject; |
| 10 | -use SilverStripe\ORM\DB; |
|
| 11 | 9 | use SilverStripe\FullTextSearch\Search\FullTextSearch; |
| 12 | 10 | use SilverStripe\FullTextSearch\Search\SearchIntrospection; |
| 13 | 11 | use SilverStripe\FullTextSearch\Search\Variants\SearchVariant; |
| 14 | 12 | use SilverStripe\FullTextSearch\Search\Processors\SearchUpdateImmediateProcessor; |
| 15 | -use ReflectionClass; |
|
| 16 | 13 | |
| 17 | 14 | /** |
| 18 | 15 | * This class is responsible for capturing changes to DataObjects and triggering index updates of the resulting dirty |