Merge branch 'include-nesting' of https://github.com/thomasvanlankveld/api into rewrite

Author: jasonlewis

src/Transformer/FractalTransformer.php

@@ -76,7 +76,9 @@ public function transform($response, $transformer, Binding $binding, Request $re
         }
 
         if ($response instanceof EloquentCollection) {
-            $response->load($this->fractal->getRequestedIncludes());
+            $requestedIncludes = $this->fractal->getRequestedIncludes();
+            $eagerLoads = $this->getEagerLoads($transformer, $requestedIncludes);
+            $response->load($eagerLoads);
         }
 
         foreach ($binding->getMeta() as $key => $value) {
@@ -129,7 +131,10 @@ protected function createResource($response, $transformer, array $parameters)
      */
     public function parseFractalIncludes(Request $request)
     {
-        $includes = array_filter(explode($this->includeSeparator, $request->get($this->includeKey)));
+        $includes = $request->get($this->includeKey);
+
+        if(!is_array($includes))
+            $includes = array_filter(explode($this->includeSeparator, $includes));
 
         $this->fractal->parseIncludes($includes);
     }
@@ -143,4 +148,34 @@ public function getFractal()
     {
         return $this->fractal;
     }
+
+    /**
+     * Get includes as their array keys for eager loading.
+     *
+     * @param string|string[] $requestedIncludes
+     *
+     * @return string[]
+     */
+    public function getEagerLoads($transformer, $requestedIncludes)
+    {
+        $requestedIncludes = (array) $requestedIncludes; // Ensure $requestedIncludeStrings is an array
+
+        $availableRequestedIncludes = array_intersect($transformer->getAvailableIncludes(), $requestedIncludes);
+        $defaultIncludes = $transformer->getDefaultIncludes();
+
+        $includes = array_merge($availableRequestedIncludes, $defaultIncludes);
+
+        $eagerLoads = array();
+
+        foreach ($includes as $includeKey => $includeName) {
+            if (gettype($includeKey) === "string") {
+                unset($includes[$includeKey]);
+                array_push($eagerLoads, $includeKey);
+            } else {
+                array_push($eagerLoads, $includeName);
+            }
+        }
+
+        return $eagerLoads;
+    }
 }