Apply configuration to route groups

mpociot · Oct 11, 2018 · 2847da1 · 2847da1
1 parent e896710
commit 2847da1
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 12 deletions.
diff --git a/config/apidoc.php b/config/apidoc.php
@@ -79,15 +79,12 @@
              * Specify rules to be applied to all the routes in this group when generating documentation
              */
             'apply' => [
-                'requests' => [
-
-                    /*
-                     * Specify headers to be added to the example requests
-                     */
-                    'headers' => [
-                        // 'Authorization' => 'Bearer: {token}',
-                        // 'Api-Version' => 'v2',
-                    ],
+                /*
+                 * Specify headers to be added to the example requests
+                 */
+                'headers' => [
+                    // 'Authorization' => 'Bearer: {token}',
+                    // 'Api-Version' => 'v2',
                 ],
             ],
         ],

diff --git a/src/Commands/GenerateDocumentation.php b/src/Commands/GenerateDocumentation.php
@@ -188,10 +188,9 @@ private function processRoutes(AbstractGenerator $generator, array $routes)
         $parsedRoutes = [];
         foreach ($routes as $routeItem) {
             $route = $routeItem['route'];
-            $apply = $routeItem['apply'];
             /** @var Route $route */
                 if ($this->isValidRoute($route) && $this->isRouteVisibleForDocumentation($route->getAction()['uses'])) {
-                    $parsedRoutes[] = $generator->processRoute($route, $apply);
+                    $parsedRoutes[] = $generator->processRoute($route) + $routeItem['apply'];
                     $this->info('Processed route: ['.implode(',', $generator->getMethods($route)).'] '.$generator->getUri($route));
                 } else {
                     $this->warn('Skipping route: ['.implode(',', $generator->getMethods($route)).'] '.$generator->getUri($route));

diff --git a/src/Generators/AbstractGenerator.php b/src/Generators/AbstractGenerator.php
@@ -49,7 +49,7 @@ public function getMethods(Route $route)
      *
      * @return array
      */
-    public function processRoute($route, $apply = [])
+    public function processRoute($route)
     {
         $routeAction = $route->getAction();
         $routeGroup = $this->getRouteGroup($routeAction['uses']);