Merge pull request #1138 from cclep/master

Fixed 500 error when requesting include that didn't exist
dingo · Feb 17, 2019 · e0c8648 · e0c8648
2 parents 187db79 + 5b7743e
commit e0c8648
Showing 1 changed file with 10 additions and 4 deletions.
diff --git a/src/Transformer/Adapter/Fractal.php b/src/Transformer/Adapter/Fractal.php
@@ -4,6 +4,7 @@
 
 use Dingo\Api\Http\Request;
 use Dingo\Api\Transformer\Binding;
+use League\Fractal\TransformerAbstract;
 use Dingo\Api\Contract\Transformer\Adapter;
 use League\Fractal\Manager as FractalManager;
 use League\Fractal\Resource\Item as FractalItem;
@@ -64,10 +65,10 @@ public function __construct(FractalManager $fractal, $includeKey = 'include', $i
     /**
      * Transform a response with a transformer.
      *
-     * @param mixed                          $response
-     * @param object                         $transformer
-     * @param \Dingo\Api\Transformer\Binding $binding
-     * @param \Dingo\Api\Http\Request        $request
+     * @param mixed                                     $response
+     * @param League\Fractal\TransformerAbstract|object $transformer
+     * @param \Dingo\Api\Transformer\Binding            $binding
+     * @param \Dingo\Api\Http\Request                   $request
      *
      * @return array
      */
@@ -89,6 +90,11 @@ public function transform($response, $transformer, Binding $binding, Request $re
         if ($this->shouldEagerLoad($response)) {
             $eagerLoads = $this->mergeEagerLoads($transformer, $this->fractal->getRequestedIncludes());
 
+            if ($transformer instanceof TransformerAbstract) {
+                // Only eager load the items in available includes
+                $eagerLoads = array_intersect($eagerLoads, $transformer->getAvailableIncludes());
+            }
+
             $response->load($eagerLoads);
         }