Fix merge conflicts and style issues

src/Commands/GenerateDocumentation.php

@@ -32,7 +32,6 @@ class GenerateDocumentation extends Command
      */
     protected $description = 'Generate your API documentation from existing Laravel routes.';
 
-
     private $routeMatcher;
 
     public function __construct(RouteMatcher $routeMatcher)
@@ -57,7 +56,6 @@ class GenerateDocumentation extends Command
             $generator = new LaravelGenerator();
         }
 
-
         $parsedRoutes = $this->processRoutes($generator, $routes);
         $parsedRoutes = collect($parsedRoutes)->groupBy('resource')
             ->sort(function ($a, $b) {
@@ -176,12 +174,11 @@ class GenerateDocumentation extends Command
         }
     }
 
-
     /**
      * @param AbstractGenerator $generator
      * @param array $routes
-     * @return array
      *
+     * @return array
      */
     private function processRoutes(AbstractGenerator $generator, array $routes)
     {
@@ -191,9 +188,9 @@ class GenerateDocumentation extends Command
             /** @var Route $route */
             if ($this->isValidRoute($route) && $this->isRouteVisibleForDocumentation($route->getAction()['uses'])) {
                 $parsedRoutes[] = $generator->processRoute($route) + $routeItem['apply'];
-                $this->info('Processed route: [' . implode(',', $generator->getMethods($route)) . '] ' . $generator->getUri($route));
+                $this->info('Processed route: ['.implode(',', $generator->getMethods($route)).'] '.$generator->getUri($route));
             } else {
-                $this->warn('Skipping route: [' . implode(',', $generator->getMethods($route)) . '] ' . $generator->getUri($route));
+                $this->warn('Skipping route: ['.implode(',', $generator->getMethods($route)).'] '.$generator->getUri($route));
             }
         }
 

src/Tools/RouteMatcher.php

@@ -10,7 +10,7 @@ class RouteMatcher
 {
     public function getDingoRoutesToBeDocumented(array $routeRules)
     {
-        return $this->getRoutesToBeDocumented($routeRules,true);
+        return $this->getRoutesToBeDocumented($routeRules, true);
     }
 
     public function getLaravelRoutesToBeDocumented(array $routeRules)
@@ -48,11 +48,12 @@ class RouteMatcher
 
     private function getAllRoutes(bool $usingDingoRouter, array $versions = [])
     {
-        if (!$usingDingoRouter) {
+        if (! $usingDingoRouter) {
             return RouteFacade::getRoutes();
         }
 
         $allRouteCollections = app(\Dingo\Api\Routing\Router::class)->getRoutes();
+
         return collect($allRouteCollections)
             ->flatMap(function (RouteCollection $collection) {
                 return $collection->getRoutes();
@@ -62,7 +63,7 @@ class RouteMatcher
     private function shouldIncludeRoute(Route $route, array $routeRule, array $mustIncludes, bool $usingDingoRouter)
     {
         $matchesVersion = $usingDingoRouter
-            ? !empty(array_intersect($route->versions(), $routeRule['match']['versions'] ?? []))
+            ? ! empty(array_intersect($route->versions(), $routeRule['match']['versions'] ?? []))
             : true;
 
         return in_array($route->getName(), $mustIncludes)
@@ -70,5 +71,4 @@ class RouteMatcher
             && str_is($routeRule['match']['prefixes'] ?? [], $route->uri())
             && $matchesVersion);
     }
-
 }

tests/Unit/DingoGeneratorTest.php

@@ -35,5 +35,4 @@ class DingoGeneratorTest extends GeneratorTestCase
 
         return $route;
     }
-
 }

tests/Unit/GeneratorTestCase.php

@@ -2,12 +2,9 @@
 
 namespace Mpociot\ApiDoc\Tests\Unit;
 
-use Illuminate\Routing\Route;
 use Orchestra\Testbench\TestCase;
 use Mpociot\ApiDoc\Generators\LaravelGenerator;
-use Mpociot\ApiDoc\Tests\Fixtures\TestController;
 use Mpociot\ApiDoc\ApiDocGeneratorServiceProvider;
-use Illuminate\Support\Facades\Route as RouteFacade;
 
 abstract class GeneratorTestCase extends TestCase
 {