Resolving ambiguities in dump function code

DusanKasan · Jun 8, 2016 · ff594da · ff594da
1 parent e24d0d6
commit ff594da
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 5 deletions.
diff --git a/composer.json b/composer.json
@@ -31,7 +31,11 @@
       "src/utility_functions.php"
     ],
     "psr-4": {
-      "DusanKasan\\Knapsack\\": "src/",
+      "DusanKasan\\Knapsack\\": "src/"
+    }
+  },
+  "autoload-dev": {
+    "psr-4": {
       "DusanKasan\\Knapsack\\Tests\\Helpers\\": "tests/helpers/"
     }
   }

diff --git a/src/collection_functions.php b/src/collection_functions.php
@@ -1661,14 +1661,14 @@ function dump($input, $maxItemsPerCollection = null, $maxDepth = null)
         return $input;
     }
 
-    if (isCollection($input)) {
+    if (is_array($input) || $input instanceof Traversable) {
         if ($maxDepth === 0) {
             return '^^^';
         }
 
         $normalizedProperties = [];
         foreach ($input as $key => $value) {
-            if ($maxItemsPerCollection && count($normalizedProperties) >= $maxItemsPerCollection) {
+            if ($maxItemsPerCollection !== null && count($normalizedProperties) >= $maxItemsPerCollection) {
                 $normalizedProperties[] = '>>>';
                 break;
             }

diff --git a/tests/helpers/Car.php b/tests/helpers/Car.php
@@ -2,7 +2,6 @@
 
 namespace DusanKasan\Knapsack\Tests\Helpers;
 
-
 class Car extends Machine
 {
     /**

diff --git a/tests/helpers/Machine.php b/tests/helpers/Machine.php
@@ -2,7 +2,6 @@
 
 namespace DusanKasan\Knapsack\Tests\Helpers;
 
-
 class Machine
 {
     /**