PHP 8.1 Language features

LICENSE

@@ -1,4 +1,4 @@
-Copyright 2022 (c) Jeroen van den Enden
+Copyright 2023 (c) Jeroen van den Enden
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

src/CacheAsset.php

@@ -10,13 +10,13 @@
 final class CacheAsset extends AbstractAsset
 {
     public function __construct(
-        private AssetInterface $asset,
-        private CacheItemPoolInterface $cache,
-        private string $key,
+        private readonly AssetInterface $asset,
+        private readonly CacheItemPoolInterface $cache,
+        private readonly string $key,
         /** @var array<string> */
-        private array $tags = [],
-        private int $expiresAfter = 0,
-        private bool $clear = false
+        private readonly array $tags = [],
+        private readonly int $expiresAfter = 0,
+        private readonly bool $clear = false
     ) {
     }
 

src/CallbackAsset.php

@@ -6,12 +6,10 @@
 
 final class CallbackAsset extends AbstractAsset
 {
-    /** @var callable */
-    private $callable;
-
-    public function __construct(callable $callable)
-    {
-        $this->callable = $callable;
+    public function __construct(
+        /** @var callable */
+        private readonly mixed $callable
+    ) {
     }
 
     public function getData(): string

src/ControllerAsset.php

@@ -13,11 +13,11 @@
 final class ControllerAsset extends AbstractAsset
 {
     public function __construct(
-        private HttpKernelInterface $kernel,
-        private RequestStack $requestStack,
-        private string $controller,
+        private readonly HttpKernelInterface $kernel,
+        private readonly RequestStack $requestStack,
+        private readonly string $controller,
         /** @var array<mixed> */
-        private array $controllerParameters = []
+        private readonly array $controllerParameters = []
     ) {
     }
 
@@ -29,12 +29,12 @@ public function getData(): string
             throw new InvalidRequestException('Could not determine current request');
         }
 
-        $this->controllerParameters['_forwarded'] = $request->attributes;
-        $this->controllerParameters['_controller'] = $this->controller;
-        $subRequest = $request->duplicate([], null, $this->controllerParameters);
+        $subRequest = $request->duplicate([], null, $this->controllerParameters + [
+            '_forwarded' => $request->attributes,
+            '_controller' => $this->controller,
+        ]);
 
         $response = $this->kernel->handle($subRequest, HttpKernelInterface::SUB_REQUEST);
-        /** @psalm-suppress ReservedWord */
         $data = $response->getContent();
 
         if (!is_string($data)) {

src/DataAsset.php

@@ -7,7 +7,7 @@
 final class DataAsset extends AbstractAsset
 {
     public function __construct(
-        private string $data
+        private readonly string $data
     ) {
     }
 

src/Factory/Adapter/AbstractFactoryAdapter.php

@@ -10,7 +10,7 @@
 abstract class AbstractFactoryAdapter implements FactoryAdapterInterface
 {
     public function __construct(
-        public int $guesserPriority = 1
+        public readonly int $guesserPriority = 1
     ) {
     }
 
@@ -24,7 +24,7 @@ public function isValidGuess(array $options): bool
     {
         try {
             $this->getOptionsResolver()->resolve($options);
-        } catch (\Exception $exception) {
+        } catch (\Exception) {
             return false;
         }
 

src/Factory/Adapter/CacheAssetFactoryAdapter.php

@@ -13,8 +13,8 @@
 final class CacheAssetFactoryAdapter extends AbstractFactoryAdapter
 {
     public function __construct(
-        private CacheItemPoolInterface $cache,
-        private AssetFactory $assetFactory
+        private readonly CacheItemPoolInterface $cache,
+        private readonly AssetFactory $assetFactory
     ) {
         parent::__construct(0);
     }

src/Factory/Adapter/ControllerAssetFactoryAdapter.php

@@ -13,8 +13,8 @@
 final class ControllerAssetFactoryAdapter extends AbstractFactoryAdapter
 {
     public function __construct(
-        private HttpKernelInterface $kernel,
-        private RequestStack $requestStack
+        private readonly HttpKernelInterface $kernel,
+        private readonly RequestStack $requestStack
     ) {
         parent::__construct(1);
     }

src/Factory/Adapter/TemplateAssetFactoryAdapter.php

@@ -12,7 +12,7 @@
 final class TemplateAssetFactoryAdapter extends AbstractFactoryAdapter
 {
     public function __construct(
-        private Environment $renderer
+        private readonly Environment $renderer
     ) {
         parent::__construct(1);
     }

src/Factory/AssetFactory.php

@@ -9,17 +9,13 @@
 use Endroid\Asset\Factory\Adapter\FactoryAdapterInterface;
 use Endroid\Asset\Guesser\ClassGuesser;
 
-class AssetFactory
+final class AssetFactory
 {
-    private ClassGuesser $classGuesser;
-
-    /** @var array<string, FactoryAdapterInterface> */
-    private array $factories;
-
-    public function __construct(ClassGuesser $classGuesser = null)
-    {
-        $this->classGuesser = $classGuesser instanceof ClassGuesser ? $classGuesser : new ClassGuesser();
-        $this->factories = [];
+    public function __construct(
+        private readonly ClassGuesser $classGuesser = new ClassGuesser(),
+        /** @var array<string, FactoryAdapterInterface> */
+        private array $factories = []
+    ) {
     }
 
     /** @param iterable<FactoryAdapterInterface> $factories */

src/FileAsset.php

@@ -7,7 +7,7 @@
 final class FileAsset extends AbstractAsset
 {
     public function __construct(
-        private string $path
+        private readonly string $path
     ) {
     }
 

src/Guesser/ClassGuesser.php

@@ -9,8 +9,11 @@
 
 final class ClassGuesser
 {
-    /** @var array<string, FactoryAdapterInterface> */
-    private array $factories = [];
+    public function __construct(
+        /** @var array<string, FactoryAdapterInterface> */
+        private array $factories = []
+    ) {
+    }
 
     public function addFactory(FactoryAdapterInterface $factory): void
     {

src/MultiUrlAsset.php

@@ -8,7 +8,7 @@ final class MultiUrlAsset extends AbstractAsset
 {
     public function __construct(
         /** @var array<string> */
-        private array $urls
+        private readonly array $urls
     ) {
     }
 

src/TemplateAsset.php

@@ -9,10 +9,10 @@
 final class TemplateAsset extends AbstractAsset
 {
     public function __construct(
-        private Environment $templating,
-        private string $template,
-        /** @var array<string> */
-        private array $parameters = []
+        private readonly Environment $templating,
+        private readonly string $template,
+        /** @param array<mixed> */
+        private readonly array $parameters = []
     ) {
     }
 

src/UrlAsset.php

@@ -10,7 +10,7 @@
 final class UrlAsset extends AbstractAsset
 {
     public function __construct(
-        private string $url
+        private readonly string $url
     ) {
     }
 

tests/Factory/AssetFactoryTest.php

@@ -9,7 +9,7 @@
 use Endroid\Asset\Factory\AssetFactory;
 use PHPUnit\Framework\TestCase;
 
-class AssetFactoryTest extends TestCase
+final class AssetFactoryTest extends TestCase
 {
     /**
      * @testdox Create data asset via factory