Fixed Invalid argument supplied for foreach()

thephpleague · Jun 9, 2014 · ba967b1 · ba967b1
1 parent cdf7e41
commit ba967b1
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/src/Manager.php b/src/Manager.php
@@ -127,13 +127,21 @@ public function getSerializer()
      **/
     public function parseIncludes($includes)
     {
+        if (empty($includes)) {
+            return $this;
+        }
+
         // Wipe these before we go again
         $this->requestedIncludes = $this->includeParams = array();
 
         if (is_string($includes)) {
             $includes = explode(',', $includes);
         }
 
+        if (! is_array($includes)) {
+            throw new InvalidArgumentException('The parseIncludes() method expects a string or an array');
+        }
+
         foreach ($includes as $include) {
 
             list($includeName, $allModifiersStr) = array_pad(explode(':', $include, 2), 2, null);