simplify collection detection

Cyvelnet · Aug 14, 2017 · 7002fd1 · 7002fd1
1 parent 43edf16
commit 7002fd1
Showing 1 changed file with 7 additions and 13 deletions.
diff --git a/src/Cyvelnet/Laravel5Fractal/Traits/Transformable.php b/src/Cyvelnet/Laravel5Fractal/Traits/Transformable.php
@@ -3,6 +3,7 @@
 namespace Cyvelnet\Laravel5Fractal\Traits;
 
 use League\Fractal\Pagination\PaginatorInterface;
+use Illuminate\Pagination\AbstractPaginator as Paginator;
 
 /**
  * Trait Transformable.
@@ -116,12 +117,7 @@ public function transform($data, $transformer = null, $resourceKey = null, Pagin
      */
     protected function getCollectionClass()
     {
-        return [
-            'Illuminate\Support\Collection',
-            'Illuminate\Database\Eloquent\Collection',
-            'Illuminate\Pagination\LengthAwarePaginator',
-            'Illuminate\Pagination\Paginator',
-        ];
+        return [];
     }
 
     /**
@@ -159,19 +155,17 @@ protected function getTransformerProperty()
      */
     protected function isCollection($data)
     {
-        if (is_array($data)) {
+        if (is_array($data) || $data instanceof \Illuminate\Support\Collection || $data instanceof Paginator) {
             return true;
         }
 
         $length = count($this->getCollectionClass());
 
-        if ($length) {
-            for ($i = 0; $i < $length; $i++) {
-                $class = \Illuminate\Support\Arr::get($this->getCollectionClass(), $i);
+        for ($i = 0; $i < $length; $i++) {
+            $class = \Illuminate\Support\Arr::get($this->getCollectionClass(), $i);
 
-                if ($data instanceof $class) {
-                    return true;
-                }
+            if ($data instanceof $class) {
+                return true;
             }
         }