PHP 8.1 syntax with Rector

Author: PowerKiKi

.php-cs-fixer.dist.php

@@ -89,7 +89,7 @@
         'mb_str_functions' => true,
         'method_argument_space' => true,
         'method_chaining_indentation' => true,
-        'modernize_strpos' => false, // Require PHP 8.0
+        'modernize_strpos' => true,
         'modernize_types_casting' => true,
         'multiline_comment_opening_closing' => true,
         'multiline_whitespace_before_semicolons' => true,

src/Acl/Acl.php

@@ -63,7 +63,7 @@ public function reject(string $reason): bool
 
     private function getClass(Model $resource): string
     {
-        return ClassUtils::getRealClass(get_class($resource));
+        return ClassUtils::getRealClass($resource::class);
     }
 
     private function getCurrentRole(): string

src/Acl/Assertion/All.php

@@ -14,7 +14,7 @@ final class All implements AssertionInterface
     /**
      * @var AssertionInterface[]
      */
-    private array $asserts;
+    private readonly array $asserts;
 
     /**
      * Check if all asserts are true.

src/Acl/Assertion/One.php

@@ -14,7 +14,7 @@ final class One implements AssertionInterface
     /**
      * @var AssertionInterface[]
      */
-    private array $asserts;
+    private readonly array $asserts;
 
     /**
      * Check if at least one assert is true.

src/Acl/ModelResource.php

@@ -20,27 +20,23 @@
  */
 final class ModelResource extends GenericResource
 {
-    /**
-     * Unique id of the instance of resource.
-     */
-    private ?Model $instance;
-
     /**
      * Sets the Resource identifier.
      *
      * @param string $class must be a model class name
      * @param Model $instance the instance itself
      */
-    public function __construct(string $class, ?Model $instance = null)
-    {
+    public function __construct(
+        string $class,
+        private readonly ?Model $instance = null
+    ) {
         if (!is_subclass_of($class, Model::class)) {
             throw new InvalidArgumentException('The class name must be an implementation of Model but given: ' . $class);
         }
 
         $class = ClassUtils::getRealClass($class);
 
         parent::__construct($class);
-        $this->instance = $instance;
     }
 
     /**

src/Api/FilteredFieldResolver.php

@@ -14,7 +14,7 @@
  */
 final class FilteredFieldResolver
 {
-    private DefaultFieldResolver $resolver;
+    private readonly DefaultFieldResolver $resolver;
 
     public function __construct()
     {
@@ -51,7 +51,7 @@ private function load($object)
         if ($object instanceof Proxy) {
             try {
                 $object->__load();
-            } catch (EntityNotFoundException $exception) {
+            } catch (EntityNotFoundException) {
                 return null;
             }
         }

src/Api/Server.php

@@ -20,9 +20,9 @@
  */
 class Server
 {
-    private StandardServer $server;
+    private readonly StandardServer $server;
 
-    private ServerConfig $config;
+    private readonly ServerConfig $config;
 
     public function __construct(Schema $schema, bool $debug, array $rootValue = [])
     {
@@ -51,7 +51,7 @@ public function __construct(Schema $schema, bool $debug, array $rootValue = [])
     /**
      * @return ExecutionResult|ExecutionResult[]
      */
-    public function execute(ServerRequestInterface $request)
+    public function execute(ServerRequestInterface $request): array|ExecutionResult
     {
         if (!$request->getParsedBody()) {
             /** @var array $parsedBody */
@@ -77,7 +77,7 @@ public function execute(ServerRequestInterface $request)
      *
      * @param ExecutionResult|ExecutionResult[] $result
      */
-    public function sendHttp($result): void
+    public function sendHttp(array|ExecutionResult $result): void
     {
         $this->server->getHelper()->sendResponse($result);
     }

src/Handler/FileHandler.php

@@ -12,11 +12,8 @@
 
 final class FileHandler extends AbstractHandler
 {
-    private ObjectRepository $fileRepository;
-
-    public function __construct(ObjectRepository $fileRepository)
+    public function __construct(private readonly ObjectRepository $fileRepository)
     {
-        $this->fileRepository = $fileRepository;
     }
 
     /**

src/Handler/GraphQLHandler.php

@@ -12,11 +12,8 @@
 
 final class GraphQLHandler implements RequestHandlerInterface
 {
-    private Server $server;
-
-    public function __construct(Server $server)
+    public function __construct(private readonly Server $server)
     {
-        $this->server = $server;
     }
 
     /**

src/Handler/ImageHandler.php

@@ -13,14 +13,8 @@
 
 final class ImageHandler extends AbstractHandler
 {
-    private ObjectRepository $imageRepository;
-
-    private ImageResizer $imageResizer;
-
-    public function __construct(ObjectRepository $imageRepository, ImageResizer $imageService)
+    public function __construct(private readonly ObjectRepository $imageRepository, private readonly ImageResizer $imageResizer)
     {
-        $this->imageRepository = $imageRepository;
-        $this->imageResizer = $imageService;
     }
 
     /**
@@ -44,7 +38,7 @@ public function handle(ServerRequestInterface $request): ResponseInterface
         $maxHeight = (int) $request->getAttribute('maxHeight');
         if ($maxHeight) {
             $accept = $request->getHeaderLine('accept');
-            $useWebp = mb_strpos($accept, 'image/webp') !== false;
+            $useWebp = str_contains($accept, 'image/webp');
 
             $path = $this->imageResizer->resize($image, $maxHeight, $useWebp);
         }