Allow the third and fourth parameters to be interchangeable for a cleaner API. More test coverage for the transformer factory.

Signed-off-by: Jason Lewis <[email protected]>

Author: jasonlewis

src/Transformer/Binding.php

@@ -88,7 +88,7 @@ public function resolveTransformer()
      *
      * @return void
      */
-    public function fireCallback($parameters)
+    public function fireCallback($parameters = null)
     {
         if (is_callable($this->callback)) {
             call_user_func_array($this->callback, func_get_args());

src/Transformer/Factory.php

@@ -51,13 +51,23 @@ public function __construct(Container $container, Adapter $adapter)
      *
      * @param string                 $class
      * @param string|callable|object $resolver
-     * @param array                  $parameters
-     * @param \Closure               $after
+     * @param array|\Closure         $third
+     * @param \Closure               $fourth
      *
      * @return \Dingo\Api\Transformer\Binding
      */
-    public function register($class, $resolver, array $parameters = [], Closure $after = null)
+    public function register($class, $resolver, $third = null, $fourth = null)
     {
+        if (func_num_args() == 4) {
+            list($parameters, $after) = array_slice(func_get_args(), 2);
+        } elseif (is_array($third)) {
+            list($parameters, $after) = [$third, null];
+        } elseif ($third instanceof Closure) {
+            list($parameters, $after) = [[], $third];
+        } else {
+            list($parameters, $after) = [[], null];
+        }
+
         return $this->bindings[$class] = $this->createBinding($resolver, $parameters, $after);
     }
 

tests/Transformer/FactoryTest.php

@@ -36,6 +36,29 @@ public function testResponseIsTransformable()
         $this->assertTrue($this->factory->transformableResponse(new UserStub, new UserTransformerStub));
     }
 
+    public function testRegisterParameterOrder()
+    {
+        // Third parameter is parameters and fourth is callback.
+        $binding = $this->factory->register('Dingo\Api\Tests\Stubs\UserStub', new UserTransformerStub, ['foo' => 'bar'], function ($foo) {
+            $this->assertEquals('foo', $foo);
+        });
+
+        $binding->fireCallback('foo');
+        $this->assertEquals(['foo' => 'bar'], $binding->getParameters());
+
+        // Third parameter is parameters and fourth is null.
+        $binding = $this->factory->register('Dingo\Api\Tests\Stubs\UserStub', new UserTransformerStub, ['foo' => 'bar']);
+
+        $this->assertEquals(['foo' => 'bar'], $binding->getParameters());
+
+        // Third parameter is callback and fourth is null.
+        $binding = $this->factory->register('Dingo\Api\Tests\Stubs\UserStub', new UserTransformerStub, function ($foo) {
+            $this->assertEquals('foo', $foo);
+        });
+
+        $binding->fireCallback('foo');
+    }
+
     public function testResponseIsTransformableType()
     {
         $this->assertFalse($this->factory->transformableType(['foo' => 'bar']));