Cast to array

hassankhan · Mar 27, 2019 · 00462ce · 00462ce
1 parent e410d0d
commit 00462ce
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 20 deletions.
diff --git a/src/Parser/Json.php b/src/Parser/Json.php
@@ -25,8 +25,8 @@ class Json implements ParserInterface
     public function parseFile($filename)
     {
         $data = json_decode(file_get_contents($filename), true);
-        $parsed = $this->parse($data, $filename);
-        return $parsed === null ? [] : $parsed;
+
+        return (array)$this->parse($data, $filename);
     }
 
     /**
@@ -38,16 +38,16 @@ public function parseFile($filename)
     public function parseString($config)
     {
         $data = json_decode($config, true);
-        $parsed = $this->parse($data);
 
-        return $parsed === null ? [] : $parsed;
+        return (array)$this->parse($data);
     }
 
     /**
      * Completes parsing of JSON data
      *
-     * @param  array   $data
+     * @param  array  $data
      * @param  string $filename
+     * @return array|null
      *
      * @throws ParseException If there is an error parsing the JSON data
      */

diff --git a/src/Parser/Php.php b/src/Parser/Php.php
@@ -40,8 +40,7 @@ public function parseFile($filename)
         }
 
         // Complete parsing
-        $parsed = $this->parse($data, $filename);
-        return $parsed === null ? [] : $parsed;
+        return (array)$this->parse($data, $filename);
     }
 
     /**
@@ -72,8 +71,7 @@ public function parseString($config)
         }
 
         // Complete parsing
-        $parsed = $this->parse($data);
-        return $parsed === null ? [] : $parsed;
+        return (array)$this->parse($data);
     }
 
     /**

diff --git a/src/Parser/Xml.php b/src/Parser/Xml.php
@@ -26,9 +26,8 @@ public function parseFile($filename)
     {
         libxml_use_internal_errors(true);
         $data = simplexml_load_file($filename, null, LIBXML_NOERROR);
-        $parsed = $this->parse($data, $filename);
 
-        return $parsed === null ? [] : $parsed;
+        return (array)$this->parse($data, $filename);
     }
 
     /**
@@ -41,9 +40,7 @@ public function parseString($config)
     {
         libxml_use_internal_errors(true);
         $data = simplexml_load_string($config, null, LIBXML_NOERROR);
-        $parsed = $this->parse($data);
-
-        return $parsed === null ? [] : $parsed;
+        return (array)$this->parse($data);
     }
 
     /**
@@ -53,6 +50,7 @@ public function parseString($config)
      * @param  string $filename
      *
      * @return array|null
+     *
      * @throws ParseException If there is an error parsing the XML data
      */
     protected function parse($data = null, $filename = null)

diff --git a/src/Parser/Yaml.php b/src/Parser/Yaml.php
@@ -37,9 +37,7 @@ public function parseFile($filename)
             );
         }
 
-        $parsed = $this->parse($data);
-
-        return $parsed === null ? [] : $parsed;
+        return (array)$this->parse($data);
     }
 
     /**
@@ -61,9 +59,7 @@ public function parseString($config)
             );
         }
 
-        $parsed = $this->parse($data);
-
-        return $parsed === null ? [] : $parsed;
+        return (array)$this->parse($data);
     }
 
     /**