From f03aa577588575de2db77dba692677ddeb5071ff Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Wed, 27 Dec 2023 16:45:01 +0100 Subject: [PATCH] fix: routing, switch back to old one --- app/Exceptions/Handler.php | 2 +- .../Middleware/DecideWhatToDoWithUser.php | 13 +- app/Livewire/CheckLicense.php | 2 +- app/Livewire/Destination/Form.php | 2 +- app/Livewire/Destination/New/Docker.php | 2 +- app/Livewire/ForcePasswordReset.php | 2 +- app/Livewire/PrivateKey/Change.php | 2 +- app/Livewire/PrivateKey/Create.php | 4 +- app/Livewire/Project/AddEmpty.php | 2 +- app/Livewire/Project/AddEnvironment.php | 4 +- .../Project/Application/Configuration.php | 6 +- app/Livewire/Project/Application/Heading.php | 16 +- app/Livewire/Project/Application/Previews.php | 4 +- app/Livewire/Project/Application/Rollback.php | 4 +- app/Livewire/Project/CloneProject.php | 4 +- app/Livewire/Project/Database/BackupEdit.php | 4 +- app/Livewire/Project/DeleteEnvironment.php | 2 +- app/Livewire/Project/DeleteProject.php | 2 +- app/Livewire/Project/New/DockerCompose.php | 4 +- app/Livewire/Project/New/DockerImage.php | 4 +- app/Livewire/Project/New/EmptyProject.php | 2 +- .../Project/New/GithubPrivateRepository.php | 4 +- .../New/GithubPrivateRepositoryDeployKey.php | 4 +- .../Project/New/PublicGitRepository.php | 4 +- app/Livewire/Project/New/Select.php | 4 +- app/Livewire/Project/New/SimpleDockerfile.php | 4 +- app/Livewire/Project/Service/Application.php | 2 +- app/Livewire/Project/Shared/Danger.php | 4 +- app/Livewire/Server/Delete.php | 2 +- app/Livewire/Server/Destination/Show.php | 2 +- app/Livewire/Server/LogDrains.php | 2 +- app/Livewire/Server/New/ByIp.php | 2 +- app/Livewire/Server/PrivateKey/Show.php | 2 +- app/Livewire/Server/Proxy/Logs.php | 2 +- app/Livewire/Server/Proxy/Show.php | 2 +- app/Livewire/Server/Show.php | 2 +- app/Livewire/Source/Github/Change.php | 6 +- app/Livewire/Source/Github/Create.php | 2 +- app/Livewire/Subscription/Show.php | 3 +- app/Livewire/Team/Create.php | 2 +- app/Livewire/Team/Delete.php | 2 +- app/Livewire/Team/Storage/Create.php | 2 +- app/Livewire/Team/Storage/Form.php | 2 +- app/Livewire/Waitlist/Index.php | 2 +- app/Providers/FortifyServiceProvider.php | 4 +- composer.lock | 991 ++++++++++++++---- .../components/applications/navbar.blade.php | 8 +- .../components/databases/navbar.blade.php | 8 +- resources/views/components/navbar.blade.php | 18 +- .../resources/breadcrumbs.blade.php | 2 +- .../components/security/navbar.blade.php | 4 +- .../views/components/server/navbar.blade.php | 10 +- .../components/services/navbar.blade.php | 2 +- .../views/components/team/navbar.blade.php | 10 +- resources/views/livewire/dashboard.blade.php | 10 +- .../views/livewire/destination/show.blade.php | 8 +- .../project/application/deployments.blade.php | 2 +- .../livewire/project/new/select.blade.php | 2 +- .../livewire/project/service/index.blade.php | 4 +- .../livewire/project/service/show.blade.php | 2 +- resources/views/livewire/server/all.blade.php | 4 +- .../views/livewire/server/delete.blade.php | 4 +- resources/views/project/resources.blade.php | 12 +- resources/views/project/show.blade.php | 2 +- resources/views/projects.blade.php | 4 +- .../security/private-key/index.blade.php | 4 +- resources/views/source/all.blade.php | 4 +- resources/views/team/storages/all.blade.php | 2 +- routes/api.php | 3 +- routes/web.php | 9 +- 70 files changed, 961 insertions(+), 322 deletions(-) diff --git a/app/Exceptions/Handler.php b/app/Exceptions/Handler.php index e78849a07..f010c33b6 100644 --- a/app/Exceptions/Handler.php +++ b/app/Exceptions/Handler.php @@ -47,7 +47,7 @@ class Handler extends ExceptionHandler if ($request->is('api/*') || $request->expectsJson() || $this->shouldReturnJson($request, $exception)) { return response()->json(['message' => $exception->getMessage()], 401); } - return redirect()->guest($exception->redirectTo() ?? route('login')); + return redirect()->guest($exception->redirectTo() ?? route('login')); } /** * Register the exception handling callbacks for the application. diff --git a/app/Http/Middleware/DecideWhatToDoWithUser.php b/app/Http/Middleware/DecideWhatToDoWithUser.php index 1381396df..441f47175 100644 --- a/app/Http/Middleware/DecideWhatToDoWithUser.php +++ b/app/Http/Middleware/DecideWhatToDoWithUser.php @@ -2,6 +2,7 @@ namespace App\Http\Middleware; +use App\Providers\RouteServiceProvider; use Closure; use Illuminate\Http\Request; use Symfony\Component\HttpFoundation\Response; @@ -16,7 +17,7 @@ class DecideWhatToDoWithUser } if (!auth()->user() || !isCloud() || isInstanceAdmin()) { if (!isCloud() && showBoarding() && !in_array($request->path(), allowedPathsForBoardingAccounts())) { - return redirect('boarding'); + return redirect()->route('boarding'); } return $next($request); } @@ -24,27 +25,27 @@ class DecideWhatToDoWithUser if ($request->path() === 'verify' || in_array($request->path(), allowedPathsForInvalidAccounts()) || $request->routeIs('verify.verify')) { return $next($request); } - return redirect('/verify'); + return redirect()-route('verify.email'); } if (!isSubscriptionActive() && !isSubscriptionOnGracePeriod()) { if (!in_array($request->path(), allowedPathsForUnsubscribedAccounts())) { if (Str::startsWith($request->path(), 'invitations')) { return $next($request); } - return redirect('subscription'); + return redirect()->route('subscription'); } } if (showBoarding() && !in_array($request->path(), allowedPathsForBoardingAccounts())) { if (Str::startsWith($request->path(), 'invitations')) { return $next($request); } - return redirect('boarding'); + return redirect()->route('boarding'); } if (auth()->user()->hasVerifiedEmail() && $request->path() === 'verify') { - return redirect('/'); + return redirect(RouteServiceProvider::HOME); } if (isSubscriptionActive() && $request->path() === 'subscription') { - return redirect('/'); + return redirect(RouteServiceProvider::HOME); } return $next($request); } diff --git a/app/Livewire/CheckLicense.php b/app/Livewire/CheckLicense.php index b77cc6afe..8d4351fce 100644 --- a/app/Livewire/CheckLicense.php +++ b/app/Livewire/CheckLicense.php @@ -37,7 +37,7 @@ class CheckLicense extends Component } catch (\Throwable $e) { session()->flash('error', 'Something went wrong. Please contact support.
Error: ' . $e->getMessage()); ray($e->getMessage()); - return $this->redirect('/settings/license', navigate: true); + return redirect()->route('settings.license'); } } } diff --git a/app/Livewire/Destination/Form.php b/app/Livewire/Destination/Form.php index 979546074..b59708303 100644 --- a/app/Livewire/Destination/Form.php +++ b/app/Livewire/Destination/Form.php @@ -36,7 +36,7 @@ class Form extends Component instant_remote_process(['docker network rm -f ' . $this->destination->network], $this->destination->server); } $this->destination->delete(); - return $this->redirectRoute('dashboard', navigate: true); + return redirect()->route('dashboard'); } catch (\Throwable $e) { return handleError($e, $this); } diff --git a/app/Livewire/Destination/New/Docker.php b/app/Livewire/Destination/New/Docker.php index 3b76a7d13..66d0df82e 100644 --- a/app/Livewire/Destination/New/Docker.php +++ b/app/Livewire/Destination/New/Docker.php @@ -86,7 +86,7 @@ class Docker extends Component } } $this->createNetworkAndAttachToProxy(); - return $this->redirectRoute('destination.show', $docker->uuid, navigate: true); + return redirect()->route('destination.show', $docker->uuid); } catch (\Throwable $e) { return handleError($e, $this); } diff --git a/app/Livewire/ForcePasswordReset.php b/app/Livewire/ForcePasswordReset.php index 31c4f3bac..e5a9a079a 100644 --- a/app/Livewire/ForcePasswordReset.php +++ b/app/Livewire/ForcePasswordReset.php @@ -35,7 +35,7 @@ class ForcePasswordReset extends Component if ($firstLogin) { send_internal_notification('First login for ' . auth()->user()->email); } - return $this->redirectRoute('dashboard', navigate: true); + return redirect()->route('dashboard'); } catch (\Throwable $e) { return handleError($e, $this); } diff --git a/app/Livewire/PrivateKey/Change.php b/app/Livewire/PrivateKey/Change.php index 6dc7f3e8c..8177ea55b 100644 --- a/app/Livewire/PrivateKey/Change.php +++ b/app/Livewire/PrivateKey/Change.php @@ -35,7 +35,7 @@ class Change extends Component if ($this->private_key->isEmpty()) { $this->private_key->delete(); currentTeam()->privateKeys = PrivateKey::where('team_id', currentTeam()->id)->get(); - return $this->redirectRoute('security.private-key.index', navigate: true); + return redirect()->route('security.private-key.index'); } $this->dispatch('error', 'This private key is in use and cannot be deleted. Please delete all servers, applications, and GitHub/GitLab apps that use this private key before deleting it.'); } catch (\Throwable $e) { diff --git a/app/Livewire/PrivateKey/Create.php b/app/Livewire/PrivateKey/Create.php index 430ea995e..a82b6fb48 100644 --- a/app/Livewire/PrivateKey/Create.php +++ b/app/Livewire/PrivateKey/Create.php @@ -67,9 +67,9 @@ class Create extends Component 'team_id' => currentTeam()->id ]); if ($this->from === 'server') { - return $this->redirectRoute('server.create', navigate: true); + return redirect()->route('server.create'); } - return $this->redirectRoute('security.private-key.show', ['private_key_uuid' => $private_key->uuid], navigate: true); + return redirect()->route('security.private-key.show', ['private_key_uuid' => $private_key->uuid]); } catch (\Throwable $e) { return handleError($e, $this); } diff --git a/app/Livewire/Project/AddEmpty.php b/app/Livewire/Project/AddEmpty.php index edaca35f0..5b358a61d 100644 --- a/app/Livewire/Project/AddEmpty.php +++ b/app/Livewire/Project/AddEmpty.php @@ -27,7 +27,7 @@ class AddEmpty extends Component 'description' => $this->description, 'team_id' => currentTeam()->id, ]); - return $this->redirectRoute('project.show', $project->uuid, navigate: true); + return redirect()->route('project.show', $project->uuid); } catch (\Throwable $e) { return handleError($e, $this); } finally { diff --git a/app/Livewire/Project/AddEnvironment.php b/app/Livewire/Project/AddEnvironment.php index 5696bc53c..be80c21e1 100644 --- a/app/Livewire/Project/AddEnvironment.php +++ b/app/Livewire/Project/AddEnvironment.php @@ -27,10 +27,10 @@ class AddEnvironment extends Component 'project_id' => $this->project->id, ]); - return $this->redirectRoute('project.resources', [ + return redirect()->route('project.resources', [ 'project_uuid' => $this->project->uuid, 'environment_name' => $environment->name, - ], navigate: true); + ]); } catch (\Throwable $e) { handleError($e, $this); } finally { diff --git a/app/Livewire/Project/Application/Configuration.php b/app/Livewire/Project/Application/Configuration.php index 0022d1693..691cbb7c4 100644 --- a/app/Livewire/Project/Application/Configuration.php +++ b/app/Livewire/Project/Application/Configuration.php @@ -15,15 +15,15 @@ class Configuration extends Component { $project = currentTeam()->load(['projects'])->projects->where('uuid', request()->route('project_uuid'))->first(); if (!$project) { - return $this->redirectRoute('dashboard', navigate: true); + return redirect()->route('dashboard'); } $environment = $project->load(['environments'])->environments->where('name', request()->route('environment_name'))->first()->load(['applications']); if (!$environment) { - return $this->redirectRoute('dashboard', navigate: true); + return redirect()->route('dashboard'); } $application = $environment->applications->where('uuid', request()->route('application_uuid'))->first(); if (!$application) { - return $this->redirectRoute('dashboard', navigate: true); + return redirect()->route('dashboard'); } $this->application = $application; $mainServer = $this->application->destination->server; diff --git a/app/Livewire/Project/Application/Heading.php b/app/Livewire/Project/Application/Heading.php index c8fbcca2b..f6bf4852b 100644 --- a/app/Livewire/Project/Application/Heading.php +++ b/app/Livewire/Project/Application/Heading.php @@ -60,12 +60,12 @@ class Heading extends Component force_rebuild: false, is_new_deployment: true, ); - return $this->redirectRoute('project.application.deployment', [ + return redirect()->route('project.application.deployment', [ 'project_uuid' => $this->parameters['project_uuid'], 'application_uuid' => $this->parameters['application_uuid'], 'deployment_uuid' => $this->deploymentUuid, 'environment_name' => $this->parameters['environment_name'], - ], navigate: true); + ]); } public function deploy(bool $force_rebuild = false) { @@ -83,12 +83,12 @@ class Heading extends Component deployment_uuid: $this->deploymentUuid, force_rebuild: $force_rebuild, ); - $this->redirectRoute('project.application.deployment', [ + return redirect()->route('project.application.deployment', [ 'project_uuid' => $this->parameters['project_uuid'], 'application_uuid' => $this->parameters['application_uuid'], 'deployment_uuid' => $this->deploymentUuid, 'environment_name' => $this->parameters['environment_name'], - ], navigate: true); + ]); } protected function setDeploymentUuid() @@ -113,12 +113,12 @@ class Heading extends Component restart_only: true, is_new_deployment: true, ); - return $this->redirectRoute('project.application.deployment', [ + return redirect()->route('project.application.deployment', [ 'project_uuid' => $this->parameters['project_uuid'], 'application_uuid' => $this->parameters['application_uuid'], 'deployment_uuid' => $this->deploymentUuid, 'environment_name' => $this->parameters['environment_name'], - ], navigate: true); + ]); } public function restart() { @@ -128,11 +128,11 @@ class Heading extends Component deployment_uuid: $this->deploymentUuid, restart_only: true, ); - return $this->redirectRoute('project.application.deployment', [ + return redirect()->route('project.application.deployment', [ 'project_uuid' => $this->parameters['project_uuid'], 'application_uuid' => $this->parameters['application_uuid'], 'deployment_uuid' => $this->deploymentUuid, 'environment_name' => $this->parameters['environment_name'], - ], navigate: true); + ]); } } diff --git a/app/Livewire/Project/Application/Previews.php b/app/Livewire/Project/Application/Previews.php index 31707aa3d..91a28c994 100644 --- a/app/Livewire/Project/Application/Previews.php +++ b/app/Livewire/Project/Application/Previews.php @@ -52,12 +52,12 @@ class Previews extends Component force_rebuild: true, pull_request_id: $pull_request_id, ); - return $this->redirectRoute('project.application.deployment', [ + return redirect()->route('project.application.deployment', [ 'project_uuid' => $this->parameters['project_uuid'], 'application_uuid' => $this->parameters['application_uuid'], 'deployment_uuid' => $this->deployment_uuid, 'environment_name' => $this->parameters['environment_name'], - ], navigate: true); + ]); } catch (\Throwable $e) { return handleError($e, $this); } diff --git a/app/Livewire/Project/Application/Rollback.php b/app/Livewire/Project/Application/Rollback.php index 4c3630877..64d83a5be 100644 --- a/app/Livewire/Project/Application/Rollback.php +++ b/app/Livewire/Project/Application/Rollback.php @@ -29,12 +29,12 @@ class Rollback extends Component commit: $commit, force_rebuild: false, ); - return $this->redirectRoute('project.application.deployment', [ + return redirect()->route('project.application.deployment', [ 'project_uuid' => $this->parameters['project_uuid'], 'application_uuid' => $this->parameters['application_uuid'], 'deployment_uuid' => $deployment_uuid, 'environment_name' => $this->parameters['environment_name'], - ], navigate: true); + ]); } public function loadImages($showToast = false) diff --git a/app/Livewire/Project/CloneProject.php b/app/Livewire/Project/CloneProject.php index 7ce89f8de..2dea157a2 100644 --- a/app/Livewire/Project/CloneProject.php +++ b/app/Livewire/Project/CloneProject.php @@ -152,10 +152,10 @@ class CloneProject extends Component } $newService->parse(); } - return $this->redirectRoute('project.resources', [ + return redirect()->route('project.resources', [ 'project_uuid' => $newProject->uuid, 'environment_name' => $newEnvironment->name, - ], navigate: true); + ]); } catch (\Exception $e) { return handleError($e, $this); } diff --git a/app/Livewire/Project/Database/BackupEdit.php b/app/Livewire/Project/Database/BackupEdit.php index 3a9a83dc4..e8e763c73 100644 --- a/app/Livewire/Project/Database/BackupEdit.php +++ b/app/Livewire/Project/Database/BackupEdit.php @@ -50,9 +50,9 @@ class BackupEdit extends Component $url = $url->withoutQueryParameter('selectedBackupId'); $url = $url->withFragment('backups'); $url = $url->getPath() . "#{$url->getFragment()}"; - return $this->redirect($url,navigate: true); + return redirect($url); } else { - return $this->redirectRoute('project.database.backups.all', $this->parameters); + return redirect()->route('project.database.backups.all', $this->parameters); } } diff --git a/app/Livewire/Project/DeleteEnvironment.php b/app/Livewire/Project/DeleteEnvironment.php index 3b64df0c0..0f2b59c93 100644 --- a/app/Livewire/Project/DeleteEnvironment.php +++ b/app/Livewire/Project/DeleteEnvironment.php @@ -23,7 +23,7 @@ class DeleteEnvironment extends Component $environment = Environment::findOrFail($this->environment_id); if ($environment->isEmpty()) { $environment->delete(); - return $this->redirectRoute('project.show', ['project_uuid' => $this->parameters['project_uuid']], navigate: true); + return redirect()->route('project.show', ['project_uuid' => $this->parameters['project_uuid']]); } return $this->dispatch('error', 'Environment has defined resources, please delete them first.'); } diff --git a/app/Livewire/Project/DeleteProject.php b/app/Livewire/Project/DeleteProject.php index 2c51509e1..23ca8eb79 100644 --- a/app/Livewire/Project/DeleteProject.php +++ b/app/Livewire/Project/DeleteProject.php @@ -25,6 +25,6 @@ class DeleteProject extends Component return $this->dispatch('error', 'Project has resources defined, please delete them first.'); } $project->delete(); - return $this->redirectRoute('projects', navigate: true); + return redirect()->route('projects'); } } diff --git a/app/Livewire/Project/New/DockerCompose.php b/app/Livewire/Project/New/DockerCompose.php index 70699a854..dea5eca3e 100644 --- a/app/Livewire/Project/New/DockerCompose.php +++ b/app/Livewire/Project/New/DockerCompose.php @@ -69,12 +69,12 @@ class DockerCompose extends Component $service->parse(isNew: true); - return $this->redirectRoute('project.service.configuration', [ + return redirect()->route('project.service.configuration', [ 'service_uuid' => $service->uuid, 'environment_name' => $environment->name, 'project_uuid' => $project->uuid, ]); - + } catch (\Throwable $e) { return handleError($e, $this); } diff --git a/app/Livewire/Project/New/DockerImage.php b/app/Livewire/Project/New/DockerImage.php index 10d4821b1..cf3164e33 100644 --- a/app/Livewire/Project/New/DockerImage.php +++ b/app/Livewire/Project/New/DockerImage.php @@ -64,11 +64,11 @@ class DockerImage extends Component 'name' => 'docker-image-' . $application->uuid, 'fqdn' => $fqdn ]); - return $this->redirectRoute('project.application.configuration', [ + return redirect()->route('project.application.configuration', [ 'application_uuid' => $application->uuid, 'environment_name' => $environment->name, 'project_uuid' => $project->uuid, - ], navigate: false); + ]); } public function render() { diff --git a/app/Livewire/Project/New/EmptyProject.php b/app/Livewire/Project/New/EmptyProject.php index 58e81cb22..52e9ce7dc 100644 --- a/app/Livewire/Project/New/EmptyProject.php +++ b/app/Livewire/Project/New/EmptyProject.php @@ -13,6 +13,6 @@ class EmptyProject extends Component 'name' => generate_random_name(), 'team_id' => currentTeam()->id, ]); - return $this->redirectRoute('project.show', ['project_uuid' => $project->uuid, 'environment_name' => 'production'], navigate: false); + return redirect()->route('project.show', ['project_uuid' => $project->uuid, 'environment_name' => 'production']); } } diff --git a/app/Livewire/Project/New/GithubPrivateRepository.php b/app/Livewire/Project/New/GithubPrivateRepository.php index 8c8e7cc4b..4108727f3 100644 --- a/app/Livewire/Project/New/GithubPrivateRepository.php +++ b/app/Livewire/Project/New/GithubPrivateRepository.php @@ -151,11 +151,11 @@ class GithubPrivateRepository extends Component $application->name = generate_application_name($this->selected_repository_owner . '/' . $this->selected_repository_repo, $this->selected_branch_name, $application->uuid); $application->save(); - return $this->redirectRoute('project.application.configuration', [ + return redirect()->route('project.application.configuration', [ 'application_uuid' => $application->uuid, 'environment_name' => $environment->name, 'project_uuid' => $project->uuid, - ], navigate: false); + ]); } catch (\Throwable $e) { return handleError($e, $this); } diff --git a/app/Livewire/Project/New/GithubPrivateRepositoryDeployKey.php b/app/Livewire/Project/New/GithubPrivateRepositoryDeployKey.php index 7c812d089..aab0df3db 100644 --- a/app/Livewire/Project/New/GithubPrivateRepositoryDeployKey.php +++ b/app/Livewire/Project/New/GithubPrivateRepositoryDeployKey.php @@ -132,11 +132,11 @@ class GithubPrivateRepositoryDeployKey extends Component $application->name = generate_random_name($application->uuid); $application->save(); - return $this->redirectRoute('project.application.configuration', [ + return redirect()->route('project.application.configuration', [ 'application_uuid' => $application->uuid, 'environment_name' => $environment->name, 'project_uuid' => $project->uuid, - ], navigate: false); + ]); } catch (\Throwable $e) { return handleError($e, $this); } diff --git a/app/Livewire/Project/New/PublicGitRepository.php b/app/Livewire/Project/New/PublicGitRepository.php index 4f700aa9c..6599d1188 100644 --- a/app/Livewire/Project/New/PublicGitRepository.php +++ b/app/Livewire/Project/New/PublicGitRepository.php @@ -184,11 +184,11 @@ class PublicGitRepository extends Component $application->fqdn = $fqdn; $application->save(); - return $this->redirectRoute('project.application.configuration', [ + return redirect()->route('project.application.configuration', [ 'application_uuid' => $application->uuid, 'environment_name' => $environment->name, 'project_uuid' => $project->uuid, - ], navigate: false); + ]); } catch (\Throwable $e) { return handleError($e, $this); } diff --git a/app/Livewire/Project/New/Select.php b/app/Livewire/Project/New/Select.php index 0ba58c28a..47834a7fc 100644 --- a/app/Livewire/Project/New/Select.php +++ b/app/Livewire/Project/New/Select.php @@ -55,10 +55,10 @@ class Select extends Component public function updatedSelectedEnvironment() { - return $this->redirectRoute('project.resources.new', [ + return redirect()->route('project.resources.new', [ 'project_uuid' => $this->parameters['project_uuid'], 'environment_name' => $this->selectedEnvironment, - ], navigate: true); + ]); } // public function addExistingPostgresql() diff --git a/app/Livewire/Project/New/SimpleDockerfile.php b/app/Livewire/Project/New/SimpleDockerfile.php index d61757eca..55b48041a 100644 --- a/app/Livewire/Project/New/SimpleDockerfile.php +++ b/app/Livewire/Project/New/SimpleDockerfile.php @@ -70,10 +70,10 @@ CMD ["nginx", "-g", "daemon off;"] 'fqdn' => $fqdn ]); - return $this->redirectRoute('project.application.configuration', [ + return redirect()->route('project.application.configuration', [ 'application_uuid' => $application->uuid, 'environment_name' => $environment->name, 'project_uuid' => $project->uuid, - ], navigate: false); + ]); } } diff --git a/app/Livewire/Project/Service/Application.php b/app/Livewire/Project/Service/Application.php index 1adacf555..3ff711400 100644 --- a/app/Livewire/Project/Service/Application.php +++ b/app/Livewire/Project/Service/Application.php @@ -41,7 +41,7 @@ class Application extends Component try { $this->application->delete(); $this->dispatch('success', 'Application deleted successfully.'); - return $this->redirectRoute('project.service.configuration', $this->parameters, navigate: true); + return redirect()->route('project.service.configuration', $this->parameters); } catch (\Throwable $e) { return handleError($e, $this); } diff --git a/app/Livewire/Project/Shared/Danger.php b/app/Livewire/Project/Shared/Danger.php index 39dc38310..44a9d5cf3 100644 --- a/app/Livewire/Project/Shared/Danger.php +++ b/app/Livewire/Project/Shared/Danger.php @@ -25,10 +25,10 @@ class Danger extends Component { try { DeleteResourceJob::dispatchSync($this->resource); - return $this->redirectRoute('project.resources', [ + return redirect()->route('project.resources', [ 'project_uuid' => $this->projectUuid, 'environment_name' => $this->environmentName - ], navigate: true); + ]); } catch (\Throwable $e) { return handleError($e, $this); } diff --git a/app/Livewire/Server/Delete.php b/app/Livewire/Server/Delete.php index 4931e598c..73edf5ffe 100644 --- a/app/Livewire/Server/Delete.php +++ b/app/Livewire/Server/Delete.php @@ -19,7 +19,7 @@ class Delete extends Component return; } $this->server->delete(); - return $this->redirectRoute('server.all', navigate: true); + return redirect()->route('server.all'); } catch (\Throwable $e) { return handleError($e, $this); } diff --git a/app/Livewire/Server/Destination/Show.php b/app/Livewire/Server/Destination/Show.php index 3df263f8b..7fa2a2823 100644 --- a/app/Livewire/Server/Destination/Show.php +++ b/app/Livewire/Server/Destination/Show.php @@ -15,7 +15,7 @@ class Show extends Component try { $this->server = Server::ownedByCurrentTeam()->whereUuid(request()->server_uuid)->first(); if (is_null($this->server)) { - return $this->redirectRoute('server.all', navigate: true); + return redirect()->route('server.all'); } } catch (\Throwable $e) { return handleError($e, $this); diff --git a/app/Livewire/Server/LogDrains.php b/app/Livewire/Server/LogDrains.php index bdaf152d7..902ec4b75 100644 --- a/app/Livewire/Server/LogDrains.php +++ b/app/Livewire/Server/LogDrains.php @@ -43,7 +43,7 @@ class LogDrains extends Component try { $server = Server::ownedByCurrentTeam()->whereUuid(request()->server_uuid)->first(); if (is_null($server)) { - return $this->redirectRoute('server.all', navigate: true); + return redirect()->route('server.all'); } $this->server = $server; } catch (\Throwable $e) { diff --git a/app/Livewire/Server/New/ByIp.php b/app/Livewire/Server/New/ByIp.php index ba94063cd..5238931a8 100644 --- a/app/Livewire/Server/New/ByIp.php +++ b/app/Livewire/Server/New/ByIp.php @@ -93,7 +93,7 @@ class ByIp extends Component $server->settings->is_swarm_worker = $this->is_swarm_worker; $server->settings->save(); $server->addInitialNetwork(); - return $this->redirectRoute('server.show', $server->uuid); + return redirect()->route('server.show', $server->uuid); } catch (\Throwable $e) { return handleError($e, $this); } diff --git a/app/Livewire/Server/PrivateKey/Show.php b/app/Livewire/Server/PrivateKey/Show.php index 97ee66729..9fa0acb75 100644 --- a/app/Livewire/Server/PrivateKey/Show.php +++ b/app/Livewire/Server/PrivateKey/Show.php @@ -17,7 +17,7 @@ class Show extends Component try { $this->server = Server::ownedByCurrentTeam()->whereUuid(request()->server_uuid)->first(); if (is_null($this->server)) { - return $this->redirectRoute('server.all', navigate: true); + return redirect()->route('server.all'); } $this->privateKeys = PrivateKey::ownedByCurrentTeam()->get()->where('is_git_related', false); } catch (\Throwable $e) { diff --git a/app/Livewire/Server/Proxy/Logs.php b/app/Livewire/Server/Proxy/Logs.php index e1ca0ca3f..ed12f8c49 100644 --- a/app/Livewire/Server/Proxy/Logs.php +++ b/app/Livewire/Server/Proxy/Logs.php @@ -15,7 +15,7 @@ class Logs extends Component try { $this->server = Server::ownedByCurrentTeam()->whereUuid(request()->server_uuid)->first(); if (is_null($this->server)) { - return $this->redirectRoute('server.all', navigate: true); + return redirect()->route('server.all'); } } catch (\Throwable $e) { return handleError($e, $this); diff --git a/app/Livewire/Server/Proxy/Show.php b/app/Livewire/Server/Proxy/Show.php index 4c515b926..b1175d3b7 100644 --- a/app/Livewire/Server/Proxy/Show.php +++ b/app/Livewire/Server/Proxy/Show.php @@ -20,7 +20,7 @@ class Show extends Component try { $this->server = Server::ownedByCurrentTeam()->whereUuid(request()->server_uuid)->first(); if (is_null($this->server)) { - return $this->redirectRoute('server.all', navigate: true); + return redirect()->route('server.all'); } } catch (\Throwable $e) { return handleError($e, $this); diff --git a/app/Livewire/Server/Show.php b/app/Livewire/Server/Show.php index 2c0ec6e82..065335835 100644 --- a/app/Livewire/Server/Show.php +++ b/app/Livewire/Server/Show.php @@ -17,7 +17,7 @@ class Show extends Component try { $this->server = Server::ownedByCurrentTeam()->whereUuid(request()->server_uuid)->first(); if (is_null($this->server)) { - return $this->redirectRoute('server.all', navigate: true); + return redirect()->route('server.all'); } } catch (\Throwable $e) { diff --git a/app/Livewire/Source/Github/Change.php b/app/Livewire/Source/Github/Change.php index cfea6fe9d..bd8304c9e 100644 --- a/app/Livewire/Source/Github/Change.php +++ b/app/Livewire/Source/Github/Change.php @@ -41,7 +41,7 @@ class Change extends Component $github_app_uuid = request()->github_app_uuid; $this->github_app = GithubApp::where('uuid', $github_app_uuid)->first(); if (!$this->github_app) { - return $this->redirectRoute('source.all', navigate: true); + return redirect()->route('source.all'); } $settings = InstanceSettings::get(); $this->github_app->makeVisible('client_secret')->makeVisible('webhook_secret'); @@ -67,7 +67,7 @@ class Change extends Component $type = data_get($parameters, 'type'); $destination = data_get($parameters, 'destination'); session()->forget('from'); - return $this->redirectRoute($back, [ + return redirect()->route($back, [ 'environment_name' => $environment_name, 'project_uuid' => $project_uuid, 'type' => $type, @@ -117,7 +117,7 @@ class Change extends Component { try { $this->github_app->delete(); - return $this->redirectRoute('source.all', navigate: true); + return redirect()->route('source.all'); } catch (\Throwable $e) { return handleError($e, $this); } diff --git a/app/Livewire/Source/Github/Create.php b/app/Livewire/Source/Github/Create.php index 543c7d2ac..032fc9318 100644 --- a/app/Livewire/Source/Github/Create.php +++ b/app/Livewire/Source/Github/Create.php @@ -48,7 +48,7 @@ class Create extends Component if (session('from')) { session(['from' => session('from') + ['source_id' => $github_app->id]]); } - return $this->redirectRoute('source.github.show', ['github_app_uuid' => $github_app->uuid], navigate: true); + return redirect()->route('source.github.show', ['github_app_uuid' => $github_app->uuid]); } catch (\Throwable $e) { return handleError($e, $this); } diff --git a/app/Livewire/Subscription/Show.php b/app/Livewire/Subscription/Show.php index ee12eef6d..6c92f7555 100644 --- a/app/Livewire/Subscription/Show.php +++ b/app/Livewire/Subscription/Show.php @@ -3,6 +3,7 @@ namespace App\Livewire\Subscription; use App\Models\InstanceSettings; +use App\Providers\RouteServiceProvider; use Livewire\Component; class Show extends Component @@ -11,7 +12,7 @@ class Show extends Component public bool $alreadySubscribed = false; public function mount() { if (!isCloud()) { - return $this->redirect('/', navigate: true); + return redirect(RouteServiceProvider::HOME); } $this->settings = InstanceSettings::get(); $this->alreadySubscribed = currentTeam()->subscription()->exists(); diff --git a/app/Livewire/Team/Create.php b/app/Livewire/Team/Create.php index 1fb642582..2ca647092 100644 --- a/app/Livewire/Team/Create.php +++ b/app/Livewire/Team/Create.php @@ -30,7 +30,7 @@ class Create extends Component ]); auth()->user()->teams()->attach($team, ['role' => 'admin']); refreshSession(); - return $this->redirectRoute('team.index', navigate: true); + return redirect()->route('team.index'); } catch (\Throwable $e) { return handleError($e, $this); } diff --git a/app/Livewire/Team/Delete.php b/app/Livewire/Team/Delete.php index 14c7a8f82..097419c4c 100644 --- a/app/Livewire/Team/Delete.php +++ b/app/Livewire/Team/Delete.php @@ -24,6 +24,6 @@ class Delete extends Component }); refreshSession(); - return $this->redirectRoute('team.index', navigate: true); + return redirect()->route('team.index'); } } diff --git a/app/Livewire/Team/Storage/Create.php b/app/Livewire/Team/Storage/Create.php index 14c4cda9b..cbbba398f 100644 --- a/app/Livewire/Team/Storage/Create.php +++ b/app/Livewire/Team/Storage/Create.php @@ -65,7 +65,7 @@ class Create extends Component $this->storage->team_id = currentTeam()->id; $this->storage->testConnection(); $this->storage->save(); - return $this->redirectRoute('team.storages.show', $this->storage->uuid, navigate: true); + return redirect()->route('team.storages.show', $this->storage->uuid); } catch (\Throwable $e) { return handleError($e, $this); } diff --git a/app/Livewire/Team/Storage/Form.php b/app/Livewire/Team/Storage/Form.php index 4c95c1e26..23b0fe34c 100644 --- a/app/Livewire/Team/Storage/Form.php +++ b/app/Livewire/Team/Storage/Form.php @@ -43,7 +43,7 @@ class Form extends Component { try { $this->storage->delete(); - return $this->redirectRoute('team.storages.all', navigate: true); + return redirect()->route('team.storages.all'); } catch (\Throwable $e) { return handleError($e, $this); } diff --git a/app/Livewire/Waitlist/Index.php b/app/Livewire/Waitlist/Index.php index 5df8ba0b7..a3829dec7 100644 --- a/app/Livewire/Waitlist/Index.php +++ b/app/Livewire/Waitlist/Index.php @@ -24,7 +24,7 @@ class Index extends Component public function mount() { if (config('coolify.waitlist') == false) { - return $this->redirectRoute('register', navigate: true); + return redirect()->route('register'); } $this->waitingInLine = Waitlist::whereVerified(true)->count(); $this->users = User::count(); diff --git a/app/Providers/FortifyServiceProvider.php b/app/Providers/FortifyServiceProvider.php index a5fce4858..ccd90d14b 100644 --- a/app/Providers/FortifyServiceProvider.php +++ b/app/Providers/FortifyServiceProvider.php @@ -31,9 +31,9 @@ class FortifyServiceProvider extends ServiceProvider { // First user (root) will be redirected to /settings instead of / on registration. if ($request->user()->currentTeam->id === 0) { - return redirect('/settings'); + return redirect()->route('settings.configuration'); } - return redirect('/'); + return redirect(RouteServiceProvider::HOME); } }); } diff --git a/composer.lock b/composer.lock index 54b33b87a..82bed2c82 100644 --- a/composer.lock +++ b/composer.lock @@ -6,6 +6,557 @@ ], "content-hash": "44337ff4ff1d9c435d9776fec01ebe9c", "packages": [ + { + "name": "amphp/amp", + "version": "v2.6.2", + "source": { + "type": "git", + "url": "https://github.com/amphp/amp.git", + "reference": "9d5100cebffa729aaffecd3ad25dc5aeea4f13bb" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/amphp/amp/zipball/9d5100cebffa729aaffecd3ad25dc5aeea4f13bb", + "reference": "9d5100cebffa729aaffecd3ad25dc5aeea4f13bb", + "shasum": "" + }, + "require": { + "php": ">=7.1" + }, + "require-dev": { + "amphp/php-cs-fixer-config": "dev-master", + "amphp/phpunit-util": "^1", + "ext-json": "*", + "jetbrains/phpstorm-stubs": "^2019.3", + "phpunit/phpunit": "^7 | ^8 | ^9", + "psalm/phar": "^3.11@dev", + "react/promise": "^2" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.x-dev" + } + }, + "autoload": { + "files": [ + "lib/functions.php", + "lib/Internal/functions.php" + ], + "psr-4": { + "Amp\\": "lib" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Daniel Lowrey", + "email": "rdlowrey@php.net" + }, + { + "name": "Aaron Piotrowski", + "email": "aaron@trowski.com" + }, + { + "name": "Bob Weinand", + "email": "bobwei9@hotmail.com" + }, + { + "name": "Niklas Keller", + "email": "me@kelunik.com" + } + ], + "description": "A non-blocking concurrency framework for PHP applications.", + "homepage": "https://amphp.org/amp", + "keywords": [ + "async", + "asynchronous", + "awaitable", + "concurrency", + "event", + "event-loop", + "future", + "non-blocking", + "promise" + ], + "support": { + "irc": "irc://irc.freenode.org/amphp", + "issues": "https://github.com/amphp/amp/issues", + "source": "https://github.com/amphp/amp/tree/v2.6.2" + }, + "funding": [ + { + "url": "https://github.com/amphp", + "type": "github" + } + ], + "time": "2022-02-20T17:52:18+00:00" + }, + { + "name": "amphp/byte-stream", + "version": "v1.8.1", + "source": { + "type": "git", + "url": "https://github.com/amphp/byte-stream.git", + "reference": "acbd8002b3536485c997c4e019206b3f10ca15bd" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/amphp/byte-stream/zipball/acbd8002b3536485c997c4e019206b3f10ca15bd", + "reference": "acbd8002b3536485c997c4e019206b3f10ca15bd", + "shasum": "" + }, + "require": { + "amphp/amp": "^2", + "php": ">=7.1" + }, + "require-dev": { + "amphp/php-cs-fixer-config": "dev-master", + "amphp/phpunit-util": "^1.4", + "friendsofphp/php-cs-fixer": "^2.3", + "jetbrains/phpstorm-stubs": "^2019.3", + "phpunit/phpunit": "^6 || ^7 || ^8", + "psalm/phar": "^3.11.4" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.x-dev" + } + }, + "autoload": { + "files": [ + "lib/functions.php" + ], + "psr-4": { + "Amp\\ByteStream\\": "lib" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Aaron Piotrowski", + "email": "aaron@trowski.com" + }, + { + "name": "Niklas Keller", + "email": "me@kelunik.com" + } + ], + "description": "A stream abstraction to make working with non-blocking I/O simple.", + "homepage": "http://amphp.org/byte-stream", + "keywords": [ + "amp", + "amphp", + "async", + "io", + "non-blocking", + "stream" + ], + "support": { + "irc": "irc://irc.freenode.org/amphp", + "issues": "https://github.com/amphp/byte-stream/issues", + "source": "https://github.com/amphp/byte-stream/tree/v1.8.1" + }, + "funding": [ + { + "url": "https://github.com/amphp", + "type": "github" + } + ], + "time": "2021-03-30T17:13:30+00:00" + }, + { + "name": "amphp/parallel", + "version": "v1.4.3", + "source": { + "type": "git", + "url": "https://github.com/amphp/parallel.git", + "reference": "3aac213ba7858566fd83d38ccb85b91b2d652cb0" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/amphp/parallel/zipball/3aac213ba7858566fd83d38ccb85b91b2d652cb0", + "reference": "3aac213ba7858566fd83d38ccb85b91b2d652cb0", + "shasum": "" + }, + "require": { + "amphp/amp": "^2", + "amphp/byte-stream": "^1.6.1", + "amphp/parser": "^1", + "amphp/process": "^1", + "amphp/serialization": "^1", + "amphp/sync": "^1.0.1", + "php": ">=7.1" + }, + "require-dev": { + "amphp/php-cs-fixer-config": "dev-master", + "amphp/phpunit-util": "^1.1", + "phpunit/phpunit": "^8 || ^7" + }, + "type": "library", + "autoload": { + "files": [ + "lib/Context/functions.php", + "lib/Sync/functions.php", + "lib/Worker/functions.php" + ], + "psr-4": { + "Amp\\Parallel\\": "lib" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Aaron Piotrowski", + "email": "aaron@trowski.com" + }, + { + "name": "Stephen Coakley", + "email": "me@stephencoakley.com" + } + ], + "description": "Parallel processing component for Amp.", + "homepage": "https://github.com/amphp/parallel", + "keywords": [ + "async", + "asynchronous", + "concurrent", + "multi-processing", + "multi-threading" + ], + "support": { + "issues": "https://github.com/amphp/parallel/issues", + "source": "https://github.com/amphp/parallel/tree/v1.4.3" + }, + "funding": [ + { + "url": "https://github.com/amphp", + "type": "github" + } + ], + "time": "2023-03-23T08:04:23+00:00" + }, + { + "name": "amphp/parallel-functions", + "version": "v1.1.0", + "source": { + "type": "git", + "url": "https://github.com/amphp/parallel-functions.git", + "reference": "04e92fcacfc921a56dfe12c23b3265e62593a7cb" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/amphp/parallel-functions/zipball/04e92fcacfc921a56dfe12c23b3265e62593a7cb", + "reference": "04e92fcacfc921a56dfe12c23b3265e62593a7cb", + "shasum": "" + }, + "require": { + "amphp/amp": "^2.0.3", + "amphp/parallel": "^1.4", + "amphp/serialization": "^1.0", + "laravel/serializable-closure": "^1.0", + "php": ">=7.4" + }, + "require-dev": { + "amphp/php-cs-fixer-config": "v2.x-dev", + "amphp/phpunit-util": "^2.0", + "phpunit/phpunit": "^9.5.11" + }, + "type": "library", + "autoload": { + "files": [ + "src/functions.php" + ], + "psr-4": { + "Amp\\ParallelFunctions\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Niklas Keller", + "email": "me@kelunik.com" + } + ], + "description": "Parallel processing made simple.", + "support": { + "issues": "https://github.com/amphp/parallel-functions/issues", + "source": "https://github.com/amphp/parallel-functions/tree/v1.1.0" + }, + "funding": [ + { + "url": "https://github.com/amphp", + "type": "github" + } + ], + "time": "2022-02-03T19:32:41+00:00" + }, + { + "name": "amphp/parser", + "version": "v1.1.0", + "source": { + "type": "git", + "url": "https://github.com/amphp/parser.git", + "reference": "ff1de4144726c5dad5fab97f66692ebe8de3e151" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/amphp/parser/zipball/ff1de4144726c5dad5fab97f66692ebe8de3e151", + "reference": "ff1de4144726c5dad5fab97f66692ebe8de3e151", + "shasum": "" + }, + "require": { + "php": ">=7.4" + }, + "require-dev": { + "amphp/php-cs-fixer-config": "^2", + "phpunit/phpunit": "^9", + "psalm/phar": "^5.4" + }, + "type": "library", + "autoload": { + "psr-4": { + "Amp\\Parser\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Aaron Piotrowski", + "email": "aaron@trowski.com" + }, + { + "name": "Niklas Keller", + "email": "me@kelunik.com" + } + ], + "description": "A generator parser to make streaming parsers simple.", + "homepage": "https://github.com/amphp/parser", + "keywords": [ + "async", + "non-blocking", + "parser", + "stream" + ], + "support": { + "issues": "https://github.com/amphp/parser/issues", + "source": "https://github.com/amphp/parser/tree/v1.1.0" + }, + "funding": [ + { + "url": "https://github.com/amphp", + "type": "github" + } + ], + "time": "2022-12-30T18:08:47+00:00" + }, + { + "name": "amphp/process", + "version": "v1.1.4", + "source": { + "type": "git", + "url": "https://github.com/amphp/process.git", + "reference": "76e9495fd6818b43a20167cb11d8a67f7744ee0f" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/amphp/process/zipball/76e9495fd6818b43a20167cb11d8a67f7744ee0f", + "reference": "76e9495fd6818b43a20167cb11d8a67f7744ee0f", + "shasum": "" + }, + "require": { + "amphp/amp": "^2", + "amphp/byte-stream": "^1.4", + "php": ">=7" + }, + "require-dev": { + "amphp/php-cs-fixer-config": "dev-master", + "amphp/phpunit-util": "^1", + "phpunit/phpunit": "^6" + }, + "type": "library", + "autoload": { + "files": [ + "lib/functions.php" + ], + "psr-4": { + "Amp\\Process\\": "lib" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Bob Weinand", + "email": "bobwei9@hotmail.com" + }, + { + "name": "Aaron Piotrowski", + "email": "aaron@trowski.com" + }, + { + "name": "Niklas Keller", + "email": "me@kelunik.com" + } + ], + "description": "Asynchronous process manager.", + "homepage": "https://github.com/amphp/process", + "support": { + "issues": "https://github.com/amphp/process/issues", + "source": "https://github.com/amphp/process/tree/v1.1.4" + }, + "funding": [ + { + "url": "https://github.com/amphp", + "type": "github" + } + ], + "time": "2022-07-06T23:50:12+00:00" + }, + { + "name": "amphp/serialization", + "version": "v1.0.0", + "source": { + "type": "git", + "url": "https://github.com/amphp/serialization.git", + "reference": "693e77b2fb0b266c3c7d622317f881de44ae94a1" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/amphp/serialization/zipball/693e77b2fb0b266c3c7d622317f881de44ae94a1", + "reference": "693e77b2fb0b266c3c7d622317f881de44ae94a1", + "shasum": "" + }, + "require": { + "php": ">=7.1" + }, + "require-dev": { + "amphp/php-cs-fixer-config": "dev-master", + "phpunit/phpunit": "^9 || ^8 || ^7" + }, + "type": "library", + "autoload": { + "files": [ + "src/functions.php" + ], + "psr-4": { + "Amp\\Serialization\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Aaron Piotrowski", + "email": "aaron@trowski.com" + }, + { + "name": "Niklas Keller", + "email": "me@kelunik.com" + } + ], + "description": "Serialization tools for IPC and data storage in PHP.", + "homepage": "https://github.com/amphp/serialization", + "keywords": [ + "async", + "asynchronous", + "serialization", + "serialize" + ], + "support": { + "issues": "https://github.com/amphp/serialization/issues", + "source": "https://github.com/amphp/serialization/tree/master" + }, + "time": "2020-03-25T21:39:07+00:00" + }, + { + "name": "amphp/sync", + "version": "v1.4.2", + "source": { + "type": "git", + "url": "https://github.com/amphp/sync.git", + "reference": "85ab06764f4f36d63b1356b466df6111cf4b89cf" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/amphp/sync/zipball/85ab06764f4f36d63b1356b466df6111cf4b89cf", + "reference": "85ab06764f4f36d63b1356b466df6111cf4b89cf", + "shasum": "" + }, + "require": { + "amphp/amp": "^2.2", + "php": ">=7.1" + }, + "require-dev": { + "amphp/php-cs-fixer-config": "dev-master", + "amphp/phpunit-util": "^1.1", + "phpunit/phpunit": "^9 || ^8 || ^7" + }, + "type": "library", + "autoload": { + "files": [ + "src/functions.php", + "src/ConcurrentIterator/functions.php" + ], + "psr-4": { + "Amp\\Sync\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Aaron Piotrowski", + "email": "aaron@trowski.com" + }, + { + "name": "Stephen Coakley", + "email": "me@stephencoakley.com" + } + ], + "description": "Mutex, Semaphore, and other synchronization tools for Amp.", + "homepage": "https://github.com/amphp/sync", + "keywords": [ + "async", + "asynchronous", + "mutex", + "semaphore", + "synchronization" + ], + "support": { + "issues": "https://github.com/amphp/sync/issues", + "source": "https://github.com/amphp/sync/tree/v1.4.2" + }, + "funding": [ + { + "url": "https://github.com/amphp", + "type": "github" + } + ], + "time": "2021-10-25T18:29:10+00:00" + }, { "name": "aws/aws-crt-php", "version": "v1.2.4", @@ -62,16 +613,16 @@ }, { "name": "aws/aws-sdk-php", - "version": "3.293.4", + "version": "3.295.1", "source": { "type": "git", "url": "https://github.com/aws/aws-sdk-php.git", - "reference": "bb62581cb3796dd1866ace52ed0a750bd22936a8" + "reference": "31c69734d929510502b6401c01b593521efdcbc5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/bb62581cb3796dd1866ace52ed0a750bd22936a8", - "reference": "bb62581cb3796dd1866ace52ed0a750bd22936a8", + "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/31c69734d929510502b6401c01b593521efdcbc5", + "reference": "31c69734d929510502b6401c01b593521efdcbc5", "shasum": "" }, "require": { @@ -151,9 +702,9 @@ "support": { "forum": "https://forums.aws.amazon.com/forum.jspa?forumID=80", "issues": "https://github.com/aws/aws-sdk-php/issues", - "source": "https://github.com/aws/aws-sdk-php/tree/3.293.4" + "source": "https://github.com/aws/aws-sdk-php/tree/3.295.1" }, - "time": "2023-12-05T19:07:19+00:00" + "time": "2023-12-26T19:06:59+00:00" }, { "name": "bacon/bacon-qr-code", @@ -266,16 +817,16 @@ }, { "name": "carbonphp/carbon-doctrine-types", - "version": "2.0.0", + "version": "2.1.0", "source": { "type": "git", "url": "https://github.com/CarbonPHP/carbon-doctrine-types.git", - "reference": "67a77972b9f398ae7068dabacc39c08aeee170d5" + "reference": "99f76ffa36cce3b70a4a6abce41dba15ca2e84cb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/CarbonPHP/carbon-doctrine-types/zipball/67a77972b9f398ae7068dabacc39c08aeee170d5", - "reference": "67a77972b9f398ae7068dabacc39c08aeee170d5", + "url": "https://api.github.com/repos/CarbonPHP/carbon-doctrine-types/zipball/99f76ffa36cce3b70a4a6abce41dba15ca2e84cb", + "reference": "99f76ffa36cce3b70a4a6abce41dba15ca2e84cb", "shasum": "" }, "require": { @@ -315,7 +866,7 @@ ], "support": { "issues": "https://github.com/CarbonPHP/carbon-doctrine-types/issues", - "source": "https://github.com/CarbonPHP/carbon-doctrine-types/tree/2.0.0" + "source": "https://github.com/CarbonPHP/carbon-doctrine-types/tree/2.1.0" }, "funding": [ { @@ -331,27 +882,27 @@ "type": "tidelift" } ], - "time": "2023-10-01T14:29:01+00:00" + "time": "2023-12-11T17:09:12+00:00" }, { "name": "clue/stream-filter", - "version": "v1.6.0", + "version": "v1.7.0", "source": { "type": "git", "url": "https://github.com/clue/stream-filter.git", - "reference": "d6169430c7731d8509da7aecd0af756a5747b78e" + "reference": "049509fef80032cb3f051595029ab75b49a3c2f7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/clue/stream-filter/zipball/d6169430c7731d8509da7aecd0af756a5747b78e", - "reference": "d6169430c7731d8509da7aecd0af756a5747b78e", + "url": "https://api.github.com/repos/clue/stream-filter/zipball/049509fef80032cb3f051595029ab75b49a3c2f7", + "reference": "049509fef80032cb3f051595029ab75b49a3c2f7", "shasum": "" }, "require": { "php": ">=5.3" }, "require-dev": { - "phpunit/phpunit": "^9.3 || ^5.7 || ^4.8.36" + "phpunit/phpunit": "^9.6 || ^5.7 || ^4.8.36" }, "type": "library", "autoload": { @@ -373,7 +924,7 @@ } ], "description": "A simple and modern approach to stream filtering in PHP", - "homepage": "https://github.com/clue/php-stream-filter", + "homepage": "https://github.com/clue/stream-filter", "keywords": [ "bucket brigade", "callback", @@ -385,7 +936,7 @@ ], "support": { "issues": "https://github.com/clue/stream-filter/issues", - "source": "https://github.com/clue/stream-filter/tree/v1.6.0" + "source": "https://github.com/clue/stream-filter/tree/v1.7.0" }, "funding": [ { @@ -397,7 +948,7 @@ "type": "github" } ], - "time": "2022-02-21T13:15:14+00:00" + "time": "2023-12-20T15:40:13+00:00" }, { "name": "danharrin/livewire-rate-limiting", @@ -1881,16 +2432,16 @@ }, { "name": "laravel/fortify", - "version": "v1.19.0", + "version": "v1.19.1", "source": { "type": "git", "url": "https://github.com/laravel/fortify.git", - "reference": "2da721fead1f3bc18af983e4903c4e1df67177e7" + "reference": "1dde858a520f679b4a2f453fa68f8a0e98751875" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/fortify/zipball/2da721fead1f3bc18af983e4903c4e1df67177e7", - "reference": "2da721fead1f3bc18af983e4903c4e1df67177e7", + "url": "https://api.github.com/repos/laravel/fortify/zipball/1dde858a520f679b4a2f453fa68f8a0e98751875", + "reference": "1dde858a520f679b4a2f453fa68f8a0e98751875", "shasum": "" }, "require": { @@ -1941,20 +2492,20 @@ "issues": "https://github.com/laravel/fortify/issues", "source": "https://github.com/laravel/fortify" }, - "time": "2023-11-27T22:01:18+00:00" + "time": "2023-12-11T16:16:45+00:00" }, { "name": "laravel/framework", - "version": "v10.35.0", + "version": "v10.39.0", "source": { "type": "git", "url": "https://github.com/laravel/framework.git", - "reference": "91ec2d92d2f6007e9084fe06438b99c91845da69" + "reference": "114926b07bfb5fbf2545c03aa2ce5c8c37be650c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/framework/zipball/91ec2d92d2f6007e9084fe06438b99c91845da69", - "reference": "91ec2d92d2f6007e9084fe06438b99c91845da69", + "url": "https://api.github.com/repos/laravel/framework/zipball/114926b07bfb5fbf2545c03aa2ce5c8c37be650c", + "reference": "114926b07bfb5fbf2545c03aa2ce5c8c37be650c", "shasum": "" }, "require": { @@ -2000,6 +2551,8 @@ "voku/portable-ascii": "^2.0" }, "conflict": { + "carbonphp/carbon-doctrine-types": ">=3.0", + "doctrine/dbal": ">=4.0", "tightenco/collect": "<5.5.33" }, "provide": { @@ -2055,7 +2608,7 @@ "league/flysystem-sftp-v3": "^3.0", "mockery/mockery": "^1.5.1", "nyholm/psr7": "^1.2", - "orchestra/testbench-core": "^8.15.1", + "orchestra/testbench-core": "^8.18", "pda/pheanstalk": "^4.0", "phpstan/phpstan": "^1.4.7", "phpunit/phpunit": "^10.0.7", @@ -2111,6 +2664,7 @@ "files": [ "src/Illuminate/Collections/helpers.php", "src/Illuminate/Events/functions.php", + "src/Illuminate/Filesystem/functions.php", "src/Illuminate/Foundation/helpers.php", "src/Illuminate/Support/helpers.php" ], @@ -2143,7 +2697,7 @@ "issues": "https://github.com/laravel/framework/issues", "source": "https://github.com/laravel/framework" }, - "time": "2023-12-05T14:50:33+00:00" + "time": "2023-12-27T14:26:28+00:00" }, { "name": "laravel/horizon", @@ -2225,16 +2779,16 @@ }, { "name": "laravel/prompts", - "version": "v0.1.13", + "version": "v0.1.14", "source": { "type": "git", "url": "https://github.com/laravel/prompts.git", - "reference": "e1379d8ead15edd6cc4369c22274345982edc95a" + "reference": "2219fa9c4b944add1e825c3bdb8ecae8bc503bc6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/prompts/zipball/e1379d8ead15edd6cc4369c22274345982edc95a", - "reference": "e1379d8ead15edd6cc4369c22274345982edc95a", + "url": "https://api.github.com/repos/laravel/prompts/zipball/2219fa9c4b944add1e825c3bdb8ecae8bc503bc6", + "reference": "2219fa9c4b944add1e825c3bdb8ecae8bc503bc6", "shasum": "" }, "require": { @@ -2250,7 +2804,7 @@ "require-dev": { "mockery/mockery": "^1.5", "pestphp/pest": "^2.3", - "phpstan/phpstan": "^1.10", + "phpstan/phpstan": "^1.11", "phpstan/phpstan-mockery": "^1.1" }, "suggest": { @@ -2276,22 +2830,22 @@ ], "support": { "issues": "https://github.com/laravel/prompts/issues", - "source": "https://github.com/laravel/prompts/tree/v0.1.13" + "source": "https://github.com/laravel/prompts/tree/v0.1.14" }, - "time": "2023-10-27T13:53:59+00:00" + "time": "2023-12-27T04:18:09+00:00" }, { "name": "laravel/sanctum", - "version": "v3.3.2", + "version": "v3.3.3", "source": { "type": "git", "url": "https://github.com/laravel/sanctum.git", - "reference": "e1a272893bec13cf135627f7e156030b3afe1e60" + "reference": "8c104366459739f3ada0e994bcd3e6fd681ce3d5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/sanctum/zipball/e1a272893bec13cf135627f7e156030b3afe1e60", - "reference": "e1a272893bec13cf135627f7e156030b3afe1e60", + "url": "https://api.github.com/repos/laravel/sanctum/zipball/8c104366459739f3ada0e994bcd3e6fd681ce3d5", + "reference": "8c104366459739f3ada0e994bcd3e6fd681ce3d5", "shasum": "" }, "require": { @@ -2344,7 +2898,7 @@ "issues": "https://github.com/laravel/sanctum/issues", "source": "https://github.com/laravel/sanctum" }, - "time": "2023-11-03T13:42:14+00:00" + "time": "2023-12-19T18:44:48+00:00" }, { "name": "laravel/serializable-closure", @@ -2477,16 +3031,16 @@ }, { "name": "laravel/ui", - "version": "v4.2.3", + "version": "v4.3.0", "source": { "type": "git", "url": "https://github.com/laravel/ui.git", - "reference": "eb532ea096ca1c0298c87c19233daf011fda743a" + "reference": "d166e09cdcb2e23836f694774cba77a32edb6007" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/ui/zipball/eb532ea096ca1c0298c87c19233daf011fda743a", - "reference": "eb532ea096ca1c0298c87c19233daf011fda743a", + "url": "https://api.github.com/repos/laravel/ui/zipball/d166e09cdcb2e23836f694774cba77a32edb6007", + "reference": "d166e09cdcb2e23836f694774cba77a32edb6007", "shasum": "" }, "require": { @@ -2533,9 +3087,9 @@ "ui" ], "support": { - "source": "https://github.com/laravel/ui/tree/v4.2.3" + "source": "https://github.com/laravel/ui/tree/v4.3.0" }, - "time": "2023-11-23T14:44:22+00:00" + "time": "2023-12-19T14:46:09+00:00" }, { "name": "lcobucci/jwt", @@ -3132,16 +3686,16 @@ }, { "name": "livewire/livewire", - "version": "v3.2.6", + "version": "v3.3.3", "source": { "type": "git", "url": "https://github.com/livewire/livewire.git", - "reference": "ecded08cdc4b36bbb4b26bcc7f7a171ea2e4368c" + "reference": "6dd3bec8c711cd792742be4620057637e261e6f7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/livewire/livewire/zipball/ecded08cdc4b36bbb4b26bcc7f7a171ea2e4368c", - "reference": "ecded08cdc4b36bbb4b26bcc7f7a171ea2e4368c", + "url": "https://api.github.com/repos/livewire/livewire/zipball/6dd3bec8c711cd792742be4620057637e261e6f7", + "reference": "6dd3bec8c711cd792742be4620057637e261e6f7", "shasum": "" }, "require": { @@ -3194,7 +3748,7 @@ "description": "A front-end framework for Laravel.", "support": { "issues": "https://github.com/livewire/livewire/issues", - "source": "https://github.com/livewire/livewire/tree/v3.2.6" + "source": "https://github.com/livewire/livewire/tree/v3.3.3" }, "funding": [ { @@ -3202,7 +3756,7 @@ "type": "github" } ], - "time": "2023-12-04T21:20:19+00:00" + "time": "2023-12-20T05:34:05+00:00" }, { "name": "lorisleiva/laravel-actions", @@ -3591,16 +4145,16 @@ }, { "name": "nesbot/carbon", - "version": "2.72.0", + "version": "2.72.1", "source": { "type": "git", "url": "https://github.com/briannesbitt/Carbon.git", - "reference": "a6885fcbad2ec4360b0e200ee0da7d9b7c90786b" + "reference": "2b3b3db0a2d0556a177392ff1a3bf5608fa09f78" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/a6885fcbad2ec4360b0e200ee0da7d9b7c90786b", - "reference": "a6885fcbad2ec4360b0e200ee0da7d9b7c90786b", + "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/2b3b3db0a2d0556a177392ff1a3bf5608fa09f78", + "reference": "2b3b3db0a2d0556a177392ff1a3bf5608fa09f78", "shasum": "" }, "require": { @@ -3694,7 +4248,7 @@ "type": "tidelift" } ], - "time": "2023-11-28T10:13:25+00:00" + "time": "2023-12-08T23:47:49+00:00" }, { "name": "nette/schema", @@ -3846,16 +4400,16 @@ }, { "name": "nikic/php-parser", - "version": "v4.17.1", + "version": "v4.18.0", "source": { "type": "git", "url": "https://github.com/nikic/PHP-Parser.git", - "reference": "a6303e50c90c355c7eeee2c4a8b27fe8dc8fef1d" + "reference": "1bcbb2179f97633e98bbbc87044ee2611c7d7999" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/a6303e50c90c355c7eeee2c4a8b27fe8dc8fef1d", - "reference": "a6303e50c90c355c7eeee2c4a8b27fe8dc8fef1d", + "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/1bcbb2179f97633e98bbbc87044ee2611c7d7999", + "reference": "1bcbb2179f97633e98bbbc87044ee2611c7d7999", "shasum": "" }, "require": { @@ -3896,9 +4450,9 @@ ], "support": { "issues": "https://github.com/nikic/PHP-Parser/issues", - "source": "https://github.com/nikic/PHP-Parser/tree/v4.17.1" + "source": "https://github.com/nikic/PHP-Parser/tree/v4.18.0" }, - "time": "2023-08-13T19:53:39+00:00" + "time": "2023-12-10T21:03:43+00:00" }, { "name": "nubs/random-name-generator", @@ -4998,16 +5552,16 @@ }, { "name": "phpstan/phpdoc-parser", - "version": "1.24.4", + "version": "1.24.5", "source": { "type": "git", "url": "https://github.com/phpstan/phpdoc-parser.git", - "reference": "6bd0c26f3786cd9b7c359675cb789e35a8e07496" + "reference": "fedf211ff14ec8381c9bf5714e33a7a552dd1acc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/6bd0c26f3786cd9b7c359675cb789e35a8e07496", - "reference": "6bd0c26f3786cd9b7c359675cb789e35a8e07496", + "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/fedf211ff14ec8381c9bf5714e33a7a552dd1acc", + "reference": "fedf211ff14ec8381c9bf5714e33a7a552dd1acc", "shasum": "" }, "require": { @@ -5039,9 +5593,9 @@ "description": "PHPDoc parser with support for nullable, intersection and generic types", "support": { "issues": "https://github.com/phpstan/phpdoc-parser/issues", - "source": "https://github.com/phpstan/phpdoc-parser/tree/1.24.4" + "source": "https://github.com/phpstan/phpdoc-parser/tree/1.24.5" }, - "time": "2023-11-26T18:29:22+00:00" + "time": "2023-12-16T09:33:33+00:00" }, { "name": "pimple/pimple", @@ -5735,16 +6289,16 @@ }, { "name": "pusher/pusher-php-server", - "version": "7.2.3", + "version": "7.2.4", "source": { "type": "git", "url": "https://github.com/pusher/pusher-http-php.git", - "reference": "416e68dd5f640175ad5982131c42a7a666d1d8e9" + "reference": "de2f72296808f9cafa6a4462b15a768ff130cddb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/pusher/pusher-http-php/zipball/416e68dd5f640175ad5982131c42a7a666d1d8e9", - "reference": "416e68dd5f640175ad5982131c42a7a666d1d8e9", + "url": "https://api.github.com/repos/pusher/pusher-http-php/zipball/de2f72296808f9cafa6a4462b15a768ff130cddb", + "reference": "de2f72296808f9cafa6a4462b15a768ff130cddb", "shasum": "" }, "require": { @@ -5790,9 +6344,9 @@ ], "support": { "issues": "https://github.com/pusher/pusher-http-php/issues", - "source": "https://github.com/pusher/pusher-http-php/tree/7.2.3" + "source": "https://github.com/pusher/pusher-http-php/tree/7.2.4" }, - "time": "2023-05-17T16:00:06+00:00" + "time": "2023-12-15T10:58:53+00:00" }, { "name": "ralouphie/getallheaders", @@ -6024,12 +6578,12 @@ "version": "v0.5.0", "source": { "type": "git", - "url": "https://github.com/resendlabs/resend-laravel.git", + "url": "https://github.com/resend/resend-laravel.git", "reference": "e598d1e25e49a7aa4c35f653d1d828f69ee4fc1d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/resendlabs/resend-laravel/zipball/e598d1e25e49a7aa4c35f653d1d828f69ee4fc1d", + "url": "https://api.github.com/repos/resend/resend-laravel/zipball/e598d1e25e49a7aa4c35f653d1d828f69ee4fc1d", "reference": "e598d1e25e49a7aa4c35f653d1d828f69ee4fc1d", "shasum": "" }, @@ -6082,8 +6636,8 @@ "sdk" ], "support": { - "issues": "https://github.com/resendlabs/resend-laravel/issues", - "source": "https://github.com/resendlabs/resend-laravel/tree/v0.5.0" + "issues": "https://github.com/resend/resend-laravel/issues", + "source": "https://github.com/resend/resend-laravel/tree/v0.5.0" }, "time": "2023-07-15T17:56:14+00:00" }, @@ -6092,12 +6646,12 @@ "version": "v0.7.2", "source": { "type": "git", - "url": "https://github.com/resendlabs/resend-php.git", + "url": "https://github.com/resend/resend-php.git", "reference": "bef429c2cd43ae1a1d990059c73750d46f249872" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/resendlabs/resend-php/zipball/bef429c2cd43ae1a1d990059c73750d46f249872", + "url": "https://api.github.com/repos/resend/resend-php/zipball/bef429c2cd43ae1a1d990059c73750d46f249872", "reference": "bef429c2cd43ae1a1d990059c73750d46f249872", "shasum": "" }, @@ -6139,8 +6693,8 @@ "sdk" ], "support": { - "issues": "https://github.com/resendlabs/resend-php/issues", - "source": "https://github.com/resendlabs/resend-php/tree/v0.7.2" + "issues": "https://github.com/resend/resend-php/issues", + "source": "https://github.com/resend/resend-php/tree/v0.7.2" }, "time": "2023-09-08T23:47:23+00:00" }, @@ -6548,28 +7102,30 @@ }, { "name": "spatie/laravel-data", - "version": "3.10.1", + "version": "3.11.0", "source": { "type": "git", "url": "https://github.com/spatie/laravel-data.git", - "reference": "23dd20812d3ba829233081679b5bf0f97645d300" + "reference": "e9cb66136974b6a6e290d6d2e2d484bac1727537" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spatie/laravel-data/zipball/23dd20812d3ba829233081679b5bf0f97645d300", - "reference": "23dd20812d3ba829233081679b5bf0f97645d300", + "url": "https://api.github.com/repos/spatie/laravel-data/zipball/e9cb66136974b6a6e290d6d2e2d484bac1727537", + "reference": "e9cb66136974b6a6e290d6d2e2d484bac1727537", "shasum": "" }, "require": { "illuminate/contracts": "^9.30|^10.0", "php": "^8.1", "phpdocumentor/type-resolver": "^1.5", - "spatie/laravel-package-tools": "^1.9.0" + "spatie/laravel-package-tools": "^1.9.0", + "spatie/php-structure-discoverer": "^2.0" }, "require-dev": { "fakerphp/faker": "^1.14", "friendsofphp/php-cs-fixer": "^3.0", "inertiajs/inertia-laravel": "^0.6.3", + "mockery/mockery": "^1.6", "nesbot/carbon": "^2.63", "nette/php-generator": "^3.5", "nunomaduro/larastan": "^2.0", @@ -6619,7 +7175,7 @@ ], "support": { "issues": "https://github.com/spatie/laravel-data/issues", - "source": "https://github.com/spatie/laravel-data/tree/3.10.1" + "source": "https://github.com/spatie/laravel-data/tree/3.11.0" }, "funding": [ { @@ -6627,7 +7183,7 @@ "type": "github" } ], - "time": "2023-12-04T14:59:58+00:00" + "time": "2023-12-21T12:31:34+00:00" }, { "name": "spatie/laravel-package-tools", @@ -6900,6 +7456,87 @@ }, "time": "2021-03-26T22:39:02+00:00" }, + { + "name": "spatie/php-structure-discoverer", + "version": "2.0.0", + "source": { + "type": "git", + "url": "https://github.com/spatie/php-structure-discoverer.git", + "reference": "3e532f0952d37bb10cddd544800eb659499cda3d" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/spatie/php-structure-discoverer/zipball/3e532f0952d37bb10cddd544800eb659499cda3d", + "reference": "3e532f0952d37bb10cddd544800eb659499cda3d", + "shasum": "" + }, + "require": { + "amphp/amp": "^2.6.2", + "amphp/parallel": "^1.4.1", + "amphp/parallel-functions": "^1.1", + "illuminate/collections": "^9.30|^10.0", + "php": "^8.1", + "spatie/laravel-package-tools": "^1.4.3", + "symfony/finder": "^6.0|^7.0" + }, + "require-dev": { + "illuminate/console": "^9.30|^10.0", + "laravel/pint": "^1.0", + "nunomaduro/collision": "^6.0", + "nunomaduro/larastan": "^2.0.1", + "orchestra/testbench": "^7.0|^8.0", + "pestphp/pest": "^1.21", + "pestphp/pest-plugin-laravel": "^1.1", + "phpstan/extension-installer": "^1.1", + "phpstan/phpstan-deprecation-rules": "^1.0", + "phpstan/phpstan-phpunit": "^1.0", + "phpunit/phpunit": "^9.5", + "spatie/laravel-ray": "^1.26" + }, + "type": "library", + "extra": { + "laravel": { + "providers": [ + "Spatie\\StructureDiscoverer\\StructureDiscovererServiceProvider" + ] + } + }, + "autoload": { + "psr-4": { + "Spatie\\StructureDiscoverer\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Ruben Van Assche", + "email": "ruben@spatie.be", + "role": "Developer" + } + ], + "description": "Automatically discover structures within your PHP application", + "homepage": "https://github.com/spatie/php-structure-discoverer", + "keywords": [ + "discover", + "laravel", + "php", + "php-structure-discoverer" + ], + "support": { + "issues": "https://github.com/spatie/php-structure-discoverer/issues", + "source": "https://github.com/spatie/php-structure-discoverer/tree/2.0.0" + }, + "funding": [ + { + "url": "https://github.com/LaravelAutoDiscoverer", + "type": "github" + } + ], + "time": "2023-12-21T12:04:07+00:00" + }, { "name": "spatie/ray", "version": "1.40.1", @@ -7193,20 +7830,20 @@ }, { "name": "symfony/css-selector", - "version": "v6.4.0", + "version": "v7.0.0", "source": { "type": "git", "url": "https://github.com/symfony/css-selector.git", - "reference": "d036c6c0d0b09e24a14a35f8292146a658f986e4" + "reference": "bb51d46e53ef8d50d523f0c5faedba056a27943e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/css-selector/zipball/d036c6c0d0b09e24a14a35f8292146a658f986e4", - "reference": "d036c6c0d0b09e24a14a35f8292146a658f986e4", + "url": "https://api.github.com/repos/symfony/css-selector/zipball/bb51d46e53ef8d50d523f0c5faedba056a27943e", + "reference": "bb51d46e53ef8d50d523f0c5faedba056a27943e", "shasum": "" }, "require": { - "php": ">=8.1" + "php": ">=8.2" }, "type": "library", "autoload": { @@ -7238,7 +7875,7 @@ "description": "Converts CSS selectors to XPath expressions", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/css-selector/tree/v6.4.0" + "source": "https://github.com/symfony/css-selector/tree/v7.0.0" }, "funding": [ { @@ -7254,7 +7891,7 @@ "type": "tidelift" } ], - "time": "2023-10-31T08:40:20+00:00" + "time": "2023-10-31T17:59:56+00:00" }, { "name": "symfony/deprecation-contracts", @@ -9900,23 +10537,23 @@ }, { "name": "tijsverkoyen/css-to-inline-styles", - "version": "2.2.6", + "version": "v2.2.7", "source": { "type": "git", "url": "https://github.com/tijsverkoyen/CssToInlineStyles.git", - "reference": "c42125b83a4fa63b187fdf29f9c93cb7733da30c" + "reference": "83ee6f38df0a63106a9e4536e3060458b74ccedb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/tijsverkoyen/CssToInlineStyles/zipball/c42125b83a4fa63b187fdf29f9c93cb7733da30c", - "reference": "c42125b83a4fa63b187fdf29f9c93cb7733da30c", + "url": "https://api.github.com/repos/tijsverkoyen/CssToInlineStyles/zipball/83ee6f38df0a63106a9e4536e3060458b74ccedb", + "reference": "83ee6f38df0a63106a9e4536e3060458b74ccedb", "shasum": "" }, "require": { "ext-dom": "*", "ext-libxml": "*", "php": "^5.5 || ^7.0 || ^8.0", - "symfony/css-selector": "^2.7 || ^3.0 || ^4.0 || ^5.0 || ^6.0" + "symfony/css-selector": "^2.7 || ^3.0 || ^4.0 || ^5.0 || ^6.0 || ^7.0" }, "require-dev": { "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.0 || ^7.5 || ^8.5.21 || ^9.5.10" @@ -9947,9 +10584,9 @@ "homepage": "https://github.com/tijsverkoyen/CssToInlineStyles", "support": { "issues": "https://github.com/tijsverkoyen/CssToInlineStyles/issues", - "source": "https://github.com/tijsverkoyen/CssToInlineStyles/tree/2.2.6" + "source": "https://github.com/tijsverkoyen/CssToInlineStyles/tree/v2.2.7" }, - "time": "2023-01-03T09:29:04+00:00" + "time": "2023-12-08T13:03:43+00:00" }, { "name": "visus/cuid2", @@ -10228,20 +10865,20 @@ }, { "name": "wire-elements/modal", - "version": "2.0.8", + "version": "2.0.9", "source": { "type": "git", "url": "https://github.com/wire-elements/modal.git", - "reference": "d6dac3a6ef6527a734504d8a84de49ec0a72282b" + "reference": "899b05e313403669aa8a359db71a066246184355" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/wire-elements/modal/zipball/d6dac3a6ef6527a734504d8a84de49ec0a72282b", - "reference": "d6dac3a6ef6527a734504d8a84de49ec0a72282b", + "url": "https://api.github.com/repos/wire-elements/modal/zipball/899b05e313403669aa8a359db71a066246184355", + "reference": "899b05e313403669aa8a359db71a066246184355", "shasum": "" }, "require": { - "livewire/livewire": "^3.0", + "livewire/livewire": "^3.2.3", "php": "^8.1", "spatie/laravel-package-tools": "^1.9" }, @@ -10280,9 +10917,9 @@ ], "support": { "issues": "https://github.com/wire-elements/modal/issues", - "source": "https://github.com/wire-elements/modal/tree/2.0.8" + "source": "https://github.com/wire-elements/modal/tree/2.0.9" }, - "time": "2023-11-12T14:57:13+00:00" + "time": "2023-12-08T09:31:14+00:00" }, { "name": "yosymfony/parser-utils", @@ -11093,16 +11730,16 @@ }, { "name": "mockery/mockery", - "version": "1.6.6", + "version": "1.6.7", "source": { "type": "git", "url": "https://github.com/mockery/mockery.git", - "reference": "b8e0bb7d8c604046539c1115994632c74dcb361e" + "reference": "0cc058854b3195ba21dc6b1f7b1f60f4ef3a9c06" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/mockery/mockery/zipball/b8e0bb7d8c604046539c1115994632c74dcb361e", - "reference": "b8e0bb7d8c604046539c1115994632c74dcb361e", + "url": "https://api.github.com/repos/mockery/mockery/zipball/0cc058854b3195ba21dc6b1f7b1f60f4ef3a9c06", + "reference": "0cc058854b3195ba21dc6b1f7b1f60f4ef3a9c06", "shasum": "" }, "require": { @@ -11115,9 +11752,7 @@ }, "require-dev": { "phpunit/phpunit": "^8.5 || ^9.6.10", - "psalm/plugin-phpunit": "^0.18.4", - "symplify/easy-coding-standard": "^11.5.0", - "vimeo/psalm": "^4.30" + "symplify/easy-coding-standard": "^12.0.8" }, "type": "library", "autoload": { @@ -11174,7 +11809,7 @@ "security": "https://github.com/mockery/mockery/security/advisories", "source": "https://github.com/mockery/mockery" }, - "time": "2023-08-09T00:03:52+00:00" + "time": "2023-12-10T02:24:34+00:00" }, { "name": "myclabs/deep-copy", @@ -11333,36 +11968,36 @@ }, { "name": "pestphp/pest", - "version": "v2.28.0", + "version": "v2.29.0", "source": { "type": "git", "url": "https://github.com/pestphp/pest.git", - "reference": "9a8f6e64149592b2555a2519237abb39e9e4f1fe" + "reference": "7799500d061b9d5b5e1fc8e478b60128b9284467" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/pestphp/pest/zipball/9a8f6e64149592b2555a2519237abb39e9e4f1fe", - "reference": "9a8f6e64149592b2555a2519237abb39e9e4f1fe", + "url": "https://api.github.com/repos/pestphp/pest/zipball/7799500d061b9d5b5e1fc8e478b60128b9284467", + "reference": "7799500d061b9d5b5e1fc8e478b60128b9284467", "shasum": "" }, "require": { "brianium/paratest": "^7.3.1", - "nunomaduro/collision": "^7.10.0|^8.0.0", + "nunomaduro/collision": "^7.10.0|^8.0.1", "nunomaduro/termwind": "^1.15.1|^2.0.0", "pestphp/pest-plugin": "^2.1.1", "pestphp/pest-plugin-arch": "^2.5.0", "php": "^8.1.0", - "phpunit/phpunit": "^10.5.2" + "phpunit/phpunit": "^10.5.3" }, "conflict": { - "phpunit/phpunit": ">10.5.2", + "phpunit/phpunit": ">10.5.3", "sebastian/exporter": "<5.1.0", "webmozart/assert": "<1.11.0" }, "require-dev": { "pestphp/pest-dev-tools": "^2.16.0", - "pestphp/pest-plugin-type-coverage": "^2.5.0", - "symfony/process": "^6.4.0|^7.0.1" + "pestphp/pest-plugin-type-coverage": "^2.6.0", + "symfony/process": "^6.4.0|^7.0.0" }, "bin": [ "bin/pest" @@ -11425,7 +12060,7 @@ ], "support": { "issues": "https://github.com/pestphp/pest/issues", - "source": "https://github.com/pestphp/pest/tree/v2.28.0" + "source": "https://github.com/pestphp/pest/tree/v2.29.0" }, "funding": [ { @@ -11437,7 +12072,7 @@ "type": "github" } ], - "time": "2023-12-05T19:06:22+00:00" + "time": "2023-12-27T11:12:01+00:00" }, { "name": "pestphp/pest-plugin", @@ -11816,16 +12451,16 @@ }, { "name": "phpstan/phpstan", - "version": "1.10.47", + "version": "1.10.50", "source": { "type": "git", "url": "https://github.com/phpstan/phpstan.git", - "reference": "84dbb33b520ea28b6cf5676a3941f4bae1c1ff39" + "reference": "06a98513ac72c03e8366b5a0cb00750b487032e4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpstan/zipball/84dbb33b520ea28b6cf5676a3941f4bae1c1ff39", - "reference": "84dbb33b520ea28b6cf5676a3941f4bae1c1ff39", + "url": "https://api.github.com/repos/phpstan/phpstan/zipball/06a98513ac72c03e8366b5a0cb00750b487032e4", + "reference": "06a98513ac72c03e8366b5a0cb00750b487032e4", "shasum": "" }, "require": { @@ -11874,27 +12509,27 @@ "type": "tidelift" } ], - "time": "2023-12-01T15:19:17+00:00" + "time": "2023-12-13T10:59:42+00:00" }, { "name": "phpunit/php-code-coverage", - "version": "10.1.9", + "version": "10.1.11", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-code-coverage.git", - "reference": "a56a9ab2f680246adcf3db43f38ddf1765774735" + "reference": "78c3b7625965c2513ee96569a4dbb62601784145" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/a56a9ab2f680246adcf3db43f38ddf1765774735", - "reference": "a56a9ab2f680246adcf3db43f38ddf1765774735", + "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/78c3b7625965c2513ee96569a4dbb62601784145", + "reference": "78c3b7625965c2513ee96569a4dbb62601784145", "shasum": "" }, "require": { "ext-dom": "*", "ext-libxml": "*", "ext-xmlwriter": "*", - "nikic/php-parser": "^4.15", + "nikic/php-parser": "^4.18 || ^5.0", "php": ">=8.1", "phpunit/php-file-iterator": "^4.0", "phpunit/php-text-template": "^3.0", @@ -11944,7 +12579,7 @@ "support": { "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues", "security": "https://github.com/sebastianbergmann/php-code-coverage/security/policy", - "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/10.1.9" + "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/10.1.11" }, "funding": [ { @@ -11952,7 +12587,7 @@ "type": "github" } ], - "time": "2023-11-23T12:23:20+00:00" + "time": "2023-12-21T15:38:30+00:00" }, { "name": "phpunit/php-file-iterator", @@ -12199,16 +12834,16 @@ }, { "name": "phpunit/phpunit", - "version": "10.5.2", + "version": "10.5.3", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "5aedff46afba98dddecaa12349ec044d9103d4fe" + "reference": "6fce887c71076a73f32fd3e0774a6833fc5c7f19" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/5aedff46afba98dddecaa12349ec044d9103d4fe", - "reference": "5aedff46afba98dddecaa12349ec044d9103d4fe", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/6fce887c71076a73f32fd3e0774a6833fc5c7f19", + "reference": "6fce887c71076a73f32fd3e0774a6833fc5c7f19", "shasum": "" }, "require": { @@ -12280,7 +12915,7 @@ "support": { "issues": "https://github.com/sebastianbergmann/phpunit/issues", "security": "https://github.com/sebastianbergmann/phpunit/security/policy", - "source": "https://github.com/sebastianbergmann/phpunit/tree/10.5.2" + "source": "https://github.com/sebastianbergmann/phpunit/tree/10.5.3" }, "funding": [ { @@ -12296,7 +12931,7 @@ "type": "tidelift" } ], - "time": "2023-12-05T14:54:33+00:00" + "time": "2023-12-13T07:25:23+00:00" }, { "name": "sebastian/cli-parser", @@ -12544,20 +13179,20 @@ }, { "name": "sebastian/complexity", - "version": "3.1.0", + "version": "3.2.0", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/complexity.git", - "reference": "68cfb347a44871f01e33ab0ef8215966432f6957" + "reference": "68ff824baeae169ec9f2137158ee529584553799" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/complexity/zipball/68cfb347a44871f01e33ab0ef8215966432f6957", - "reference": "68cfb347a44871f01e33ab0ef8215966432f6957", + "url": "https://api.github.com/repos/sebastianbergmann/complexity/zipball/68ff824baeae169ec9f2137158ee529584553799", + "reference": "68ff824baeae169ec9f2137158ee529584553799", "shasum": "" }, "require": { - "nikic/php-parser": "^4.10", + "nikic/php-parser": "^4.18 || ^5.0", "php": ">=8.1" }, "require-dev": { @@ -12566,7 +13201,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "3.1-dev" + "dev-main": "3.2-dev" } }, "autoload": { @@ -12590,7 +13225,7 @@ "support": { "issues": "https://github.com/sebastianbergmann/complexity/issues", "security": "https://github.com/sebastianbergmann/complexity/security/policy", - "source": "https://github.com/sebastianbergmann/complexity/tree/3.1.0" + "source": "https://github.com/sebastianbergmann/complexity/tree/3.2.0" }, "funding": [ { @@ -12598,20 +13233,20 @@ "type": "github" } ], - "time": "2023-09-28T11:50:59+00:00" + "time": "2023-12-21T08:37:17+00:00" }, { "name": "sebastian/diff", - "version": "5.0.3", + "version": "5.1.0", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/diff.git", - "reference": "912dc2fbe3e3c1e7873313cc801b100b6c68c87b" + "reference": "fbf413a49e54f6b9b17e12d900ac7f6101591b7f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/912dc2fbe3e3c1e7873313cc801b100b6c68c87b", - "reference": "912dc2fbe3e3c1e7873313cc801b100b6c68c87b", + "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/fbf413a49e54f6b9b17e12d900ac7f6101591b7f", + "reference": "fbf413a49e54f6b9b17e12d900ac7f6101591b7f", "shasum": "" }, "require": { @@ -12624,7 +13259,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "5.0-dev" + "dev-main": "5.1-dev" } }, "autoload": { @@ -12657,7 +13292,7 @@ "support": { "issues": "https://github.com/sebastianbergmann/diff/issues", "security": "https://github.com/sebastianbergmann/diff/security/policy", - "source": "https://github.com/sebastianbergmann/diff/tree/5.0.3" + "source": "https://github.com/sebastianbergmann/diff/tree/5.1.0" }, "funding": [ { @@ -12665,7 +13300,7 @@ "type": "github" } ], - "time": "2023-05-01T07:48:21+00:00" + "time": "2023-12-22T10:55:06+00:00" }, { "name": "sebastian/environment", @@ -12873,20 +13508,20 @@ }, { "name": "sebastian/lines-of-code", - "version": "2.0.1", + "version": "2.0.2", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/lines-of-code.git", - "reference": "649e40d279e243d985aa8fb6e74dd5bb28dc185d" + "reference": "856e7f6a75a84e339195d48c556f23be2ebf75d0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/lines-of-code/zipball/649e40d279e243d985aa8fb6e74dd5bb28dc185d", - "reference": "649e40d279e243d985aa8fb6e74dd5bb28dc185d", + "url": "https://api.github.com/repos/sebastianbergmann/lines-of-code/zipball/856e7f6a75a84e339195d48c556f23be2ebf75d0", + "reference": "856e7f6a75a84e339195d48c556f23be2ebf75d0", "shasum": "" }, "require": { - "nikic/php-parser": "^4.10", + "nikic/php-parser": "^4.18 || ^5.0", "php": ">=8.1" }, "require-dev": { @@ -12919,7 +13554,7 @@ "support": { "issues": "https://github.com/sebastianbergmann/lines-of-code/issues", "security": "https://github.com/sebastianbergmann/lines-of-code/security/policy", - "source": "https://github.com/sebastianbergmann/lines-of-code/tree/2.0.1" + "source": "https://github.com/sebastianbergmann/lines-of-code/tree/2.0.2" }, "funding": [ { @@ -12927,7 +13562,7 @@ "type": "github" } ], - "time": "2023-08-31T09:25:50+00:00" + "time": "2023-12-21T08:38:20+00:00" }, { "name": "sebastian/object-enumerator", @@ -13413,16 +14048,16 @@ }, { "name": "spatie/laravel-ignition", - "version": "2.3.1", + "version": "2.3.3", "source": { "type": "git", "url": "https://github.com/spatie/laravel-ignition.git", - "reference": "bf21cd15aa47fa4ec5d73bbc932005c70261efc8" + "reference": "66499cd3c858642ded56dafb8fa0352057ca20dd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spatie/laravel-ignition/zipball/bf21cd15aa47fa4ec5d73bbc932005c70261efc8", - "reference": "bf21cd15aa47fa4ec5d73bbc932005c70261efc8", + "url": "https://api.github.com/repos/spatie/laravel-ignition/zipball/66499cd3c858642ded56dafb8fa0352057ca20dd", + "reference": "66499cd3c858642ded56dafb8fa0352057ca20dd", "shasum": "" }, "require": { @@ -13501,7 +14136,7 @@ "type": "github" } ], - "time": "2023-10-09T12:55:26+00:00" + "time": "2023-12-21T09:43:05+00:00" }, { "name": "ta-tikoma/phpunit-architecture-test", diff --git a/resources/views/components/applications/navbar.blade.php b/resources/views/components/applications/navbar.blade.php index 0ba6b4a0d..1b87a6380 100644 --- a/resources/views/components/applications/navbar.blade.php +++ b/resources/views/components/applications/navbar.blade.php @@ -1,19 +1,19 @@
- @if(!$application->destination->server->isSwarm()) - @endif - - diff --git a/resources/views/components/databases/navbar.blade.php b/resources/views/components/databases/navbar.blade.php index bce3026c6..8774fa1df 100644 --- a/resources/views/components/databases/navbar.blade.php +++ b/resources/views/components/databases/navbar.blade.php @@ -1,13 +1,13 @@
- - - @@ -16,7 +16,7 @@ $database->getMorphClass() === 'App\Models\StandaloneMongodb' || $database->getMorphClass() === 'App\Models\StandaloneMysql' || $database->getMorphClass() === 'App\Models\StandaloneMariadb') - diff --git a/resources/views/components/navbar.blade.php b/resources/views/components/navbar.blade.php index db1a5d8b1..cad924e7b 100644 --- a/resources/views/components/navbar.blade.php +++ b/resources/views/components/navbar.blade.php @@ -4,7 +4,7 @@ class="transition rounded w-11 h-11" src="{{ asset('coolify-transparent.png') }}">
diff --git a/resources/views/components/security/navbar.blade.php b/resources/views/components/security/navbar.blade.php index 43eb252b2..e13a0e4ee 100644 --- a/resources/views/components/security/navbar.blade.php +++ b/resources/views/components/security/navbar.blade.php @@ -10,10 +10,10 @@
{{ data_get($server, 'name') }}