Skip to content

Commit

Permalink
Merge branch '1.x' into 8.x
Browse files Browse the repository at this point in the history
Signed-off-by: Mior Muhammad Zaki <crynobone@gmail.com>
  • Loading branch information
crynobone committed Mar 13, 2024
2 parents d8f5515 + 5f51d39 commit 1166627
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 6 deletions.
2 changes: 1 addition & 1 deletion CHANGELOG-1.x.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ This changelog references the relevant changes (bug and security fixes) done to

## 1.4.0

Released: 2024-03-12
Released: 2024-03-13

### Changes

Expand Down
3 changes: 2 additions & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@
"prepare": "@php vendor/bin/testbench package:discover --ansi",
"build": "@php vendor/bin/testbench workbench:build --ansi",
"serve": [
"Composer\\Config::disableProcessTimeout",
"@build",
"@php vendor/bin/testbench serve"
],
Expand All @@ -76,4 +77,4 @@
},
"prefer-stable": true,
"minimum-stability": "dev"
}
}
13 changes: 9 additions & 4 deletions src/Console/InstallCommand.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
use Symfony\Component\Console\Attribute\AsCommand;

use function Illuminate\Filesystem\join_paths;
use function Laravel\Prompts\confirm;
use function Laravel\Prompts\select;
use function Orchestra\Testbench\package_path;

Expand All @@ -32,10 +33,14 @@ class InstallCommand extends Command
public function handle(Filesystem $filesystem)
{
if (! $this->option('skip-devtool')) {
$this->call('workbench:devtool', [
'--force' => $this->option('force'),
'--skip-install' => true,
]);
$devtool = confirm('Install Workbench DevTool?', true);

if ($devtool === true) {
$this->call('workbench:devtool', [
'--force' => $this->option('force'),
'--skip-install' => true,
]);
}
}

$workingPath = package_path();
Expand Down
Empty file.

0 comments on commit 1166627

Please sign in to comment.