Merge pull request mpociot#729 from BenjaminRosell/master

Adding Laravel Vapor Support - Fixes mpociot#716

Author: shalvah

config/apidoc.php

@@ -37,6 +37,13 @@
      */
     'router' => 'laravel',
 
+    /*
+     * The storage to be used when generating assets.
+     * By default, uses 'local'. If you are using Laravel Vapor, please use S3 and make sure
+     * the correct bucket is correctly configured in the .env file
+     */
+    'storage' => 'local',
+
     /*
      * The base URL to be used in examples and the Postman collection.
      * By default, this will be the value of config('app.url').

phpstan.neon

@@ -11,3 +11,4 @@ parameters:
         - '#(.*)NunoMaduro\\Collision(.*)#'
         - '#Instantiated class Whoops\\Exception\\Inspector not found\.#'
         - '#.+Dingo.+#'
+        - '#Call to an undefined method Illuminate\\Contracts\\Filesystem\\Filesystem::url()#'

src/Http/Controller.php

@@ -19,7 +19,7 @@ public function html()
     public function json()
     {
         return response()->json(
-            json_decode(Storage::disk('local')->get('apidoc/collection.json'))
+            json_decode(Storage::disk(config('apidoc.storage'))->get('apidoc/collection.json'))
         );
     }
 }

src/Writing/Writer.php

@@ -206,8 +206,13 @@ protected function writePostmanCollection(Collection $parsedRoutes): void
                 $collectionPath = "{$this->outputPath}/collection.json";
                 file_put_contents($collectionPath, $collection);
             } else {
-                Storage::disk('local')->put('apidoc/collection.json', $collection);
-                $collectionPath = 'storage/app/apidoc/collection.json';
+                $storageInstance = Storage::disk($this->config->get('storage'));
+                $storageInstance->put('apidoc/collection.json', $collection, 'public');
+                if ($this->config->get('storage') == 'local') {
+                    $collectionPath = 'storage/app/apidoc/collection.json';
+                } else {
+                    $collectionPath = $storageInstance->url('collection.json');
+                }
             }
 
             $this->output->info("Wrote Postman collection to: {$collectionPath}");
@@ -280,8 +285,8 @@ protected function moveOutputFromSourceFolderToTargetFolder(): void
             rename("{$this->sourceOutputPath}/index.html", "$this->outputPath/index.blade.php");
             $contents = file_get_contents("$this->outputPath/index.blade.php");
             //
-            $contents = str_replace('href="https://github.com/css/style.css"', 'href="https://github.com/docs/css/style.css"', $contents);
-            $contents = str_replace('src="https://github.com/js/all.js"', 'src="https://github.com/docs/js/all.js"', $contents);
+            $contents = str_replace('href="https://github.com/css/style.css"', 'href="https://github.com/%3Cspan%20class="x x-first">{{ asset(\'/docs/css/style.css\') }}"', $contents);
+            $contents = str_replace('src="https://github.com/js/all.js"', 'src="https://github.com/%3Cspan%20class="x x-first">{{ asset(\'/docs/js/all.js\') }}"', $contents);
             $contents = str_replace('src="images/', 'src="/docs/images/', $contents);
             $contents = preg_replace('#href="https?://.+?/docs/collection.json"#', 'href="{{ route("apidoc.json") }}"', $contents);
             file_put_contents("$this->outputPath/index.blade.php", $contents);