Merge pull request #9 from appointer/support-dir-nesting

Support dir nesting (and further minor tweaks)

Author: martinlindhe

composer.json

@@ -12,7 +12,8 @@
     ],
     "require": {
         "php": ">=5.5.0",
-        "laravel/framework": "~5.1"
+        "illuminate/console": "~5.1.0|~5.2.0|~5.3.0",
+        "illuminate/support": "~5.1.0|~5.2.0|~5.3.0"
     },
     "require-dev": {
         "phpunit/phpunit": "~4.7"

src/Generator.php

@@ -42,10 +42,21 @@ private function allocateLocaleArray($path)
 
         $dir = new DirectoryIterator($path);
         foreach ($dir as $fileinfo) {
-            if (!$fileinfo->isDot()) {
+            // Do not mess with dotfiles at all.
+            if ($fileinfo->isDot()) {
+                continue;
+            }
+
+            // Check if the "file" is a subdirectory which has to be scanned.
+            if ($fileinfo->isDir()) {
+                // Recursivley iterate through subdirs, until everything was allocated.
+                $data[$fileinfo->getFilename()] =
+                    $this->allocateLocaleArray($path . '/' . $fileinfo->getFilename());
+            } else {
                 $noExt = $this->removeExtension($fileinfo->getFilename());
+
                 // Ignore non *.php files (ex.: .gitignore, vim swap files etc.)
-                if (pathinfo($fileinfo->getFileName())['extension'] !== 'php') {
+                if (pathinfo($fileinfo->getFileName(), PATHINFO_EXTENSION) !== 'php') {
                     continue;
                 }
                 $tmp = include($path . '/' . $fileinfo->getFilename());

src/GeneratorProvider.php

@@ -30,6 +30,10 @@ public function boot()
             __DIR__.'/config/vue-i18n-generator.php' => config_path('vue-i18n-generator.php'),
         ]);
 
+         $this->mergeConfigFrom(
+            __DIR__.'/config/vue-i18n-generator.php',
+            'vue-i18n-generator'
+        );
     }
 
     /**