@@ -80,7 +80,7 @@ discard block  | 
                                                    ||
| 80 | 80 | * Returning FALSE will halt the save operation. Anything else will be ignored.  | 
                                                        
| 81 | 81 | *  | 
                                                        
| 82 | 82 | * @param \Block\Model\Entity\Block $block Widget information  | 
                                                        
| 83 | - * @return bool|null  | 
                                                        |
| 83 | + * @return boolean  | 
                                                        |
| 84 | 84 | */  | 
                                                        
| 85 | 85 | public function beforeSave(Block $block)  | 
                                                        
| 86 | 86 |      { | 
                                                        
@@ -102,7 +102,7 @@ discard block  | 
                                                    ||
| 102 | 102 | * will halt the delete operation. Anything else will be ignored.  | 
                                                        
| 103 | 103 | *  | 
                                                        
| 104 | 104 | * @param \Block\Model\Entity\Block $block Widget information  | 
                                                        
| 105 | - * @return bool|null  | 
                                                        |
| 105 | + * @return boolean  | 
                                                        |
| 106 | 106 | */  | 
                                                        
| 107 | 107 | public function beforeDelete(Block $block)  | 
                                                        
| 108 | 108 |      { | 
                                                        
@@ -269,7 +269,7 @@  | 
                                                    ||
| 269 | 269 | *  | 
                                                        
| 270 | 270 | * @param string $key Which setting to read, the entire settings will be  | 
                                                        
| 271 | 271 | * returned if no key is provided  | 
                                                        
| 272 | - * @return mixed Array of settings if $key was not provided, or the requested  | 
                                                        |
| 272 | + * @return string Array of settings if $key was not provided, or the requested  | 
                                                        |
| 273 | 273 | * value for the given $key (null of key does not exists)  | 
                                                        
| 274 | 274 | */  | 
                                                        
| 275 | 275 | public function settings($key = null)  | 
                                                        
@@ -17,7 +17,6 @@  | 
                                                    ||
| 17 | 17 | use Cake\Filesystem\File;  | 
                                                        
| 18 | 18 | use Cake\Filesystem\Folder;  | 
                                                        
| 19 | 19 | use Cake\Utility\Hash;  | 
                                                        
| 20 | -use Cake\Utility\Inflector;  | 
                                                        |
| 21 | 20 | use CMS\Core\Package\PackageFactory;  | 
                                                        
| 22 | 21 | use CMS\Core\Package\PluginPackage;  | 
                                                        
| 23 | 22 | use CMS\Core\StaticCacheTrait;  | 
                                                        
@@ -178,7 +178,7 @@  | 
                                                    ||
| 178 | 178 | *  | 
                                                        
| 179 | 179 | * @param string $string Input string in UTF-8  | 
                                                        
| 180 | 180 | * @param string $trimChars Characters to trim off  | 
                                                        
| 181 | - * @return trimmed string  | 
                                                        |
| 181 | + * @return string string  | 
                                                        |
| 182 | 182 | */  | 
                                                        
| 183 | 183 | protected function _mbTrim($string, $trimChars = '\s')  | 
                                                        
| 184 | 184 |      { | 
                                                        
@@ -561,7 +561,7 @@ discard block  | 
                                                    ||
| 561 | 561 | * @param \Cake\Datasource\EntityInterface $entity The entity where to fetch fields  | 
                                                        
| 562 | 562 | * @param array $options Arguments given to `beforeFind()` method, possible keys  | 
                                                        
| 563 | 563 | * are "event", "query", "options", "primary"  | 
                                                        
| 564 | - * @return bool|null|\Cake\Datasource\EntityInterface  | 
                                                        |
| 564 | + * @return EntityInterface  | 
                                                        |
| 565 | 565 | */  | 
                                                        
| 566 | 566 | public function attachEntityAttributes(EntityInterface $entity, array $options = [])  | 
                                                        
| 567 | 567 |      { | 
                                                        
@@ -622,7 +622,7 @@ discard block  | 
                                                    ||
| 622 | 622 | * Prepares entity's cache-columns (those defined using `cache` option).  | 
                                                        
| 623 | 623 | *  | 
                                                        
| 624 | 624 | * @param \Cake\Datasource\EntityInterface $entity The entity to prepare  | 
                                                        
| 625 | - * @return \Cake\Datasource\EntityInterfa Modified entity  | 
                                                        |
| 625 | + * @return EntityInterface Modified entity  | 
                                                        |
| 626 | 626 | */  | 
                                                        
| 627 | 627 | protected function _prepareCachedColumns(EntityInterface $entity)  | 
                                                        
| 628 | 628 |      { | 
                                                        
@@ -117,7 +117,7 @@ discard block  | 
                                                    ||
| 117 | 117 | * @param array $options Options given as an array  | 
                                                        
| 118 | 118 | * @param bool $primary Whether this event was triggered as part of a primary  | 
                                                        
| 119 | 119 | * find query or not  | 
                                                        
| 120 | - * @return mixed  | 
                                                        |
| 120 | + * @return boolean  | 
                                                        |
| 121 | 121 | */  | 
                                                        
| 122 | 122 | public function beforeFind(Field $field, array $options, $primary)  | 
                                                        
| 123 | 123 |      { | 
                                                        
@@ -135,7 +135,7 @@ discard block  | 
                                                    ||
| 135 | 135 | *  | 
                                                        
| 136 | 136 | * @param \Field\Model\Entity\Field $field Field information  | 
                                                        
| 137 | 137 | * @param \Cake\Validation\Validator $validator The validator object  | 
                                                        
| 138 | - * @return bool|null False will halt the save process  | 
                                                        |
| 138 | + * @return boolean False will halt the save process  | 
                                                        |
| 139 | 139 | */  | 
                                                        
| 140 | 140 | public function validate(Field $field, Validator $validator)  | 
                                                        
| 141 | 141 |      { | 
                                                        
@@ -200,7 +200,7 @@  | 
                                                    ||
| 200 | 200 | /**  | 
                                                        
| 201 | 201 | * Generates a new connection to DB.  | 
                                                        
| 202 | 202 | *  | 
                                                        
| 203 | - * @return \Cake\Database\Connection|bool A connection object, or false on  | 
                                                        |
| 203 | + * @return Connection A connection object, or false on  | 
                                                        |
| 204 | 204 | * failure. On failure error messages are automatically set  | 
                                                        
| 205 | 205 | */  | 
                                                        
| 206 | 206 | public function getConn()  | 
                                                        
@@ -294,7 +294,7 @@ discard block  | 
                                                    ||
| 294 | 294 | * Scopes the given query using the given operator token.  | 
                                                        
| 295 | 295 | *  | 
                                                        
| 296 | 296 | * @param \Cake\ORM\Query $query The query to scope  | 
                                                        
| 297 | - * @param \Search\Token $token Token describing an operator. e.g `-op_name:op_value`  | 
                                                        |
| 297 | + * @param TokenInterface $token Token describing an operator. e.g `-op_name:op_value`  | 
                                                        |
| 298 | 298 | * @return \Cake\ORM\Query Scoped query  | 
                                                        
| 299 | 299 | */  | 
                                                        
| 300 | 300 | protected function _scopeOperator(Query $query, TokenInterface $token)  | 
                                                        
@@ -306,7 +306,7 @@ discard block  | 
                                                    ||
| 306 | 306 | * Scopes the given query using the given words token.  | 
                                                        
| 307 | 307 | *  | 
                                                        
| 308 | 308 | * @param \Cake\ORM\Query $query The query to scope  | 
                                                        
| 309 | - * @param \Search\TokenInterface $token Token describing a words sequence. e.g `this is a phrase`  | 
                                                        |
| 309 | + * @param TokenInterface $token Token describing a words sequence. e.g `this is a phrase`  | 
                                                        |
| 310 | 310 | * @return \Cake\ORM\Query Scoped query  | 
                                                        
| 311 | 311 | */  | 
                                                        
| 312 | 312 | protected function _scopeWords(Query $query, TokenInterface $token)  | 
                                                        
@@ -339,7 +339,7 @@ discard block  | 
                                                    ||
| 339 | 339 | * Similar to "_scopeWords" but using MySQL's fulltext indexes.  | 
                                                        
| 340 | 340 | *  | 
                                                        
| 341 | 341 | * @param \Cake\ORM\Query $query The query to scope  | 
                                                        
| 342 | - * @param \Search\TokenInterface $token Token describing a words sequence. e.g `this is a phrase`  | 
                                                        |
| 342 | + * @param TokenInterface $token Token describing a words sequence. e.g `this is a phrase`  | 
                                                        |
| 343 | 343 | * @return \Cake\ORM\Query Scoped query  | 
                                                        
| 344 | 344 | */  | 
                                                        
| 345 | 345 | protected function _scopeWordsInFulltext(Query $query, TokenInterface $token)  | 
                                                        
@@ -369,7 +369,7 @@ discard block  | 
                                                    ||
| 369 | 369 | /**  | 
                                                        
| 370 | 370 | * Whether FullText index is available or not.  | 
                                                        
| 371 | 371 | *  | 
                                                        
| 372 | - * @return bool True if enabled, false otherwise  | 
                                                        |
| 372 | + * @return null|boolean True if enabled, false otherwise  | 
                                                        |
| 373 | 373 | */  | 
                                                        
| 374 | 374 | protected function _isFullTextEnabled()  | 
                                                        
| 375 | 375 |      { | 
                                                        
@@ -12,11 +12,7 @@  | 
                                                    ||
| 12 | 12 | namespace Search\Engine\Generic;  | 
                                                        
| 13 | 13 | |
| 14 | 14 | use Cake\Cache\Cache;  | 
                                                        
| 15 | -use Cake\Core\InstanceConfigTrait;  | 
                                                        |
| 16 | 15 | use Cake\Datasource\EntityInterface;  | 
                                                        
| 17 | -use Cake\Error\FatalErrorException;  | 
                                                        |
| 18 | -use Cake\Event\Event;  | 
                                                        |
| 19 | -use Cake\Event\EventManager;  | 
                                                        |
| 20 | 16 | use Cake\ORM\Query;  | 
                                                        
| 21 | 17 | use Cake\ORM\Table;  | 
                                                        
| 22 | 18 | use Cake\Utility\Hash;  | 
                                                        
@@ -322,7 +322,7 @@ discard block  | 
                                                    ||
| 322 | 322 | * operator.  | 
                                                        
| 323 | 323 | *  | 
                                                        
| 324 | 324 | * @param \Cake\ORM\Query $query The query to be scope  | 
                                                        
| 325 | - * @param \Search\TokenInterface $token Token describing an operator. e.g  | 
                                                        |
| 325 | + * @param TokenInterface $token Token describing an operator. e.g  | 
                                                        |
| 326 | 326 | * `-op_name:op_value`  | 
                                                        
| 327 | 327 | * @return \Cake\ORM\Query Scoped query  | 
                                                        
| 328 | 328 | */  | 
                                                        
@@ -363,7 +363,7 @@ discard block  | 
                                                    ||
| 363 | 363 | * handling an operator named either `author-name` or `author_name`.  | 
                                                        
| 364 | 364 | *  | 
                                                        
| 365 | 365 | * @param \Cake\ORM\Query $query The query that is expected to be scoped  | 
                                                        
| 366 | - * @param \Search\TokenInterface $token Token describing an operator. e.g  | 
                                                        |
| 366 | + * @param TokenInterface $token Token describing an operator. e.g  | 
                                                        |
| 367 | 367 | * `-op_name:op_value`  | 
                                                        
| 368 | 368 | * @return mixed Scoped query object expected or null if event was not captured  | 
                                                        
| 369 | 369 | * by any listener  |