diff --git a/app/Support/helpers.php b/app/Support/helpers.php index b8f2e47..5a85560 100755 --- a/app/Support/helpers.php +++ b/app/Support/helpers.php @@ -7,6 +7,7 @@ use Illuminate\Http\Request; use Illuminate\Support\Facades\Artisan; use Illuminate\Support\Facades\Route; +use Illuminate\Validation\ValidationException; function generate_public_key($privateKeyPath, $publicKeyPath): void { @@ -79,6 +80,16 @@ function run_action(object $static, Closure $callback): void ]) ->send(); + if (method_exists($static, 'halt')) { + $reflectionMethod = new ReflectionMethod($static, 'halt'); + $reflectionMethod->invoke($static); + } + } catch (ValidationException $e) { + Notification::make() + ->danger() + ->title($e->getMessage()) + ->send(); + if (method_exists($static, 'halt')) { $reflectionMethod = new ReflectionMethod($static, 'halt'); $reflectionMethod->invoke($static); diff --git a/docker/Dockerfile b/docker/Dockerfile index de5fecd..b4fc2e3 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -16,7 +16,7 @@ RUN apt-get install -y nginx # php RUN apt-get update \ && apt-get install -y cron gnupg gosu curl ca-certificates zip unzip supervisor libcap2-bin libpng-dev \ - python2 dnsutils librsvg2-bin fswatch wget \ + python2 dnsutils librsvg2-bin fswatch wget openssh-client \ && add-apt-repository ppa:ondrej/php -y \ && apt-get update \ && apt-get install -y php8.2 php8.2-fpm php8.2-mbstring php8.2-mcrypt php8.2-gd php8.2-xml \ diff --git a/tests/Feature/SitesTest.php b/tests/Feature/SitesTest.php index 8679986..a6cec3e 100644 --- a/tests/Feature/SitesTest.php +++ b/tests/Feature/SitesTest.php @@ -212,7 +212,7 @@ public function test_failed_to_update_source_control(): void ->callInfolistAction('source_control_id', 'edit_source_control', [ 'source_control' => $sourceControl->id, ]) - ->assertHasActionErrors(); + ->assertNotified('Repository not found'); } public function test_update_v_host(): void