Fix null handling of Collection::outerJoin()

Author: emonkak

src/Iterator/OuterJoinIterator.php

@@ -162,7 +162,7 @@ private function fetchInners()
                 $this->resultValue = $resultValueSelector($this->outerValue, reset($this->inners));
             } else {
                 $this->inners = [];
-                $this->resultValue = $resultValueSelector($this->outerValue, null);
+                $this->resultValue = $this->outerValue;
             }
         }
     }

src/Provider/ArrayProvider.php

@@ -100,7 +100,7 @@ public function outerJoin($outer, $inner, callable $outerKeySelector, callable $
                     $results[] = $resultValueSelector($outerValue, $innerValue);
                 }
             } else {
-                $results[] = $resultValueSelector($outerValue, null);
+                $results[] = $outerValue;
             }
         }
 

src/Provider/GeneratorProvider.php

@@ -111,7 +111,7 @@ public function outerJoin($outer, $inner, callable $outerKeySelector, callable $
                         yield $resultValueSelector($outerValue, $innerValue);
                     }
                 } else {
-                    yield $resultValueSelector($outerValue, null);
+                    yield $outerValue;
                 }
             }
         });

tests/AbstractCollectionTest.php

@@ -286,9 +286,9 @@ public function testJoin($factory)
         $result = $factory($talents)
             ->join(
                 $users,
-                function($talent) { return $talent['id']; },
-                function($user) { return $user['talent_id']; },
-                function($talent, $user) {
+                function(array $talent) { return $talent['id']; },
+                function(array $user) { return $user['talent_id']; },
+                function(array $talent, array $user) {
                     $talent['user'] = $user;
                     return $talent;
                 }
@@ -320,16 +320,16 @@ public function testOuterJoin($factory)
             ['id' => 1, 'name' => 'Sumire Uesaka', 'user' => $users[0]],
             ['id' => 2, 'name' => 'Mikako Komatsu', 'user' => $users[1]],
             ['id' => 2, 'name' => 'Mikako Komatsu', 'user' => $users[2]],
-            ['id' => 3, 'name' => 'Rumi Okubo', 'user' => null],
+            ['id' => 3, 'name' => 'Rumi Okubo'],
             ['id' => 4, 'name' => 'Natsumi Takamori', 'user' => $users[3]],
             ['id' => 5, 'name' => 'Shiori Mikami', 'user' => $users[4]],
         ];
         $result = $factory($talents)
             ->outerJoin(
                 $users,
-                function($talent) { return $talent['id']; },
-                function($user) { return $user['talent_id']; },
-                function($talent, $user) {
+                function(array $talent) { return $talent['id']; },
+                function(array $user) { return $user['talent_id']; },
+                function(array $talent, array $user) {
                     $talent['user'] = $user;
                     return $talent;
                 }
@@ -388,9 +388,9 @@ public function testGroupJoin($factory)
         $result = $factory($users)
             ->groupJoin(
                 $tweets,
-                function($user) { return $user['id']; },
-                function($user) { return $user['user_id']; },
-                function($user, $tweets) {
+                function(array $user) { return $user['id']; },
+                function(array $user) { return $user['user_id']; },
+                function(array $user, array $tweets) {
                     $user['tweets'] = $tweets;
                     return $user;
                 }