Merge branch '7.x' into 8.x

orchestral · Dec 19, 2024 · 919bb46 · 919bb46
2 parents 0490263 + ba732f7
commit 919bb46
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/src/Console/BuildCommand.php b/src/Console/BuildCommand.php
@@ -7,6 +7,7 @@
 use Illuminate\Support\Collection;
 use Orchestra\Workbench\BuildParser;
 use Orchestra\Workbench\Contracts\RecipeManager;
+use Orchestra\Workbench\Recipes\Command as CommandRecipe;
 use Orchestra\Workbench\Workbench;
 use Symfony\Component\Console\Attribute\AsCommand;
 
@@ -37,7 +38,11 @@ public function handle(ConsoleKernel $kernel, RecipeManager $recipes)
             ->each(function (array $options, string $name) use ($kernel, $recipes, $commands) {
                 /** @var array<string, mixed> $options */
                 if ($recipes->hasCommand($name)) {
-                    $recipes->command($name)->handle($kernel, $this->output);
+                    tap($recipes->command($name), function ($recipe) use ($options) {
+                        if ($recipe instanceof CommandRecipe) {
+                            $recipe->options = $options;
+                        }
+                    })->handle($kernel, $this->output);
 
                     return;
                 }

diff --git a/src/Recipes/AssetPublishCommand.php b/src/Recipes/AssetPublishCommand.php
@@ -12,9 +12,7 @@ class AssetPublishCommand extends Command
      */
     public function __construct()
     {
-        parent::__construct('vendor:publish', [
-            '--force' => true,
-        ]);
+        parent::__construct('vendor:publish', []);
     }
 
     /**
@@ -32,8 +30,9 @@ protected function commandOptions(): array
             ->unique()
             ->all();
 
-        return array_merge([
+        return array_merge($this->options, [
             '--tag' => $tags,
-        ], $this->options);
+            '--force' => true,
+        ]);
     }
 }