Browse Source

Ignore user-specified values in upgrader

shalvah 3 years ago
parent
commit
75b592724a
2 changed files with 6 additions and 3 deletions
  1. 5 2
      src/Commands/GenerateDocumentation.php
  2. 1 1
      src/Commands/Upgrade.php

+ 5 - 2
src/Commands/GenerateDocumentation.php

@@ -32,7 +32,7 @@ class GenerateDocumentation extends Command
 
     public function newLine($count = 1)
     {
-        // TODO Remove when Laravel g is no longer supported
+        // TODO Remove when Laravel 6 is no longer supported
         $this->getOutput()->write(str_repeat("\n", $count));
     }
 
@@ -122,7 +122,10 @@ class GenerateDocumentation extends Command
     protected function upgradeConfigFileIfNeeded(): void
     {
         $upgrader = Upgrader::ofConfigFile('config/scribe.php', __DIR__ . '/../../config/scribe.php')
-            ->dontTouch('routes','example_languages', 'database_connections_to_transact', 'strategies');
+            ->dontTouch(
+                'routes','example_languages', 'database_connections_to_transact', 'strategies' ,'laravel.middleware',
+                'postman.overrides', 'openapi.overrides'
+            );
         $changes = $upgrader->dryRun();
         if (!empty($changes)) {
             $this->newLine();

+ 1 - 1
src/Commands/Upgrade.php

@@ -21,7 +21,7 @@ class Upgrade extends Command
     {
         $oldConfig = config('scribe');
         $upgrader = Upgrader::ofConfigFile('config/scribe.php', __DIR__ . '/../../config/scribe.php')
-            ->dontTouch('routes')
+            ->dontTouch('routes', 'laravel.middleware', 'postman.overrides', 'openapi.overrides')
             ->move('interactive', 'try_it_out.enabled');
 
         $changes = $upgrader->dryRun();