Completed
Pull Request — master (#1017)
by Tim
03:41
created
lib/Elastica/Tool/CrossIndex.php 2 patches
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -133,7 +133,7 @@
 block discarded – undo
133 133
             $types = is_array($types) ? $types : array($types);
134 134
 
135 135
             $types = array_map(
136
-                function ($type) {
136
+                function($type) {
137 137
                     if ($type instanceof Type) {
138 138
                         $type = $type->getName();
139 139
                     }
Please login to merge, or discard this patch.
Unused Use Statements   -1 removed lines patch added patch discarded remove patch
@@ -5,7 +5,6 @@
 block discarded – undo
5 5
 use Elastica\Index;
6 6
 use Elastica\Query\MatchAll;
7 7
 use Elastica\ScanAndScroll;
8
-use Elastica\Search;
9 8
 use Elastica\Type;
10 9
 
11 10
 /**
Please login to merge, or discard this patch.
lib/Elastica/Query/MoreLikeThis.php 1 patch
Indentation   -2 removed lines patch added patch discarded remove patch
@@ -30,7 +30,6 @@  discard block
 block discarded – undo
30 30
      * @param array $ids Document ids
31 31
      *
32 32
      * @deprecated Option "ids" deprecated as of ES 2.0.0-beta1 and will be removed in further Elastica releases. Use "like" instead.
33
-
34 33
      * @return \Elastica\Query\MoreLikeThis Current object
35 34
      */
36 35
     public function setIds(array $ids)
@@ -56,7 +55,6 @@  discard block
 block discarded – undo
56 55
      * @param string $likeText
57 56
      *
58 57
      * @deprecated Option "like_text" deprecated as of ES 2.0.0-beta1 and will be removed at further Elastica releases. Use "like" instead.
59
-
60 58
      * @return $this
61 59
      */
62 60
     public function setLikeText($likeText)
Please login to merge, or discard this patch.
lib/Elastica/AbstractUpdateAction.php 1 patch
Doc Comments   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -322,7 +322,7 @@  discard block
 block discarded – undo
322 322
     }
323 323
 
324 324
     /**
325
-     * @param array|string $fields
325
+     * @param string $fields
326 326
      *
327 327
      * @return $this
328 328
      */
@@ -456,7 +456,7 @@  discard block
 block discarded – undo
456 456
     }
457 457
 
458 458
     /**
459
-     * @return string
459
+     * @return boolean
460 460
      */
461 461
     public function hasTimeout()
462 462
     {
@@ -482,7 +482,7 @@  discard block
 block discarded – undo
482 482
     }
483 483
 
484 484
     /**
485
-     * @return string
485
+     * @return boolean
486 486
      */
487 487
     public function hasConsistency()
488 488
     {
@@ -545,7 +545,7 @@  discard block
 block discarded – undo
545 545
     }
546 546
 
547 547
     /**
548
-     * @param array $fields         if empty array all options will be returned, field names can be either with underscored either without, i.e. _percolate, routing
548
+     * @param string[] $fields         if empty array all options will be returned, field names can be either with underscored either without, i.e. _percolate, routing
549 549
      * @param bool  $withUnderscore should option keys contain underscore prefix
550 550
      *
551 551
      * @return array
Please login to merge, or discard this patch.
lib/Elastica/Query/BoolQuery.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -55,7 +55,7 @@
 block discarded – undo
55 55
      * @param \Elastica\Filter\AbstractFilter $filter Filter object
56 56
      *
57 57
      * @return $this
58
-    */
58
+     */
59 59
     public function addFilter(AbstractFilter $filter)
60 60
     {
61 61
         return $this->addParam('filter', $filter);
Please login to merge, or discard this patch.
lib/Elastica/ResultSet.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -285,7 +285,7 @@
 block discarded – undo
285 285
      *
286 286
      * @throws Exception\InvalidException If offset doesn't exist
287 287
      *
288
-     * @return Result|null
288
+     * @return Result
289 289
      */
290 290
     public function offsetGet($offset)
291 291
     {
Please login to merge, or discard this patch.
lib/Elastica/Transformer/Doctrine/AbstractDoctrineTransformer.php 1 patch
Spacing   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -55,7 +55,6 @@
 block discarded – undo
55 55
     private function getObjectIdentifier($object)
56 56
     {
57 57
         return method_exists($object, 'getId') ?
58
-            $object->getId() :
59
-            $object->id;
58
+            $object->getId() : $object->id;
60 59
     }
61 60
 }
Please login to merge, or discard this patch.