Fix closure transformer

Author: yajra

src/Transformers/FractalTransformer.php

@@ -2,6 +2,7 @@
 
 namespace Yajra\DataTables\Transformers;
 
+use Closure;
 use Illuminate\Support\Collection as LaravelCollection;
 use League\Fractal\Manager;
 use League\Fractal\Resource\Collection;
@@ -82,11 +83,11 @@ protected function createSerializer(SerializerAbstract|string $serializer): Seri
      * Get or create transformer instance.
      *
      * @param  \Closure|class-string|TransformerAbstract  $transformer
-     * @return \League\Fractal\TransformerAbstract
+     * @return \Closure|\League\Fractal\TransformerAbstract
      */
-    protected function createTransformer(\Closure|string|TransformerAbstract $transformer): TransformerAbstract
+    protected function createTransformer(Closure|string|TransformerAbstract $transformer): Closure|TransformerAbstract
     {
-        if ($transformer instanceof TransformerAbstract || $transformer instanceof \Closure) {
+        if ($transformer instanceof TransformerAbstract || $transformer instanceof Closure) {
             return $transformer;
         }
 

tests/FractalTest.php

@@ -25,6 +25,21 @@ public function it_can_transform_response()
         $this->assertIsString($json['data'][0]['name']);
     }
 
+    /** @test */
+    public function it_works_with_closure()
+    {
+        $json = $this->getAjax('/closure');
+
+        $json->assertJson([
+            'draw' => 0,
+            'recordsTotal' => 20,
+            'recordsFiltered' => 20,
+        ]);
+
+        $this->assertIsInt($json['data'][0]['id']);
+        $this->assertIsString($json['data'][0]['name']);
+    }
+
     protected function setUp(): void
     {
         parent::setUp();
@@ -34,5 +49,16 @@ protected function setUp(): void
                                ->setTransformer(UserTransformer::class)
                                ->toJson();
         });
+
+        $this->app['router']->get('/closure', function () {
+            return datatables()->eloquent(User::query())
+                               ->setTransformer(function (User $user) {
+                                   return [
+                                       'id' => (int) $user->id,
+                                       'name' => $user->name,
+                                   ];
+                               })
+                               ->toJson();
+        });
     }
 }