Rector @ work

escopecz · Dec 13, 2023 · 69952ca · 69952ca
1 parent fb114d9
commit 69952ca
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 17 deletions.
diff --git a/app/bundles/CoreBundle/ProcessSignal/ProcessSignalService.php b/app/bundles/CoreBundle/ProcessSignal/ProcessSignalService.php
@@ -22,7 +22,7 @@ public function registerSignalHandler(callable $beforeCallback = null, array $si
             return;
         }
 
-        $handler = function (int $signal) use ($beforeCallback) {
+        $handler = function (int $signal) use ($beforeCallback): void {
             if ($beforeCallback) {
                 call_user_func($beforeCallback, $signal);
             }

diff --git a/app/bundles/SmsBundle/Controller/AjaxController.php b/app/bundles/SmsBundle/Controller/AjaxController.php
@@ -66,14 +66,10 @@ public function getSmsCountStatsAction(Request $request, BroadcastQuery $broadca
         return new JsonResponse($data);
     }
 
-    /**
-     * @return JsonResponse
-     */
     public function getBuilderTokensAction(Request $request, EventDispatcherInterface $eventDispatcher = null): JsonResponse
     {
         $query  = $request->get('query', '');
         $tokens = $this->getBuilderTokens($query);
-        /** @var EventDispatcherInterface $eventDispatcher */
         $event           = new TokensBuildEvent($tokens);
         $eventDispatcher->dispatch($event, SmsEvents::ON_SMS_TOKENS_BUILD);
 
@@ -97,9 +93,9 @@ protected function getBuilderTokens($query): array
         $tokens       = $components['tokens'];
 
         array_map(
-            function ($token, $value) use ($findTokens, &$returnTokens) {
+            function ($token, $value) use ($findTokens, &$returnTokens): void {
                 foreach ($findTokens as $findToken) {
-                    if (substr($token, 0, strlen($findToken)) === $findToken) {
+                    if (str_starts_with($token, $findToken)) {
                         $returnTokens[$token] = $value;
                     }
                 }

diff --git a/app/bundles/SmsBundle/Event/TokensBuildEvent.php b/app/bundles/SmsBundle/Event/TokensBuildEvent.php
@@ -6,17 +6,11 @@
 
 class TokensBuildEvent extends Event
 {
-    /**
-     * @var array<string,array<int|string>>
-     */
-    private array $tokens;
-
     /**
      * @param array<string,array<int|string>> $tokens
      */
-    public function __construct(array $tokens)
+    public function __construct(private array $tokens)
     {
-        $this->tokens = $tokens;
     }
 
     /**

diff --git a/app/bundles/UserBundle/Security/Authenticator/FormAuthenticator.php b/app/bundles/UserBundle/Security/Authenticator/FormAuthenticator.php
@@ -145,9 +145,7 @@ public function checkCredentials($credentials, UserInterface $user): bool
         $newUser->setUsername($user->getUserName());
         $newUser->setPassword($user->getPassword());
 
-        $authenticated = $this->hasher->isPasswordValid($newUser, $this->getPassword($credentials));
-
-        return $authenticated;
+        return $this->hasher->isPasswordValid($newUser, $this->getPassword($credentials));
     }
 
     public function getPassword($credentials): ?string