Merge remote-tracking branch 'origin/plugin-arch' into plugin-arch

# Conflicts:
#	src/Tools/Generator.php

src/Strategies/Responses/ResponseCalls.php

@@ -304,7 +304,7 @@ class ResponseCalls extends Strategy
             return false;
         }
 
-        if (!empty($context['responses'])) {
+        if (! empty($context['responses'])) {
             // Don't attempt a response call if there are already responses
             return false;
         }

src/Strategies/Responses/UseResponseFileTag.php

@@ -4,7 +4,6 @@ namespace Mpociot\ApiDoc\Strategies\Responses;
 
 use Illuminate\Routing\Route;
 use Mpociot\Reflection\DocBlock;
-use Illuminate\Http\JsonResponse;
 use Mpociot\Reflection\DocBlock\Tag;
 use Mpociot\ApiDoc\Strategies\Strategy;
 use Mpociot\ApiDoc\Tools\RouteDocBlocker;
@@ -65,6 +64,6 @@ class UseResponseFileTag extends Strategy
         }, $responseFileTags);
 
         // Convert responses to [200 => 'response', 401 => 'response']
-        return collect($responses)->pluck("0", "1")->toArray();
+        return collect($responses)->pluck('0', '1')->toArray();
     }
 }

src/Strategies/Responses/UseResponseTag.php

@@ -4,7 +4,6 @@ namespace Mpociot\ApiDoc\Strategies\Responses;
 
 use Illuminate\Routing\Route;
 use Mpociot\Reflection\DocBlock;
-use Illuminate\Http\JsonResponse;
 use Mpociot\Reflection\DocBlock\Tag;
 use Mpociot\ApiDoc\Strategies\Strategy;
 use Mpociot\ApiDoc\Tools\RouteDocBlocker;
@@ -63,6 +62,6 @@ class UseResponseTag extends Strategy
         }, $responseTags);
 
         // Convert responses to [200 => 'response', 401 => 'response']
-        return collect($responses)->pluck("0", "1")->toArray();
+        return collect($responses)->pluck('0', '1')->toArray();
     }
 }

src/Tools/Generator.php

@@ -54,7 +54,7 @@ class Generator
         $method = $controller->getMethod($methodName);
 
         $parsedRoute = [
-            'id' => md5($this->getUri($route) . ':' . implode($this->getMethods($route))),
+            'id' => md5($this->getUri($route).':'.implode($this->getMethods($route))),
             'methods' => $this->getMethods($route),
             'uri' => $this->getUri($route),
             'boundUri' => Utils::getFullUrl($route, $rulesToApply['bindings'] ?? ($rulesToApply['response_calls']['bindings'] ?? [])),
@@ -71,7 +71,7 @@ class Generator
 
         $responses = $this->fetchResponses($controller, $method, $route, $rulesToApply, $parsedRoute);
         $parsedRoute['response'] = $responses;
-        $parsedRoute['showresponse'] = !empty($responses);
+        $parsedRoute['showresponse'] = ! empty($responses);
 
         $parsedRoute['headers'] = $rulesToApply['headers'] ?? [];
 
@@ -91,6 +91,7 @@ class Generator
             'description' => '',
             'authenticated' => false,
         ];
+
         return $this->iterateThroughStrategies('metadata', $context, [$route, $controller, $method, $rulesToApply]);
     }
 
@@ -127,7 +128,7 @@ class Generator
             $strategy = new $strategyClass($this->config);
             $arguments[] = $context;
             $results = $strategy(...$arguments);
-            if (!is_null($results)) {
+            if (! is_null($results)) {
                 foreach ($results as $index => $item) {
                     // Using a for loop rather than array_merge or +=
                     // so it does not renumber numeric keys
@@ -142,6 +143,7 @@ class Generator
                 }
             }
         }
+
         return $context[$key];
     }
 

tests/Unit/LaravelGeneratorTest.php

@@ -28,7 +28,7 @@ class LaravelGeneratorTest extends GeneratorTestCase
     public function createRouteUsesArray(string $httpMethod, string $path, string $controllerMethod, $register = false, $class = TestController::class)
     {
         if ($register) {
-            return RouteFacade::{$httpMethod}($path, [$class. "$controllerMethod"]);
+            return RouteFacade::{$httpMethod}($path, [$class."$controllerMethod"]);
         } else {
             return new Route([$httpMethod], $path, ['uses' => [$class, $controllerMethod]]);
         }