Updating CSRF code with PHP 8.1 features

src/Csrf/src/Config/CsrfConfig.php

@@ -1,13 +1,5 @@
 <?php
 
-/**
- * Spiral Framework.
- *
- * @license MIT
- * @author  Anton Titov (Wolfy-J)
- * @author  Valentin V (vvval)
- */
-
 declare(strict_types=1);
 
 namespace Spiral\Csrf\Config;

src/Csrf/src/Middleware/CsrfFirewall.php

@@ -1,12 +1,5 @@
 <?php
 
-/**
- * Spiral Framework.
- *
- * @license   MIT
- * @author    Anton Titov (Wolfy-J)
- */
-
 declare(strict_types=1);
 
 namespace Spiral\Csrf\Middleware;
@@ -38,21 +31,12 @@ final class CsrfFirewall implements MiddlewareInterface
      */
     public const ALLOW_METHODS = ['GET', 'HEAD', 'OPTIONS'];
 
-    /** @var ResponseFactoryInterface */
-    private $responseFactory;
-
-    /** @var array */
-    private $allowMethods;
-
-    public function __construct(ResponseFactoryInterface $responseFactory, array $allowMethods = self::ALLOW_METHODS)
-    {
-        $this->responseFactory = $responseFactory;
-        $this->allowMethods = $allowMethods;
+    public function __construct(
+        private readonly ResponseFactoryInterface $responseFactory,
+        private readonly array $allowMethods = self::ALLOW_METHODS
+    ) {
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function process(Request $request, RequestHandlerInterface $handler): Response
     {
         $token = $request->getAttribute(CsrfMiddleware::ATTRIBUTE);
@@ -61,7 +45,7 @@ public function process(Request $request, RequestHandlerInterface $handler): Res
             throw new \LogicException('Unable to apply CSRF firewall, attribute is missing');
         }
 
-        if ($this->isRequired($request) && !hash_equals($token, $this->fetchToken($request))) {
+        if ($this->isRequired($request) && !\hash_equals($token, $this->fetchToken($request))) {
             return $this->responseFactory->createResponse(412, 'Bad CSRF Token');
         }
 
@@ -73,7 +57,7 @@ public function process(Request $request, RequestHandlerInterface $handler): Res
      */
     protected function isRequired(Request $request): bool
     {
-        return !in_array($request->getMethod(), $this->allowMethods, true);
+        return !\in_array($request->getMethod(), $this->allowMethods, true);
     }
 
     /**
@@ -86,7 +70,7 @@ protected function fetchToken(Request $request): string
         }
 
         $data = $request->getParsedBody();
-        if (is_array($data) && isset($data[self::PARAMETER]) && is_string($data[self::PARAMETER])) {
+        if (\is_array($data) && isset($data[self::PARAMETER]) && \is_string($data[self::PARAMETER])) {
             return $data[self::PARAMETER];
         }
 

src/Csrf/src/Middleware/CsrfMiddleware.php

@@ -1,12 +1,5 @@
 <?php
 
-/**
- * Spiral Framework.
- *
- * @license   MIT
- * @author    Anton Titov (Wolfy-J)
- */
-
 declare(strict_types=1);
 
 namespace Spiral\Csrf\Middleware;
@@ -30,17 +23,11 @@ final class CsrfMiddleware implements MiddlewareInterface
 {
     public const ATTRIBUTE = 'csrfToken';
 
-    /** @var CsrfConfig */
-    protected $config;
-
-    public function __construct(CsrfConfig $config)
-    {
-        $this->config = $config;
+    public function __construct(
+        private readonly CsrfConfig $config
+    ) {
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function process(Request $request, RequestHandlerInterface $handler): Response
     {
         $cookie = null;
@@ -96,6 +83,6 @@ private function random(int $length = 32): string
             throw new \RuntimeException('Unable to generate random string', $e->getCode(), $e);
         }
 
-        return substr(base64_encode($string), 0, $length);
+        return \substr(\base64_encode($string), 0, $length);
     }
 }

src/Csrf/src/Middleware/StrictCsrfFirewall.php

@@ -1,12 +1,5 @@
 <?php
 
-/**
- * Spiral Framework.
- *
- * @license   MIT
- * @author    Anton Titov (Wolfy-J)
- */
-
 declare(strict_types=1);
 
 namespace Spiral\Csrf\Middleware;
@@ -22,8 +15,7 @@
  */
 final class StrictCsrfFirewall implements MiddlewareInterface
 {
-    /** @var CsrfFirewall */
-    private $csrfFirewall;
+    private readonly CsrfFirewall $csrfFirewall;
 
     public function __construct(ResponseFactoryInterface $responseFactory)
     {