🚨 Fix scrutinizer

Author: chdemko

benchmarks/TreeMapBench.php

@@ -39,6 +39,13 @@ class TreeMapBench
      */
     protected $data;
 
+    /**
+     * @var integer Sink value used to consume benchmark results
+     *
+     * @since 1.0.5
+     */
+    protected $sink = 0;
+
     /**
      * Provider for counts
      *
@@ -72,13 +79,11 @@ public function provideTypes()
     /**
      * Create the tree map.
      *
-     * @param array $params Array of parameters
-     *
      * @return void
      *
      * @since 1.0.5
      */
-    public function init($params)
+    public function init()
     {
         $this->tree = TreeMap::create();
     }
@@ -126,13 +131,11 @@ public function data($params)
     /**
      * Clear the tree map.
      *
-     * @param array $params Array of parameters
-     *
      * @return void
      *
      * @since 1.0.5
      */
-    public function finish($params)
+    public function finish()
     {
         $this->tree->clear();
     }
@@ -170,6 +173,8 @@ public function benchFill($params)
      */
     public function benchSearch($params)
     {
+        $sink = 0;
+
         if (isset($params['from'])) {
             $min = (int) ($params['from'] * $params['count']);
         } else {
@@ -183,8 +188,10 @@ public function benchSearch($params)
         }
 
         for ($i = $min; $i < $max; $i++) {
-            $value = $this->data[$i];
+            $sink += $this->data[$i];
         }
+
+        $this->sink = $sink;
     }
 
     /**

src/SortedCollection/ReversedMap.php

@@ -67,8 +67,10 @@ class ReversedMap extends AbstractMap
     protected function __construct(SortedMap $map)
     {
         $this->mapInternal = $map;
-        $this->comparatorInternal = function ($key1, $key2) {
-            return - call_user_func($this->mapInternal->comparator, $key1, $key2);
+        $comparator = $map->comparator();
+
+        $this->comparatorInternal = function ($key1, $key2) use ($comparator) {
+            return - call_user_func($comparator, $key1, $key2);
         };
     }
 

src/SortedCollection/TreeMap.php

@@ -54,7 +54,7 @@ class TreeMap extends AbstractMap
      *
      * @since 1.0.0
      */
-    private $comparator;
+    private $comparatorInternal;
 
     /**
      * Constructor
@@ -66,11 +66,11 @@ class TreeMap extends AbstractMap
     protected function __construct($comparator = null)
     {
         if ($comparator === null) {
-            $this->comparator = function ($key1, $key2) {
+            $this->comparatorInternal = function ($key1, $key2) {
                 return $key1 <=> $key2;
             };
         } else {
-            $this->comparator = $comparator;
+            $this->comparatorInternal = $comparator;
         }
     }
 
@@ -97,7 +97,7 @@ public static function create($comparator = null)
      */
     public function comparator()
     {
-        return $this->comparator;
+        return $this->comparatorInternal;
     }
 
     /**
@@ -194,7 +194,7 @@ public function successor($element)
     public function lower($key)
     {
         if ($this->root) {
-            $lower = $this->root->find($key, $this->comparator, -2);
+            $lower = $this->root->find($key, $this->comparatorInternal, -2);
         } else {
             $lower = null;
         }
@@ -220,7 +220,7 @@ public function lower($key)
     public function floor($key)
     {
         if ($this->root) {
-            $floor = $this->root->find($key, $this->comparator, -1);
+            $floor = $this->root->find($key, $this->comparatorInternal, -1);
         } else {
             $floor = null;
         }
@@ -246,7 +246,7 @@ public function floor($key)
     public function find($key)
     {
         if ($this->root) {
-            $find = $this->root->find($key, $this->comparator, 0);
+            $find = $this->root->find($key, $this->comparatorInternal, 0);
         } else {
             $find = null;
         }
@@ -272,7 +272,7 @@ public function find($key)
     public function ceiling($key)
     {
         if ($this->root) {
-            $ceiling = $this->root->find($key, $this->comparator, 1);
+            $ceiling = $this->root->find($key, $this->comparatorInternal, 1);
         } else {
             $ceiling = null;
         }
@@ -298,7 +298,7 @@ public function ceiling($key)
     public function higher($key)
     {
         if ($this->root) {
-            $higher = $this->root->find($key, $this->comparator, 2);
+            $higher = $this->root->find($key, $this->comparatorInternal, 2);
         } else {
             $higher = null;
         }
@@ -408,7 +408,7 @@ public function jsonSerialize(): array
     public function offsetSet($key, $value): void
     {
         if ($this->root) {
-            $this->root = $this->root->insert($key, $value, $this->comparator);
+            $this->root = $this->root->insert($key, $value, $this->comparatorInternal);
         } else {
             $this->root = TreeNode::create($key, $value);
         }
@@ -426,7 +426,7 @@ public function offsetSet($key, $value): void
     public function offsetUnset($key): void
     {
         if ($this->root) {
-            $this->root = $this->root->remove($key, $this->comparator);
+            $this->root = $this->root->remove($key, $this->comparatorInternal);
         }
     }
 

src/SortedCollection/TreeNode.php

@@ -58,7 +58,7 @@ class TreeNode implements \Countable
      *
      * @since 1.0.0
      */
-    private $key;
+    private $keyInternal;
 
     /**
      * @var mixed  Node value
@@ -94,7 +94,7 @@ public static function create($key, $value)
      */
     protected function __construct($key, $value, $predecessor = null, $successor = null)
     {
-        $this->key = $key;
+        $this->keyInternal = $key;
         $this->value = $value;
         $this->left = $predecessor;
         $this->right = $successor;
@@ -123,7 +123,7 @@ public function __get($property)
             case 'successor':
                 return $this->successor();
             case 'key':
-                return $this->key;
+                return $this->keyInternal;
             case 'count':
                 return $this->count();
             default:
@@ -265,7 +265,7 @@ public function find($key, $comparator, $type = 0)
         $cmp = 0;
 
         while (true) {
-            $cmp = call_user_func($comparator, $key, $node->key);
+            $cmp = call_user_func($comparator, $key, $node->keyInternal);
 
             if ($cmp < 0 && $node->information & 2) {
                 $node = $node->left;
@@ -429,7 +429,7 @@ private function decBalance()
     public function insert($key, $value, $comparator)
     {
         $node = $this;
-        $cmp = call_user_func($comparator, $key, $this->key);
+        $cmp = call_user_func($comparator, $key, $this->keyInternal);
 
         if ($cmp < 0) {
             if ($this->information & 2) {
@@ -483,7 +483,7 @@ private function pullUpLeftMost()
                 return $this;
             }
         } else {
-            $this->left->key = $this->key;
+            $this->left->keyInternal = $this->keyInternal;
             $this->left->value = $this->value;
 
             if ($this->information & 1) {
@@ -516,7 +516,7 @@ private function pullUpLeftMost()
      */
     public function remove($key, $comparator)
     {
-        $cmp = call_user_func($comparator, $key, $this->key);
+        $cmp = call_user_func($comparator, $key, $this->keyInternal);
 
         if ($cmp < 0) {
             if ($this->information & 2) {

src/SortedCollection/TreeSet.php

@@ -82,7 +82,13 @@ public function put($traversable = array())
      */
     public function clear()
     {
-        $this->getMap()->clear();
+        $map = $this->getMap();
+
+        if ($map instanceof TreeMap) {
+            $map->clear();
+        } else {
+            $this->setMap(TreeMap::create($map->comparator()));
+        }
 
         return $this;
     }

tests/SortedCollection/TreeNodeTest.php

@@ -41,7 +41,7 @@ protected function nodeToString($node)
             $string = '(';
 
             // Set the key property accessible
-            $key = (new \ReflectionClass($node))->getProperty('key');
+            $key = (new \ReflectionClass($node))->getProperty('keyInternal');
             $key->setAccessible(true);
             $string .= $key->getValue($node);