Revert "optimized distinct() operator"

This reverts commit 9a85ced.

Author: martinsik

lib/Rx/Operator/DistinctOperator.php

@@ -18,8 +18,13 @@ class DistinctOperator implements OperatorInterface
 
     public function __construct(callable $keySelector = null, callable $comparer = null)
     {
-        $this->comparer = $comparer;
+
+        $this->comparer = $comparer ?: function ($x, $y) {
+            return $x == $y;
+        };
+
         $this->keySelector = $keySelector;
+
     }
 
     /**
@@ -38,22 +43,15 @@ function ($value) use ($observer, &$values) {
                 try {
                     $key = $this->keySelector ? call_user_func($this->keySelector, $value) : $value;
 
-                    if ($this->comparer) {
-                        foreach ($values as $v) {
-                            $comparerEquals = call_user_func($this->comparer, $key, $v);
+                    foreach ($values as $v) {
+                        $comparerEquals = call_user_func($this->comparer, $key, $v);
 
-                            if ($comparerEquals) {
-                                return;
-                            }
-                        }
-                        $values[] = $key;
-                    } else {
-                        if (array_key_exists($key, $values)) {
+                        if ($comparerEquals) {
                             return;
                         }
-                        $values[$key] = null;
                     }
 
+                    $values[] = $key;
                     $observer->onNext($value);
 
                 } catch (\Exception $e) {

test/Rx/Functional/Operator/DistinctTest.php

@@ -353,45 +353,6 @@ public function distinct_CustomKey_some_throw()
 
     }
 
-    /**
-     * @test
-     */
-    public function distinct_CustomKey_and_CustomComparer_some_duplicates()
-    {
-
-        $xs = $this->createHotObservable([
-            onNext(280, ['id' => 4]),
-            onNext(300, ['id' => 2]),
-            onNext(350, ['id' => 12]),
-            onNext(380, ['id' => 3]),
-            onNext(400, ['id' => 24]),
-            onCompleted(420)
-        ]);
-
-        $results = $this->scheduler->startWithCreate(function () use ($xs) {
-            return $xs->distinctKey(
-                function ($x) {
-                    return $x['id'];
-                },
-                $this->modComparer(10)
-            )->map(function ($x) {
-                return $x['id'];
-            });
-        });
-
-        $this->assertMessages([
-            onNext(280, 4),
-            onNext(300, 2),
-            onNext(380, 3),
-            onCompleted(420)
-        ], $results->getMessages());
-
-        $this->assertSubscriptions([
-            subscribe(200, 420)
-        ], $xs->getSubscriptions());
-
-    }
-
 
     public function modComparer($mod)
     {