Update to PHP 8.1 syntax (#27)

stfalcon-studio · Jul 28, 2022 · b693c5c · b693c5c
1 parent cb3e104
commit b693c5c
Show file tree

Hide file tree

Showing 20 changed files with 26 additions and 94 deletions.
diff --git a/Attribute/JsonSchema.php b/Attribute/JsonSchema.php
@@ -20,14 +20,11 @@
 #[Attribute(Attribute::TARGET_CLASS)]
 class JsonSchema
 {
-    private readonly string $jsonSchemaName;
-
     /**
      * @param string $jsonSchemaName
      */
-    public function __construct(string $jsonSchemaName)
+    public function __construct(private readonly string $jsonSchemaName)
     {
-        $this->jsonSchemaName = $jsonSchemaName;
     }
 
     /**

diff --git a/Event/User/AbstractUserEvent.php b/Event/User/AbstractUserEvent.php
@@ -20,14 +20,11 @@
  */
 abstract class AbstractUserEvent extends Event
 {
-    private readonly UserInterface $user;
-
     /**
      * @param UserInterface $user
      */
-    public function __construct(UserInterface $user)
+    public function __construct(private readonly UserInterface $user)
     {
-        $this->user = $user;
     }
 
     /**

diff --git a/EventListener/JWT/JwtSubscriber.php b/EventListener/JWT/JwtSubscriber.php
@@ -29,14 +29,11 @@ final class JwtSubscriber implements EventSubscriberInterface
 {
     private const ON_AUTHENTICATION_FAILURE_RESPONSE_FUNCTION = 'onAuthenticationFailureResponse';
 
-    private readonly TranslatorInterface $translator;
-
     /**
      * @param TranslatorInterface $translator
      */
-    public function __construct(TranslatorInterface $translator)
+    public function __construct(private readonly TranslatorInterface $translator)
     {
-        $this->translator = $translator;
     }
 
     /**

diff --git a/EventListener/JWT/TokenBlackListSubscriber.php b/EventListener/JWT/TokenBlackListSubscriber.php
@@ -22,14 +22,11 @@
  */
 final class TokenBlackListSubscriber implements EventSubscriberInterface
 {
-    private readonly JwtBlackListService $jwtBlackListService;
-
     /**
      * @param JwtBlackListService $tokenBlackListService
      */
-    public function __construct(JwtBlackListService $tokenBlackListService)
+    public function __construct(private readonly JwtBlackListService $tokenBlackListService)
     {
-        $this->jwtBlackListService = $tokenBlackListService;
     }
 
     /**
@@ -46,6 +43,6 @@ public static function getSubscribedEvents(): iterable
      */
     public function addCurrentJwtTokenToBlackList(): void
     {
-        $this->jwtBlackListService->addCurrentTokenToBlackList();
+        $this->tokenBlackListService->addCurrentTokenToBlackList();
     }
 }
diff --git a/EventListener/Kernel/ApiExceptionFormatterListener.php b/EventListener/Kernel/ApiExceptionFormatterListener.php
@@ -39,23 +39,14 @@ final class ApiExceptionFormatterListener implements EventSubscriberInterface
 
     private const PROD_ENV = 'prod';
 
-    private readonly string $apiHost;
-    private readonly string $environment;
-    private readonly ExceptionResponseProcessorInterface $exceptionResponseProcessor;
-    private readonly ExceptionResponseFactory $exceptionResponseFactory;
-
     /**
      * @param string                              $apiHost
      * @param string                              $environment
      * @param ExceptionResponseProcessorInterface $exceptionResponseProcessor
      * @param ExceptionResponseFactory            $exceptionResponseFactory
      */
-    public function __construct(string $apiHost, string $environment, ExceptionResponseProcessorInterface $exceptionResponseProcessor, ExceptionResponseFactory $exceptionResponseFactory)
+    public function __construct(private readonly string $apiHost, private readonly string $environment, private readonly ExceptionResponseProcessorInterface $exceptionResponseProcessor, private readonly ExceptionResponseFactory $exceptionResponseFactory)
     {
-        $this->apiHost = $apiHost;
-        $this->environment = $environment;
-        $this->exceptionResponseProcessor = $exceptionResponseProcessor;
-        $this->exceptionResponseFactory = $exceptionResponseFactory;
     }
 
     /**

diff --git a/EventListener/ORM/Aggregate/AggregatePartListener.php b/EventListener/ORM/Aggregate/AggregatePartListener.php
@@ -24,14 +24,12 @@ final class AggregatePartListener
 {
     /** @var array<AggregateRootInterface> */
     private array $aggregateRoots = [];
-    private readonly DateTimeHelper $dateTimeHelper;
 
     /**
      * @param DateTimeHelper $dateTimeHelper
      */
-    public function __construct(DateTimeHelper $dateTimeHelper)
+    public function __construct(private readonly DateTimeHelper $dateTimeHelper)
     {
-        $this->dateTimeHelper = $dateTimeHelper;
     }
 
     /**

diff --git a/EventListener/Security/CheckVerifiedUserSubscriber.php b/EventListener/Security/CheckVerifiedUserSubscriber.php
@@ -23,14 +23,11 @@
  */
 final class CheckVerifiedUserSubscriber implements EventSubscriberInterface
 {
-    private readonly JwtBlackListService $tokenBlackListService;
-
     /**
      * @param JwtBlackListService $tokenBlackListService
      */
-    public function __construct(JwtBlackListService $tokenBlackListService)
+    public function __construct(private readonly JwtBlackListService $tokenBlackListService)
     {
-        $this->tokenBlackListService = $tokenBlackListService;
     }
 
     /**

diff --git a/Request/DtoExtractor.php b/Request/DtoExtractor.php
@@ -24,17 +24,12 @@
  */
 class DtoExtractor
 {
-    private readonly DtoAttributeProcessor $dtoAttributeProcessor;
-    private readonly SerializerInterface $serializer;
-
     /**
      * @param DtoAttributeProcessor $dtoAttributeProcessor
      * @param SerializerInterface   $serializer
      */
-    public function __construct(DtoAttributeProcessor $dtoAttributeProcessor, SerializerInterface $serializer)
+    public function __construct(private readonly DtoAttributeProcessor $dtoAttributeProcessor, private readonly SerializerInterface $serializer)
     {
-        $this->dtoAttributeProcessor = $dtoAttributeProcessor;
-        $this->serializer = $serializer;
     }
 
     /**

diff --git a/Security/JwtBlackListService.php b/Security/JwtBlackListService.php
@@ -24,21 +24,15 @@
  */
 class JwtBlackListService
 {
-    private readonly JWSProviderInterface $jwsProvider;
-    private readonly JwtTokenHelper $jwtTokenHelper;
-    private readonly JwtCacheHelper $jwtCacheHelper;
     private Client $redisClientJwtBlackList;
 
     /**
      * @param JWSProviderInterface $jwsProvider
      * @param JwtTokenHelper       $jwtTokenHelper
      * @param JwtCacheHelper       $jwtCacheHelper
      */
-    public function __construct(JWSProviderInterface $jwsProvider, JwtTokenHelper $jwtTokenHelper, JwtCacheHelper $jwtCacheHelper)
+    public function __construct(private readonly JWSProviderInterface $jwsProvider, private readonly JwtTokenHelper $jwtTokenHelper, private readonly JwtCacheHelper $jwtCacheHelper)
     {
-        $this->jwsProvider = $jwsProvider;
-        $this->jwtTokenHelper = $jwtTokenHelper;
-        $this->jwtCacheHelper = $jwtCacheHelper;
     }
 
     /**

diff --git a/Security/JwtTokenHelper.php b/Security/JwtTokenHelper.php
@@ -22,14 +22,11 @@
  */
 class JwtTokenHelper
 {
-    private readonly TokenStorageInterface $tokenStorage;
-
     /**
      * @param TokenStorageInterface $tokenStorage
      */
-    public function __construct(TokenStorageInterface $tokenStorage)
+    public function __construct(private readonly TokenStorageInterface $tokenStorage)
     {
-        $this->tokenStorage = $tokenStorage;
     }
 
     /**

diff --git a/Serializer/Normalizer/ConstraintViolationListNormalizer.php b/Serializer/Normalizer/ConstraintViolationListNormalizer.php
@@ -21,14 +21,11 @@
  */
 class ConstraintViolationListNormalizer implements NormalizerInterface
 {
-    private SymfonyConstraintViolationListNormalizer $symfonyConstraintViolationListNormalizer;
-
     /**
      * @param SymfonyConstraintViolationListNormalizer $symfonyConstraintViolationListNormalizer
      */
-    public function __construct(SymfonyConstraintViolationListNormalizer $symfonyConstraintViolationListNormalizer)
+    public function __construct(private readonly SymfonyConstraintViolationListNormalizer $symfonyConstraintViolationListNormalizer)
     {
-        $this->symfonyConstraintViolationListNormalizer = $symfonyConstraintViolationListNormalizer;
     }
 
     /**

diff --git a/Serializer/Serializer.php b/Serializer/Serializer.php
@@ -22,15 +22,11 @@ class Serializer
 {
     public const DEFAULT_FORMAT = 'json';
 
-    /** @var SerializerInterface|BaseSerializer */
-    protected readonly SerializerInterface|BaseSerializer $symfonySerializer;
-
     /**
-     * @param SerializerInterface|BaseSerializer $serializer
+     * @param SerializerInterface|BaseSerializer $symfonySerializer
      */
-    public function __construct(SerializerInterface|BaseSerializer $serializer)
+    public function __construct(protected readonly SerializerInterface|BaseSerializer $symfonySerializer)
     {
-        $this->symfonySerializer = $serializer;
     }
 
     /**

diff --git a/Service/AttributeProcessor/JsonSchemaAttributeProcessor.php b/Service/AttributeProcessor/JsonSchemaAttributeProcessor.php
@@ -24,10 +24,6 @@ class JsonSchemaAttributeProcessor
 {
     private const JSON_FILE_EXTENSION = '.json';
 
-    private readonly DtoAttributeProcessor $dtoAttributeProcessor;
-    private readonly FileReader $fileReader;
-    private readonly string $jsonSchemaDir;
-
     /** @var array */
     private array $cachedClasses = [];
 
@@ -36,11 +32,8 @@ class JsonSchemaAttributeProcessor
      * @param FileReader            $fileReader
      * @param string                $jsonSchemaDir
      */
-    public function __construct(DtoAttributeProcessor $dtoAttributeProcessor, FileReader $fileReader, string $jsonSchemaDir)
+    public function __construct(private readonly DtoAttributeProcessor $dtoAttributeProcessor, private readonly FileReader $fileReader, private readonly string $jsonSchemaDir)
     {
-        $this->dtoAttributeProcessor = $dtoAttributeProcessor;
-        $this->fileReader = $fileReader;
-        $this->jsonSchemaDir = $jsonSchemaDir;
     }
 
     /**

diff --git a/Service/Exception/ResponseProcessor/ExceptionResponseProcessor.php b/Service/Exception/ResponseProcessor/ExceptionResponseProcessor.php
@@ -19,15 +19,11 @@
  */
 class ExceptionResponseProcessor implements ExceptionResponseProcessorInterface
 {
-    /** @var CustomAppExceptionResponseProcessorInterface[]|iterable */
-    private readonly iterable $errorResponseProcessors;
-
     /**
      * @param iterable|CustomAppExceptionResponseProcessorInterface[] $errorResponseProcessors
      */
-    public function __construct(iterable $errorResponseProcessors)
+    public function __construct(private readonly iterable $errorResponseProcessors)
     {
-        $this->errorResponseProcessors = $errorResponseProcessors;
     }
 
     /**

diff --git a/Service/Exception/ResponseProcessor/InvalidEntityExceptionProcessor.php b/Service/Exception/ResponseProcessor/InvalidEntityExceptionProcessor.php
@@ -12,6 +12,7 @@
 
 namespace StfalconStudio\ApiBundle\Service\Exception\ResponseProcessor;
 
+use JetBrains\PhpStorm\ArrayShape;
 use StfalconStudio\ApiBundle\Exception\CustomAppExceptionInterface;
 use StfalconStudio\ApiBundle\Exception\Http\Validation\InvalidEntityException;
 use StfalconStudio\ApiBundle\Exception\RuntimeException;
@@ -32,6 +33,7 @@ public function supports(CustomAppExceptionInterface $exception): bool
     /**
      * {@inheritdoc}
      */
+    #[ArrayShape(['violations' => 'mixed'])]
     public function processResponse(CustomAppExceptionInterface $exception): array
     {
         if (!$exception instanceof InvalidEntityException) {

diff --git a/Service/Exception/ResponseProcessor/InvalidJsonSchemaExceptionProcessor.php b/Service/Exception/ResponseProcessor/InvalidJsonSchemaExceptionProcessor.php
@@ -12,6 +12,7 @@
 
 namespace StfalconStudio\ApiBundle\Service\Exception\ResponseProcessor;
 
+use JetBrains\PhpStorm\ArrayShape;
 use StfalconStudio\ApiBundle\Exception\CustomAppExceptionInterface;
 use StfalconStudio\ApiBundle\Exception\Http\Json\InvalidJsonSchemaException;
 use StfalconStudio\ApiBundle\Exception\RuntimeException;
@@ -21,14 +22,11 @@
  */
 class InvalidJsonSchemaExceptionProcessor implements CustomAppExceptionResponseProcessorInterface
 {
-    private readonly string $environment;
-
     /**
      * @param string $environment
      */
-    public function __construct(string $environment)
+    public function __construct(private readonly string $environment)
     {
-        $this->environment = $environment;
     }
 
     /**
@@ -42,6 +40,7 @@ public function supports(CustomAppExceptionInterface $exception): bool
     /**
      * {@inheritdoc}
      */
+    #[ArrayShape(['violations' => 'mixed', 'jsonSchema' => 'mixed'])]
     public function processResponse(CustomAppExceptionInterface $exception): array
     {
         if (!$exception instanceof InvalidJsonSchemaException) {

diff --git a/Traits/SymfonySerializerTrait.php b/Traits/SymfonySerializerTrait.php
@@ -23,7 +23,7 @@
 trait SymfonySerializerTrait
 {
     /** @var SerializerInterface|Serializer */
-    protected SerializerInterface $symfonySerializer;
+    protected SerializerInterface|Serializer $symfonySerializer;
 
     /**
      * @param SerializerInterface|Serializer $symfonySerializer

diff --git a/Util/Canonical/Canonicalizer.php b/Util/Canonical/Canonicalizer.php
@@ -17,14 +17,11 @@
  */
 class Canonicalizer
 {
-    private readonly EncodingDetector $encodingDetector;
-
     /**
      * @param EncodingDetector $encodingDetector
      */
-    public function __construct(EncodingDetector $encodingDetector)
+    public function __construct(private readonly EncodingDetector $encodingDetector)
     {
-        $this->encodingDetector = $encodingDetector;
     }
 
     /**

diff --git a/Validator/Constraints/Password/PasswordMeetSpecialRequirementsValidator.php b/Validator/Constraints/Password/PasswordMeetSpecialRequirementsValidator.php
@@ -22,14 +22,11 @@
  */
 class PasswordMeetSpecialRequirementsValidator extends ConstraintValidator
 {
-    private readonly PasswordRequirementsValidator $passwordRequirementsValidator;
-
     /**
      * @param PasswordRequirementsValidator $passwordRequirementsValidator
      */
-    public function __construct(PasswordRequirementsValidator $passwordRequirementsValidator)
+    public function __construct(private readonly PasswordRequirementsValidator $passwordRequirementsValidator)
     {
-        $this->passwordRequirementsValidator = $passwordRequirementsValidator;
     }
 
     /**

diff --git a/Validator/JsonSchemaValidator.php b/Validator/JsonSchemaValidator.php
@@ -29,17 +29,12 @@ class JsonSchemaValidator
 {
     use Traits\SymfonySerializerTrait;
 
-    private readonly Validator $validator;
-    private readonly JsonSchemaAttributeProcessor $jsonSchemaAttributeProcessor;
-
     /**
      * @param Validator                    $validator
-     * @param JsonSchemaAttributeProcessor $dtoAttributeProcessor
+     * @param JsonSchemaAttributeProcessor $jsonSchemaAttributeProcessor
      */
-    public function __construct(Validator $validator, JsonSchemaAttributeProcessor $dtoAttributeProcessor)
+    public function __construct(private readonly Validator $validator, private readonly JsonSchemaAttributeProcessor $jsonSchemaAttributeProcessor)
     {
-        $this->validator = $validator;
-        $this->jsonSchemaAttributeProcessor = $dtoAttributeProcessor;
     }
 
     /**