From 572776c115da6a7e8330e9f312645ddbb70afdc5 Mon Sep 17 00:00:00 2001 From: Alexander Schranz Date: Thu, 6 Jun 2024 16:17:34 +0200 Subject: [PATCH] Fix some code style issues (#386) --- Controller/FormTokenController.php | 5 +++-- .../Controller/FormTokenControllerTest.php | 4 ++-- phpstan-baseline.neon | 15 --------------- 3 files changed, 5 insertions(+), 19 deletions(-) diff --git a/Controller/FormTokenController.php b/Controller/FormTokenController.php index 630279b8..b2ccc405 100644 --- a/Controller/FormTokenController.php +++ b/Controller/FormTokenController.php @@ -30,13 +30,14 @@ public function __construct(CsrfTokenManagerInterface $csrfTokenManager) public function tokenAction(Request $request): Response { $formName = $request->get('form'); + $formName = \is_string($formName) ? $formName : ''; $csrfToken = $this->csrfTokenManager->getToken($formName)->getValue(); $content = $csrfToken; if ($request->get('html')) { - $formName = htmlspecialchars($formName, ENT_QUOTES, 'UTF-8'); - $csrfToken = htmlspecialchars($csrfToken, ENT_QUOTES, 'UTF-8'); + $formName = \htmlspecialchars($formName, \ENT_QUOTES, 'UTF-8'); + $csrfToken = \htmlspecialchars($csrfToken, \ENT_QUOTES, 'UTF-8'); $content = \sprintf( '', diff --git a/Tests/Functional/Controller/FormTokenControllerTest.php b/Tests/Functional/Controller/FormTokenControllerTest.php index 50c004b2..437bbede 100644 --- a/Tests/Functional/Controller/FormTokenControllerTest.php +++ b/Tests/Functional/Controller/FormTokenControllerTest.php @@ -22,9 +22,9 @@ class FormTokenControllerTest extends SuluTestCase { /** - * @var FormTokenController + * @var FormTokenControllerTest */ - private formTokenController $formTokenController; + private $formTokenController; protected function setUp(): void { diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon index c70b7790..7ba44698 100644 --- a/phpstan-baseline.neon +++ b/phpstan-baseline.neon @@ -240,21 +240,6 @@ parameters: count: 1 path: Controller/FormController.php - - - message: "#^Parameter \\#1 \\$tokenId of method Symfony\\\\Component\\\\Security\\\\Csrf\\\\CsrfTokenManagerInterface\\:\\:getToken\\(\\) expects string, mixed given\\.$#" - count: 1 - path: Controller/FormTokenController.php - - - - message: "#^Parameter \\#2 \\.\\.\\.\\$values of function sprintf expects bool\\|float\\|int\\|string\\|null, mixed given\\.$#" - count: 1 - path: Controller/FormTokenController.php - - - - message: "#^Parameter \\#3 \\.\\.\\.\\$values of function sprintf expects bool\\|float\\|int\\|string\\|null, mixed given\\.$#" - count: 1 - path: Controller/FormTokenController.php - - message: "#^Cannot call method all\\(\\) on Symfony\\\\Component\\\\Form\\\\FormInterface\\|null\\.$#" count: 1