Fix bug and updated tests.

stfalcon-studio · Apr 4, 2019 · 1f6dd4c · 1f6dd4c
1 parent 89581f5
commit 1f6dd4c
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 5 deletions.
diff --git a/src/Config/ConfigParser.php b/src/Config/ConfigParser.php
@@ -51,8 +51,7 @@ private function iterate(array $config): array
                 $path = $this->configFolder.$nestedPath;
 
                 if (\is_dir($path)) {
-                    $config[$key] = [];
-                    $config[$key] += $this->parseDir($path);
+                    $config[$key] = $this->parseDir($path);
                 } else if(\is_file($path)) {
                     $config[$key] = $this->parseFile($path);
                 } else {
@@ -81,6 +80,7 @@ private function parseDir(string $dirPath): array
     {
         $finder = new Finder();
         $finder
+            ->depth('<=1')
             ->files()
             ->in($dirPath)
             ->sortByName()
@@ -90,7 +90,7 @@ private function parseDir(string $dirPath): array
         $nestedDirs = [];
         if ($finder->hasResults()) {
             foreach ($finder as $file) {
-                $nestedDirs += Yaml::parseFile($file->getPathname());
+                $nestedDirs = \array_replace_recursive($nestedDirs, Yaml::parseFile($file->getPathname()));
             }
         }
 

diff --git a/tests/Config/ConfigParserTest.php b/tests/Config/ConfigParserTest.php
@@ -43,15 +43,19 @@ public function testParse(): void
                             ],
                         ],
                     ],
+                    'get' => [
+                        'operationId' => 'GetOrderList',
+                        'summary' => 'Get orders list',
+                    ],
                 ],
                 '/users' => [
                     'post' => [
                         'operationId' => 'CreateUser',
                         'summary' => 'Create User',
                         'responses' => [
                             '201' => [
-                                'description' => '201 response'
-                            ]
+                                'description' => '201 response',
+                            ],
                         ],
                     ],
                 ],

diff --git a/tests/Config/Fixtures/api/paths/order/get-order-list.yaml b/tests/Config/Fixtures/api/paths/order/get-order-list.yaml
@@ -0,0 +1,4 @@
+"/orders":
+  get:
+    operationId: GetOrderList
+    summary: Get orders list