convert from illuminate request to dingo request in transformer factory

Author: pulkitjalan

src/Transformer/Factory.php

@@ -4,10 +4,12 @@
 
 use Closure;
 use RuntimeException;
+use Dingo\Api\Http\Request;
 use Illuminate\Support\Collection;
 use Illuminate\Container\Container;
 use Dingo\Api\Contract\Transformer\Adapter;
 use Illuminate\Contracts\Pagination\Paginator;
+use Illuminate\Http\Request as IlluminateRequest;
 
 class Factory
 {
@@ -82,7 +84,7 @@ public function transform($response)
     {
         $binding = $this->getBinding($response);
 
-        return $this->adapter->transform($response, $binding->resolveTransformer(), $binding, $this->container['request']);
+        return $this->adapter->transform($response, $binding->resolveTransformer(), $binding, $this->getRequest());
     }
 
     /**
@@ -224,4 +226,20 @@ public function getAdapter()
     {
         return $this->adapter;
     }
+
+    /**
+     * Get the request from the container.
+     *
+     * @return \Dingo\Api\Http\Request
+     */
+    public function getRequest()
+    {
+        $request = $this->container['request'];
+
+        if ($request instanceof IlluminateRequest && ! $request instanceof Request) {
+            $request = (new Request())->createFromIlluminate($request);
+        }
+
+        return $request;
+    }
 }

tests/Transformer/FactoryTest.php

@@ -83,6 +83,20 @@ public function testTransformingCollectionResponse()
         $this->assertEquals([['name' => 'Jason'], ['name' => 'Bob']], $response);
     }
 
+    public function testTransforingWithIlluminateRequest()
+    {
+        $container = new Container;
+        $container['request'] = new \Illuminate\Http\Request();
+
+        $factory = new Factory($container, new TransformerStub);
+
+        $factory->register('Dingo\Api\Tests\Stubs\UserStub', new UserTransformerStub);
+
+        $response = $factory->transform(new UserStub('Jason'));
+
+        $this->assertEquals(['name' => 'Jason'], $response);
+    }
+
     /**
      * @expectedException \RuntimeException
      * @expectedExceptionMessage Unable to find bound transformer for "Dingo\Api\Tests\Stubs\UserStub" class