Move array response logic from FilterResponse to Filterer

Author: jncarver

src/FilterResponse.php

@@ -58,21 +58,4 @@ public function __set($name, $value)
 
         throw new InvalidArgumentException("Property '{$name}' does not exist");
     }
-
-    /**
-     * Converts the response to an array.
-     *
-     * @return array
-     */
-    public function toArray() : array
-    {
-        $filteredValue = $this->success ? $this->filteredValue : null;
-
-        return [
-            $this->success,
-            $filteredValue,
-            $this->errorMessage,
-            $this->unknowns
-        ];
-    }
 }

src/Filterer.php

@@ -489,7 +489,12 @@ private static function generateFilterResponse(
         }
 
         if ($responseType === self::RESPONSE_TYPE_ARRAY) {
-            return $filterResponse->toArray();
+            return [
+                $filterResponse->success,
+                $filterResponse->success ? $filterResponse->filteredValue : null,
+                $filterResponse->errorMessage,
+                $filterResponse->unknowns
+            ];
         }
 
         throw new InvalidArgumentException("'responseType' was not a recognized value");

tests/FilterResponseTest.php

@@ -105,43 +105,4 @@ public function settingInvalidPropertyThrowsAnException()
         $response = new FilterResponse([]);
         $response->foo = false;
     }
-
-    /**
-     * @test
-     * @covers ::toArray
-     * @dataProvider provideToArray
-     *
-     * @param array $value    The filtered value to pass to the response.
-     * @param array $errors   The errors to pass to the response.
-     * @param array $unknowns The unknowns to pass to the response.
-     * @param array $expected The expected array value.
-     */
-    public function toArray(array $value, array $errors, array $unknowns, array $expected)
-    {
-        $response = new FilterResponse($value, $errors, $unknowns);
-        $arrayResponse = $response->toArray();
-
-        $this->assertSame($expected, $arrayResponse);
-    }
-
-    /**
-     * @return array
-     */
-    public function provideToArray() : array
-    {
-        return [
-            'success' => [
-                'input' => ['foo' => 'bar'],
-                'errors' => [],
-                'unknowns' => ['other' => 'unknown'],
-                'expected' => [true, ['foo' => 'bar'], null, ['other' => 'unknown']],
-            ],
-            'failure' => [
-                'input' => ['foo' => 'bar'],
-                'errors' => ['something bad happened', 'and something else too'],
-                'unknowns' => ['other' => 'unknown'],
-                'expected' => [false, null, "something bad happened\nand something else too", ['other' => 'unknown']],
-            ],
-        ];
-    }
 }