Fix style issues

config/apidoc.php

@@ -7,7 +7,6 @@ return [
      */
     'output' => 'public/docs',
 
-
     /*
      * The router to be used (Laravel or Dingo).
      */
@@ -18,7 +17,6 @@ return [
      */
     'postman' => true,
 
-
     /*
      * The routes for which documentation should be generated.
      * Each group contains rules defining which routes should be included ('match', 'include' and 'exclude' sections)

src/ApiDocGeneratorServiceProvider.php

@@ -15,17 +15,17 @@ class ApiDocGeneratorServiceProvider extends ServiceProvider
      */
     public function boot()
     {
-        $this->loadViewsFrom(__DIR__ . '/../resources/views/', 'apidoc');
+        $this->loadViewsFrom(__DIR__.'/../resources/views/', 'apidoc');
 
         $this->publishes([
-            __DIR__ . '/../resources/views' => app()->basePath().'/resources/views/vendor/apidoc',
+            __DIR__.'/../resources/views' => app()->basePath().'/resources/views/vendor/apidoc',
         ], 'views');
 
         $this->publishes([
             __DIR__.'/../config/apidoc.php' => config_path('apidoc.php'),
         ], 'config');
 
-        $this->mergeConfigFrom(__DIR__.'/../config/apidoc.php' , 'apidoc');
+        $this->mergeConfigFrom(__DIR__.'/../config/apidoc.php', 'apidoc');
 
         if ($this->app->runningInConsole()) {
             $this->commands([

src/Commands/GenerateDocumentation.php

@@ -2,12 +2,12 @@
 
 namespace Mpociot\ApiDoc\Commands;
 
-use Mpociot\ApiDoc\Tools\RouteMatcher;
 use ReflectionClass;
 use Illuminate\Routing\Route;
 use Illuminate\Console\Command;
 use Mpociot\Reflection\DocBlock;
 use Illuminate\Support\Collection;
+use Mpociot\ApiDoc\Tools\RouteMatcher;
 use Mpociot\Documentarian\Documentarian;
 use Mpociot\ApiDoc\Postman\CollectionWriter;
 use Mpociot\ApiDoc\Generators\DingoGenerator;
@@ -53,7 +53,7 @@ class GenerateDocumentation extends Command
             $routes = $this->routeMatcher->getDingoRoutesToBeDocumented(config('apidoc.routes'));
             $generator = new DingoGenerator();
         } else {
-            $routes =  $this->routeMatcher->getLaravelRoutesToBeDocumented(config('apidoc.routes'));
+            $routes = $this->routeMatcher->getLaravelRoutesToBeDocumented(config('apidoc.routes'));
             $generator = new LaravelGenerator();
         }
 
@@ -62,7 +62,7 @@ class GenerateDocumentation extends Command
         $parsedRoutes = collect($parsedRoutes)->groupBy('resource')
             ->sort(function ($a, $b) {
                 return strcmp($a->first()['resource'], $b->first()['resource']);
-        });
+            });
 
         $this->writeMarkdown($parsedRoutes);
     }
@@ -189,12 +189,12 @@ class GenerateDocumentation extends Command
         foreach ($routes as $routeItem) {
             $route = $routeItem['route'];
             /** @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));
-                } else {
-                    $this->warn('Skipping route: ['.implode(',', $generator->getMethods($route)).'] '.$generator->getUri($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));
+            } else {
+                $this->warn('Skipping route: [' . implode(',', $generator->getMethods($route)) . '] ' . $generator->getUri($route));
+            }
         }
 
         return $parsedRoutes;

src/Generators/AbstractGenerator.php

@@ -65,7 +65,7 @@ abstract class AbstractGenerator
             'uri' => $this->getUri($route),
             'parameters' => $this->getParametersFromDocBlock($docBlock['tags']),
             'response' => $content,
-            'showresponse' => !empty($content),
+            'showresponse' => ! empty($content),
         ];
     }
 
@@ -91,7 +91,7 @@ abstract class AbstractGenerator
             return $tag instanceof Tag && \strtolower($tag->getName()) == 'response';
         });
         if (empty($responseTags)) {
-            return null;
+            return;
         }
         $responseTag = \array_first($responseTags);
 
@@ -99,7 +99,8 @@ abstract class AbstractGenerator
     }
 
     /**
-     * @param array $routeAction
+     * @param array $tags
+     *
      * @return array
      */
     protected function getParametersFromDocBlock($tags)
@@ -113,8 +114,10 @@ abstract class AbstractGenerator
                 list($_, $name, $type, $required, $description) = $content;
                 $required = trim($required) == 'required' ? true : false;
                 $type = $this->normalizeParameterType($type);
+
                 return [$name => compact('type', 'description', 'required')];
             })->toArray();
+
         return $parameters;
     }
 
@@ -364,12 +367,13 @@ abstract class AbstractGenerator
             // we have a response from the docblock ( @response )
             $response = $docblockResponse;
         }
-        if (!$response && ($transformerResponse = $this->getTransformerResponse($annotationTags))) {
+        if (! $response && ($transformerResponse = $this->getTransformerResponse($annotationTags))) {
             // we have a transformer response from the docblock ( @transformer || @transformercollection )
             $response = $transformerResponse;
         }
 
         $content = $response ? $this->getResponseContent($response) : null;
+
         return $content;
     }
 
@@ -379,6 +383,7 @@ abstract class AbstractGenerator
             'int' => 'integer',
             'bool' => 'boolean',
         ];
+
         return $type ? ($typeMap[$type] ?? $type) : 'string';
     }
 }

tests/GenerateDocumentationTest.php

@@ -2,16 +2,14 @@
 
 namespace Mpociot\ApiDoc\Tests;
 
-use Illuminate\Support\Facades\App;
 use RecursiveIteratorIterator;
 use RecursiveDirectoryIterator;
 use Orchestra\Testbench\TestCase;
+use Illuminate\Support\Facades\App;
 use Illuminate\Contracts\Console\Kernel;
-use Mpociot\ApiDoc\Generators\LaravelGenerator;
 use Mpociot\ApiDoc\Tests\Fixtures\TestController;
 use Mpociot\ApiDoc\ApiDocGeneratorServiceProvider;
 use Illuminate\Support\Facades\Route as RouteFacade;
-use Mpociot\ApiDoc\Tests\Fixtures\DingoTestController;
 use Mpociot\ApiDoc\Tests\Fixtures\TestResourceController;
 
 class GenerateDocumentationTest extends TestCase
@@ -27,7 +25,7 @@ class GenerateDocumentationTest extends TestCase
     public function tearDown()
     {
         // delete the generated docs - compatible cross-platform
-        $dir = __DIR__ . '/../public/docs';
+        $dir = __DIR__.'/../public/docs';
         if (is_dir($dir)) {
             $files = new RecursiveIteratorIterator(
                 new RecursiveDirectoryIterator($dir, RecursiveDirectoryIterator::SKIP_DOTS),
@@ -61,7 +59,7 @@ class GenerateDocumentationTest extends TestCase
         RouteFacade::get('/api/closure', function () {
             return 'hi';
         });
-        RouteFacade::get('/api/test', TestController::class . '@withEndpointDescription');
+        RouteFacade::get('/api/test', TestController::class.'@withEndpointDescription');
 
         config(['apidoc.routes.0.match.prefixes' => ['api/*']]);
         $output = $this->artisan('apidoc:generate');
@@ -78,7 +76,7 @@ class GenerateDocumentationTest extends TestCase
             $api->get('/closure', function () {
                 return 'foo';
             });
-            $api->get('/test', TestController::class . '@withEndpointDescription');
+            $api->get('/test', TestController::class.'@withEndpointDescription');
         });
 
         config(['apidoc.router' => 'dingo']);
@@ -93,8 +91,8 @@ class GenerateDocumentationTest extends TestCase
     /** @test */
     public function can_skip_single_routes()
     {
-        RouteFacade::get('/api/skip', TestController::class . '@skip');
-        RouteFacade::get('/api/test', TestController::class . '@withEndpointDescription');
+        RouteFacade::get('/api/skip', TestController::class.'@skip');
+        RouteFacade::get('/api/test', TestController::class.'@withEndpointDescription');
 
         config(['apidoc.routes.0.match.prefixes' => ['api/*']]);
         $output = $this->artisan('apidoc:generate');
@@ -111,8 +109,8 @@ class GenerateDocumentationTest extends TestCase
         config(['apidoc.routes.0.match.prefixes' => ['api/*']]);
         $this->artisan('apidoc:generate');
 
-        $fixtureMarkdown = __DIR__ . '/Fixtures/resource_index.md';
-        $generatedMarkdown = __DIR__ . '/../public/docs/source/index.md';
+        $fixtureMarkdown = __DIR__.'/Fixtures/resource_index.md';
+        $generatedMarkdown = __DIR__.'/../public/docs/source/index.md';
         $this->assertFilesHaveSameContent($fixtureMarkdown, $generatedMarkdown);
     }
 
@@ -127,14 +125,14 @@ class GenerateDocumentationTest extends TestCase
             ]);
         } else {
             RouteFacade::resource('/api/users', TestResourceController::class)
-                ->only(['index', 'create',]);
+                ->only(['index', 'create']);
         }
 
         config(['apidoc.routes.0.match.prefixes' => ['api/*']]);
         $this->artisan('apidoc:generate');
 
-        $fixtureMarkdown = __DIR__ . '/Fixtures/partial_resource_index.md';
-        $generatedMarkdown = __DIR__ . '/../public/docs/source/index.md';
+        $fixtureMarkdown = __DIR__.'/Fixtures/partial_resource_index.md';
+        $generatedMarkdown = __DIR__.'/../public/docs/source/index.md';
         $this->assertFilesHaveSameContent($fixtureMarkdown, $generatedMarkdown);
 
         if (version_compare(App::version(), '5.6', '<')) {
@@ -145,27 +143,27 @@ class GenerateDocumentationTest extends TestCase
             ]);
         } else {
             RouteFacade::apiResource('/api/users', TestResourceController::class)
-                ->only(['index', 'create',]);
+                ->only(['index', 'create']);
         }
         $this->artisan('apidoc:generate');
 
-        $fixtureMarkdown = __DIR__ . '/Fixtures/partial_resource_index.md';
-        $generatedMarkdown = __DIR__ . '/../public/docs/source/index.md';
+        $fixtureMarkdown = __DIR__.'/Fixtures/partial_resource_index.md';
+        $generatedMarkdown = __DIR__.'/../public/docs/source/index.md';
         $this->assertFilesHaveSameContent($fixtureMarkdown, $generatedMarkdown);
     }
 
     /** @test */
     public function generated_markdown_file_is_correct()
     {
-        RouteFacade::get('/api/test', TestController::class . '@withEndpointDescription');
-        RouteFacade::get('/api/responseTag', TestController::class . '@withResponseTag');
+        RouteFacade::get('/api/test', TestController::class.'@withEndpointDescription');
+        RouteFacade::get('/api/responseTag', TestController::class.'@withResponseTag');
 
         config(['apidoc.routes.0.match.prefixes' => ['api/*']]);
         $this->artisan('apidoc:generate');
 
-        $generatedMarkdown = __DIR__ . '/../public/docs/source/index.md';
-        $compareMarkdown = __DIR__ . '/../public/docs/source/.compare.md';
-        $fixtureMarkdown = __DIR__ . '/Fixtures/index.md';
+        $generatedMarkdown = __DIR__.'/../public/docs/source/index.md';
+        $compareMarkdown = __DIR__.'/../public/docs/source/.compare.md';
+        $fixtureMarkdown = __DIR__.'/Fixtures/index.md';
         $this->assertFilesHaveSameContent($fixtureMarkdown, $generatedMarkdown);
         $this->assertFilesHaveSameContent($fixtureMarkdown, $compareMarkdown);
     }
@@ -173,20 +171,20 @@ class GenerateDocumentationTest extends TestCase
     /** @test */
     public function can_prepend_and_append_data_to_generated_markdown()
     {
-        RouteFacade::get('/api/test', TestController::class . '@withEndpointDescription');
-        RouteFacade::get('/api/responseTag', TestController::class . '@withResponseTag');
+        RouteFacade::get('/api/test', TestController::class.'@withEndpointDescription');
+        RouteFacade::get('/api/responseTag', TestController::class.'@withResponseTag');
 
         config(['apidoc.routes.0.match.prefixes' => ['api/*']]);
         $this->artisan('apidoc:generate');
 
-        $prependMarkdown = __DIR__ . '/Fixtures/prepend.md';
-        $appendMarkdown = __DIR__ . '/Fixtures/append.md';
-        copy($prependMarkdown, __DIR__ . '/../public/docs/source/prepend.md');
-        copy($appendMarkdown, __DIR__ . '/../public/docs/source/append.md');
+        $prependMarkdown = __DIR__.'/Fixtures/prepend.md';
+        $appendMarkdown = __DIR__.'/Fixtures/append.md';
+        copy($prependMarkdown, __DIR__.'/../public/docs/source/prepend.md');
+        copy($appendMarkdown, __DIR__.'/../public/docs/source/append.md');
 
         $this->artisan('apidoc:generate');
 
-        $generatedMarkdown = __DIR__ . '/../public/docs/source/index.md';
+        $generatedMarkdown = __DIR__.'/../public/docs/source/index.md';
         $this->assertContainsIgnoringWhitespace($this->getFileContents($prependMarkdown), $this->getFileContents($generatedMarkdown));
         $this->assertContainsIgnoringWhitespace($this->getFileContents($appendMarkdown), $this->getFileContents($generatedMarkdown));
     }
@@ -194,22 +192,22 @@ class GenerateDocumentationTest extends TestCase
     /** @test */
     public function generated_postman_collection_file_is_correct()
     {
-        RouteFacade::get('/api/test', TestController::class . '@withEndpointDescription');
-        RouteFacade::post('/api/responseTag', TestController::class . '@withResponseTag');
+        RouteFacade::get('/api/test', TestController::class.'@withEndpointDescription');
+        RouteFacade::post('/api/responseTag', TestController::class.'@withResponseTag');
 
         config(['apidoc.routes.0.match.prefixes' => ['api/*']]);
         $this->artisan('apidoc:generate');
 
-        $generatedCollection = json_decode(file_get_contents(__DIR__ . '/../public/docs/collection.json'));
+        $generatedCollection = json_decode(file_get_contents(__DIR__.'/../public/docs/collection.json'));
         $generatedCollection->info->_postman_id = '';
-        $fixtureCollection = json_decode(file_get_contents(__DIR__ . '/Fixtures/collection.json'));
+        $fixtureCollection = json_decode(file_get_contents(__DIR__.'/Fixtures/collection.json'));
         $this->assertEquals($generatedCollection, $fixtureCollection);
     }
 
     /** @test */
     public function can_append_custom_http_headers()
     {
-        RouteFacade::get('/api/headers', TestController::class . '@checkCustomHeaders');
+        RouteFacade::get('/api/headers', TestController::class.'@checkCustomHeaders');
 
         config(['apidoc.routes.0.match.prefixes' => ['api/*']]);
         config([
@@ -220,19 +218,19 @@ class GenerateDocumentationTest extends TestCase
         ]);
         $this->artisan('apidoc:generate');
 
-        $generatedMarkdown = $this->getFileContents(__DIR__ . '/../public/docs/source/index.md');
+        $generatedMarkdown = $this->getFileContents(__DIR__.'/../public/docs/source/index.md');
         $this->assertContainsIgnoringWhitespace('"Authorization": "customAuthToken","Custom-Header":"NotSoCustom"', $generatedMarkdown);
     }
 
     /** @test */
     public function can_parse_utf8_response()
     {
-        RouteFacade::get('/api/utf8', TestController::class . '@withUtf8ResponseTag');
+        RouteFacade::get('/api/utf8', TestController::class.'@withUtf8ResponseTag');
 
-        config(['apidoc.routes.0.prefixes' => ['api/*'],]);
+        config(['apidoc.routes.0.prefixes' => ['api/*']]);
         $this->artisan('apidoc:generate');
 
-        $generatedMarkdown = file_get_contents(__DIR__ . '/../public/docs/source/index.md');
+        $generatedMarkdown = file_get_contents(__DIR__.'/../public/docs/source/index.md');
         $this->assertContains('Лорем ипсум долор сит амет', $generatedMarkdown);
     }
 

tests/Unit/DingoGeneratorTest.php

@@ -32,6 +32,7 @@ class DingoGeneratorTest extends GeneratorTestCase
         $api->version('v1', function (Router $api) use ($controllerMethod, $path, $httpMethod, &$route) {
             $route = $api->$httpMethod($path, TestController::class."@$controllerMethod");
         });
+
         return $route;
     }
 

tests/Unit/GeneratorTestCase.php

@@ -58,8 +58,8 @@ abstract class GeneratorTestCase extends TestCase
             'room_id' => [
                 'type' => 'string',
                 'required' => false,
-                'description' => 'The id of the room.'
-            ]
+                'description' => 'The id of the room.',
+            ],
         ], $parameters);
     }
 
@@ -105,7 +105,7 @@ abstract class GeneratorTestCase extends TestCase
     /** @test */
     public function test_can_parse_transformer_tag()
     {
-         $route = $this->createRoute('GET', '/transformerTag', 'transformerTag');
+        $route = $this->createRoute('GET', '/transformerTag', 'transformerTag');
         $parsed = $this->generator->processRoute($route);
         $this->assertTrue(is_array($parsed));
         $this->assertArrayHasKey('showresponse', $parsed);
@@ -140,7 +140,7 @@ abstract class GeneratorTestCase extends TestCase
         $this->assertTrue($parsed['showresponse']);
         $this->assertSame(
             $parsed['response'],
-            '{"data":[{"id":1,"description":"Welcome on this test versions","name":"TestName"},' .
+            '{"data":[{"id":1,"description":"Welcome on this test versions","name":"TestName"},'.
             '{"id":1,"description":"Welcome on this test versions","name":"TestName"}]}'
         );
     }
@@ -155,7 +155,7 @@ abstract class GeneratorTestCase extends TestCase
         $this->assertTrue($parsed['showresponse']);
         $this->assertSame(
             $parsed['response'],
-            '{"data":[{"id":1,"description":"Welcome on this test versions","name":"TestName"},' .
+            '{"data":[{"id":1,"description":"Welcome on this test versions","name":"TestName"},'.
             '{"id":1,"description":"Welcome on this test versions","name":"TestName"}]}'
         );
     }

tests/Unit/LaravelGeneratorTest.php

@@ -25,6 +25,6 @@ class LaravelGeneratorTest extends GeneratorTestCase
 
     public function createRoute(string $httpMethod, string $path, string $controllerMethod)
     {
-        return new Route([$httpMethod], $path, ['uses' => TestController::class . "@$controllerMethod"]);
+        return new Route([$httpMethod], $path, ['uses' => TestController::class."@$controllerMethod"]);
     }
 }

tests/Unit/RouteMatcherTest.php

@@ -43,14 +43,14 @@ class RouteMatcherTest extends TestCase
         $routeRules[0]['match']['domains'] = ['domain1.*'];
         $routes = $this->matcher->getRoutesToBeDocumented($routeRules);
         $this->assertCount(6, $routes);
-        foreach ($routes as $route){
+        foreach ($routes as $route) {
             $this->assertContains('domain1', $route['route']->getDomain());
         }
 
         $routeRules[0]['match']['domains'] = ['domain2.*'];
         $routes = $this->matcher->getRoutesToBeDocumented($routeRules);
         $this->assertCount(6, $routes);
-        foreach ($routes as $route){
+        foreach ($routes as $route) {
             $this->assertContains('domain2', $route['route']->getDomain());
         }
     }
@@ -72,14 +72,14 @@ class RouteMatcherTest extends TestCase
         $routeRules[0]['match']['domains'] = ['domain1.*'];
         $routes = $this->matcher->getDingoRoutesToBeDocumented($routeRules);
         $this->assertCount(6, $routes);
-        foreach ($routes as $route){
+        foreach ($routes as $route) {
             $this->assertContains('domain1', $route['route']->getDomain());
         }
 
         $routeRules[0]['match']['domains'] = ['domain2.*'];
         $routes = $this->matcher->getDingoRoutesToBeDocumented($routeRules);
         $this->assertCount(6, $routes);
-        foreach ($routes as $route){
+        foreach ($routes as $route) {
             $this->assertContains('domain2', $route['route']->getDomain());
         }
     }
@@ -100,14 +100,14 @@ class RouteMatcherTest extends TestCase
         $routeRules[0]['match']['prefixes'] = ['prefix1/*'];
         $routes = $this->matcher->getRoutesToBeDocumented($routeRules);
         $this->assertCount(4, $routes);
-        foreach ($routes as $route){
+        foreach ($routes as $route) {
             $this->assertTrue(str_is('prefix1/*', $route['route']->uri()));
         }
 
         $routeRules[0]['match']['prefixes'] = ['prefix2/*'];
         $routes = $this->matcher->getRoutesToBeDocumented($routeRules);
         $this->assertCount(4, $routes);
-        foreach ($routes as $route){
+        foreach ($routes as $route) {
             $this->assertTrue(str_is('prefix2/*', $route['route']->uri()));
         }
     }
@@ -129,14 +129,14 @@ class RouteMatcherTest extends TestCase
         $routeRules[0]['match']['prefixes'] = ['prefix1/*'];
         $routes = $this->matcher->getDingoRoutesToBeDocumented($routeRules);
         $this->assertCount(4, $routes);
-        foreach ($routes as $route){
+        foreach ($routes as $route) {
             $this->assertTrue(str_is('prefix1/*', $route['route']->uri()));
         }
 
         $routeRules[0]['match']['prefixes'] = ['prefix2/*'];
         $routes = $this->matcher->getDingoRoutesToBeDocumented($routeRules);
         $this->assertCount(4, $routes);
-        foreach ($routes as $route){
+        foreach ($routes as $route) {
             $this->assertTrue(str_is('prefix2/*', $route['route']->uri()));
         }
     }
@@ -150,7 +150,7 @@ class RouteMatcherTest extends TestCase
         $routeRules[0]['match']['prefixes'] = ['*'];
         $routes = $this->matcher->getDingoRoutesToBeDocumented($routeRules);
         $this->assertCount(6, $routes);
-        foreach ($routes as $route){
+        foreach ($routes as $route) {
             $this->assertNotEmpty(array_intersect($route['route']->versions(), ['v2']));
         }
 
@@ -186,7 +186,7 @@ class RouteMatcherTest extends TestCase
                 'match' => [
                     'domains' => ['domain1.*'],
                     'prefixes' => ['prefix1/*'],
-                    'versions' => ['v1']
+                    'versions' => ['v1'],
                 ],
                 'include' => [$mustInclude],
             ],
@@ -223,7 +223,7 @@ class RouteMatcherTest extends TestCase
                 'match' => [
                     'domains' => ['domain2.*'],
                     'prefixes' => ['*'],
-                    'versions' => ['v2']
+                    'versions' => ['v2'],
                 ],
                 'exclude' => [$mustNotInclude],
             ],
@@ -296,12 +296,12 @@ class RouteMatcherTest extends TestCase
 
         $routes = collect($routes);
         $firstRuleGroup = $routes->filter(function ($route) {
-            return !empty(array_intersect($route['route']->versions(), ['v1']));
+            return ! empty(array_intersect($route['route']->versions(), ['v1']));
         });
         $this->assertCount(12, $firstRuleGroup);
 
         $secondRuleGroup = $routes->filter(function ($route) {
-            return !empty(array_intersect($route['route']->versions(), ['v2']));
+            return ! empty(array_intersect($route['route']->versions(), ['v2']));
         });
         $this->assertCount(6, $secondRuleGroup);
     }
@@ -309,55 +309,114 @@ class RouteMatcherTest extends TestCase
     private function registerLaravelRoutes()
     {
         RouteFacade::group(['domain' => 'domain1.app.test'], function () {
-            RouteFacade::post('/domain1-1', function () { return 'hi'; })->name('domain1-1');
-            RouteFacade::get('domain1-2', function () { return 'hi'; })->name('domain1-2');
-            RouteFacade::get('/prefix1/domain1-1', function () { return 'hi'; })->name('prefix1.domain1-1');
-            RouteFacade::get('prefix1/domain1-2', function () { return 'hi'; })->name('prefix1.domain1-2');
-            RouteFacade::get('/prefix2/domain1-1', function () { return 'hi'; })->name('prefix2.domain1-1');
-            RouteFacade::get('prefix2/domain1-2', function () { return 'hi'; })->name('prefix2.domain1-2');
+            RouteFacade::post('/domain1-1', function () {
+                return 'hi';
+            })->name('domain1-1');
+            RouteFacade::get('domain1-2', function () {
+                return 'hi';
+            })->name('domain1-2');
+            RouteFacade::get('/prefix1/domain1-1', function () {
+                return 'hi';
+            })->name('prefix1.domain1-1');
+            RouteFacade::get('prefix1/domain1-2', function () {
+                return 'hi';
+            })->name('prefix1.domain1-2');
+            RouteFacade::get('/prefix2/domain1-1', function () {
+                return 'hi';
+            })->name('prefix2.domain1-1');
+            RouteFacade::get('prefix2/domain1-2', function () {
+                return 'hi';
+            })->name('prefix2.domain1-2');
         });
         RouteFacade::group(['domain' => 'domain2.app.test'], function () {
-            RouteFacade::post('/domain2-1', function () { return 'hi'; })->name('domain2-1');
-            RouteFacade::get('domain2-2', function () { return 'hi'; })->name('domain2-2');
-            RouteFacade::get('/prefix1/domain2-1', function () { return 'hi'; })->name('prefix1.domain2-1');
-            RouteFacade::get('prefix1/domain2-2', function () { return 'hi'; })->name('prefix1.domain2-2');
-            RouteFacade::get('/prefix2/domain2-1', function () { return 'hi'; })->name('prefix2.domain2-1');
-            RouteFacade::get('prefix2/domain2-2', function () { return 'hi'; })->name('prefix2.domain2-2');
+            RouteFacade::post('/domain2-1', function () {
+                return 'hi';
+            })->name('domain2-1');
+            RouteFacade::get('domain2-2', function () {
+                return 'hi';
+            })->name('domain2-2');
+            RouteFacade::get('/prefix1/domain2-1', function () {
+                return 'hi';
+            })->name('prefix1.domain2-1');
+            RouteFacade::get('prefix1/domain2-2', function () {
+                return 'hi';
+            })->name('prefix1.domain2-2');
+            RouteFacade::get('/prefix2/domain2-1', function () {
+                return 'hi';
+            })->name('prefix2.domain2-1');
+            RouteFacade::get('prefix2/domain2-2', function () {
+                return 'hi';
+            })->name('prefix2.domain2-2');
         });
     }
 
     private function registerDingoRoutes()
     {
-
         $api = app('api.router');
         $api->version('v1', function (Router $api) {
             $api->group(['domain' => 'domain1.app.test'], function (Router $api) {
-                $api->post('/domain1-1', function () { return 'hi'; })->name('v1.domain1-1');
-                $api->get('domain1-2', function () { return 'hi'; })->name('v1.domain1-2');
-                $api->get('/prefix1/domain1-1', function () { return 'hi'; })->name('v1.prefix1.domain1-1');
-                $api->get('prefix1/domain1-2', function () { return 'hi'; })->name('v1.prefix1.domain1-2');
-                $api->get('/prefix2/domain1-1', function () { return 'hi'; })->name('v1.prefix2.domain1-1');
-                $api->get('prefix2/domain1-2', function () { return 'hi'; })->name('v1.prefix2.domain1-2');
+                $api->post('/domain1-1', function () {
+                    return 'hi';
+                })->name('v1.domain1-1');
+                $api->get('domain1-2', function () {
+                    return 'hi';
+                })->name('v1.domain1-2');
+                $api->get('/prefix1/domain1-1', function () {
+                    return 'hi';
+                })->name('v1.prefix1.domain1-1');
+                $api->get('prefix1/domain1-2', function () {
+                    return 'hi';
+                })->name('v1.prefix1.domain1-2');
+                $api->get('/prefix2/domain1-1', function () {
+                    return 'hi';
+                })->name('v1.prefix2.domain1-1');
+                $api->get('prefix2/domain1-2', function () {
+                    return 'hi';
+                })->name('v1.prefix2.domain1-2');
             });
             $api->group(['domain' => 'domain2.app.test'], function (Router $api) {
-                $api->post('/domain2-1', function () { return 'hi'; })->name('v1.domain2-1');
-                $api->get('domain2-2', function () { return 'hi'; })->name('v1.domain2-2');
-                $api->get('/prefix1/domain2-1', function () { return 'hi'; })->name('v1.prefix1.domain2-1');
-                $api->get('prefix1/domain2-2', function () { return 'hi'; })->name('v1.prefix1.domain2-2');
-                $api->get('/prefix2/domain2-1', function () { return 'hi'; })->name('v1.prefix2.domain2-1');
-                $api->get('prefix2/domain2-2', function () { return 'hi'; })->name('v1.prefix2.domain2-2');
+                $api->post('/domain2-1', function () {
+                    return 'hi';
+                })->name('v1.domain2-1');
+                $api->get('domain2-2', function () {
+                    return 'hi';
+                })->name('v1.domain2-2');
+                $api->get('/prefix1/domain2-1', function () {
+                    return 'hi';
+                })->name('v1.prefix1.domain2-1');
+                $api->get('prefix1/domain2-2', function () {
+                    return 'hi';
+                })->name('v1.prefix1.domain2-2');
+                $api->get('/prefix2/domain2-1', function () {
+                    return 'hi';
+                })->name('v1.prefix2.domain2-1');
+                $api->get('prefix2/domain2-2', function () {
+                    return 'hi';
+                })->name('v1.prefix2.domain2-2');
             });
         });
         $api->version('v2', function (Router $api) {
             $api->group(['domain' => 'domain1.app.test'], function (Router $api) {
-                $api->post('/domain1', function () { return 'hi'; })->name('v2.domain1');
-                $api->get('/prefix1/domain1', function () { return 'hi'; })->name('v2.prefix1.domain1');
-                $api->get('/prefix2/domain1', function () { return 'hi'; })->name('v2.prefix2.domain1');
+                $api->post('/domain1', function () {
+                    return 'hi';
+                })->name('v2.domain1');
+                $api->get('/prefix1/domain1', function () {
+                    return 'hi';
+                })->name('v2.prefix1.domain1');
+                $api->get('/prefix2/domain1', function () {
+                    return 'hi';
+                })->name('v2.prefix2.domain1');
             });
             $api->group(['domain' => 'domain2.app.test'], function (Router $api) {
-                $api->post('/domain2', function () { return 'hi'; })->name('v2.domain2');
-                $api->get('/prefix1/domain2', function () { return 'hi'; })->name('v2.prefix1.domain2');
-                $api->get('/prefix2/domain2', function () { return 'hi'; })->name('v2.prefix2.domain2');
+                $api->post('/domain2', function () {
+                    return 'hi';
+                })->name('v2.domain2');
+                $api->get('/prefix1/domain2', function () {
+                    return 'hi';
+                })->name('v2.prefix1.domain2');
+                $api->get('/prefix2/domain2', function () {
+                    return 'hi';
+                })->name('v2.prefix2.domain2');
             });
         });
     }