From b5258f840e8f443ef5e6865f98b142d185c44c49 Mon Sep 17 00:00:00 2001 From: Leonid Nikitin Date: Wed, 15 Jul 2026 22:35:55 +0500 Subject: [PATCH] Replace `$request->get()` with `$request->attributes->get()` throughout controllers and middleware for consistency and enhanced reliability. --- .../Site/DocumentationController.php | 22 +++++++++---------- .../Controllers/Site/FeedbackController.php | 8 +++---- .../Controllers/Site/ProjectsController.php | 4 ++-- .../Http/Middleware/DocumentationVersion.php | 2 +- .../app/Http/Middleware/IsProject.php | 2 +- .../Http/Middleware/IsWebsiteTranslations.php | 2 +- 6 files changed, 20 insertions(+), 20 deletions(-) diff --git a/app/application/app/Http/Controllers/Site/DocumentationController.php b/app/application/app/Http/Controllers/Site/DocumentationController.php index feb935e..00c16b8 100644 --- a/app/application/app/Http/Controllers/Site/DocumentationController.php +++ b/app/application/app/Http/Controllers/Site/DocumentationController.php @@ -16,8 +16,8 @@ final class DocumentationController extends Controller public function defaultVersion(Request $request): RedirectResponse | View { - $project = $request->get('project'); - $websiteTranslations = $request->get('websiteTranslations'); + $project = $request->attributes->get('project'); + $websiteTranslations = $request->attributes->get('websiteTranslations'); $result = $this->documentationService->defaultVersion($project, $request->user()); if ($result->isError()) { @@ -40,9 +40,9 @@ final class DocumentationController extends Controller public function index(Request $request): View { $documentation = new Documentation( - project: $request->get('project'), - version: $request->get('version'), - websiteTranslations: $request->get('websiteTranslations'), + project: $request->attributes->get('project'), + version: $request->attributes->get('version'), + websiteTranslations: $request->attributes->get('websiteTranslations'), user: $request->user(), ); $result = $this->documentationService->index($documentation); @@ -57,9 +57,9 @@ final class DocumentationController extends Controller public function category(string $slug, Request $request): View { $documentation = new Documentation( - project: $request->get('project'), - version: $request->get('version'), - websiteTranslations: $request->get('websiteTranslations'), + project: $request->attributes->get('project'), + version: $request->attributes->get('version'), + websiteTranslations: $request->attributes->get('websiteTranslations'), user: $request->user(), ); $result = $this->documentationService->category($slug, $documentation); @@ -77,9 +77,9 @@ final class DocumentationController extends Controller public function view(string $slug, Request $request): View { $documentation = new Documentation( - project: $request->get('project'), - version: $request->get('version'), - websiteTranslations: $request->get('websiteTranslations'), + project: $request->attributes->get('project'), + version: $request->attributes->get('version'), + websiteTranslations: $request->attributes->get('websiteTranslations'), user: $request->user(), ); $result = $this->documentationService->view($slug, $documentation); diff --git a/app/application/app/Http/Controllers/Site/FeedbackController.php b/app/application/app/Http/Controllers/Site/FeedbackController.php index dec9747..7344e73 100644 --- a/app/application/app/Http/Controllers/Site/FeedbackController.php +++ b/app/application/app/Http/Controllers/Site/FeedbackController.php @@ -17,16 +17,16 @@ final class FeedbackController extends Controller public function index(Request $request): View { return view('site.feedback.index', [ - 'project' => $request->get('project'), - 'websiteTranslations' => $request->get('websiteTranslations'), + 'project' => $request->attributes->get('project'), + 'websiteTranslations' => $request->attributes->get('websiteTranslations'), 'captcha' => config('app.captcha', false), ]); } public function send(SendRequest $request): RedirectResponse { - $project = $request->get('project'); - $websiteTranslations = $request->get('websiteTranslations'); + $project = $request->attributes->get('project'); + $websiteTranslations = $request->attributes->get('websiteTranslations'); $user = $request->user(); $data = $request->getDto(); diff --git a/app/application/app/Http/Controllers/Site/ProjectsController.php b/app/application/app/Http/Controllers/Site/ProjectsController.php index 8db8737..1209029 100644 --- a/app/application/app/Http/Controllers/Site/ProjectsController.php +++ b/app/application/app/Http/Controllers/Site/ProjectsController.php @@ -15,7 +15,7 @@ final class ProjectsController extends Controller public function index(Request $request): View { $user = $request->user(); - $project = $request->get('project'); + $project = $request->attributes->get('project'); if (\is_null($project)) { $with = ['storage']; @@ -27,7 +27,7 @@ final class ProjectsController extends Controller return \view('site.projects.index', $result->getData()); } - $websiteTranslations = $request->get('websiteTranslations'); + $websiteTranslations = $request->attributes->get('websiteTranslations'); $result = $this->projectService->getAboutByProject($project, $websiteTranslations, $user); if ($result->isError()) { $this->errors($result); diff --git a/app/application/app/Http/Middleware/DocumentationVersion.php b/app/application/app/Http/Middleware/DocumentationVersion.php index 8f951dc..2c37a2a 100644 --- a/app/application/app/Http/Middleware/DocumentationVersion.php +++ b/app/application/app/Http/Middleware/DocumentationVersion.php @@ -10,7 +10,7 @@ final readonly class DocumentationVersion { public function handle(Request $request, \Closure $next): Response { - $project = $request->get('project'); + $project = $request->attributes->get('project'); $versionSlug = $request->route()?->parameter('version'); if ($versionSlug === null || $project === null) { \abort(Response::HTTP_NOT_FOUND); diff --git a/app/application/app/Http/Middleware/IsProject.php b/app/application/app/Http/Middleware/IsProject.php index 8b6ca5b..f745296 100644 --- a/app/application/app/Http/Middleware/IsProject.php +++ b/app/application/app/Http/Middleware/IsProject.php @@ -10,7 +10,7 @@ final class IsProject { public function handle(Request $request, \Closure $next): Response { - $project = $request->get('project'); + $project = $request->attributes->get('project'); if (\is_null($project)) { \abort(Response::HTTP_NOT_FOUND); } diff --git a/app/application/app/Http/Middleware/IsWebsiteTranslations.php b/app/application/app/Http/Middleware/IsWebsiteTranslations.php index 261af69..0dac065 100644 --- a/app/application/app/Http/Middleware/IsWebsiteTranslations.php +++ b/app/application/app/Http/Middleware/IsWebsiteTranslations.php @@ -10,7 +10,7 @@ final class IsWebsiteTranslations { public function handle(Request $request, \Closure $next): Response { - $websiteTranslations = $request->get('websiteTranslations'); + $websiteTranslations = $request->attributes->get('websiteTranslations'); if (\is_null($websiteTranslations)) { \abort(Response::HTTP_NOT_FOUND); }