Merge branch 'develop'

ShopBundle/Services/CsvGenerator.php

@@ -61,9 +61,13 @@ class CsvGenerator
 
         public function encodeArray($array)
         {
-                return array_map(function($value) {
-                        return $this->encode($value) ;
-                }, $array) ;
+                if($array && is_array($array)) {
+                        return array_map(function($value) {
+                                return $this->encode($value) ;
+                        }, $array) ;
+                }
+
+                return $array ;
         }
 
         public function setTitle($title, $displayHeader = false){