Generator: propagate error if found unexpected data

martinlindhe · Feb 7, 2017 · 206c158 · 206c158
1 parent 9903ba3
commit 206c158
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/src/Generator.php b/src/Generator.php
@@ -54,12 +54,17 @@ private function allocateLocaleArray($path)
                     $this->allocateLocaleArray($path . '/' . $fileinfo->getFilename());
             } else {
                 $noExt = $this->removeExtension($fileinfo->getFilename());
+                $fileName = $path . '/' . $fileinfo->getFilename();
 
                 // Ignore non *.php files (ex.: .gitignore, vim swap files etc.)
-                if (pathinfo($fileinfo->getFileName(), PATHINFO_EXTENSION) !== 'php') {
+                if (pathinfo($fileName, PATHINFO_EXTENSION) !== 'php') {
+                    continue;
+                }
+                $tmp = include($fileName);
+                if (gettype($tmp) !== "array") {
+                    throw new Exception('Unexpected data while processing '.$fileName);
                     continue;
                 }
-                $tmp = include($path . '/' . $fileinfo->getFilename());
 
                 $data[$noExt] = $this->adjustArray($tmp);
             }