Rector up to PHP 8.1

werkraum-media · Dec 4, 2023 · 65898e9 · 65898e9
1 parent dcc9c91
commit 65898e9
Show file tree

Hide file tree

Showing 46 changed files with 130 additions and 228 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,5 @@
 /.Build/
-/.phpunit.cache
 /composer.lock
+/.phpunit.cache
+/Tests/Acceptance/Support/_generated
 /vendor/
diff --git a/Classes/DependencyInjection/ConverterPass.php b/Classes/DependencyInjection/ConverterPass.php
@@ -29,7 +29,7 @@
 
 class ConverterPass implements CompilerPassInterface
 {
-    public const TAG = 'thuecat.typo3.converter';
+    final public const TAG = 'thuecat.typo3.converter';
 
     public function process(ContainerBuilder $container): void
     {

diff --git a/Classes/DependencyInjection/EntityPass.php b/Classes/DependencyInjection/EntityPass.php
@@ -29,7 +29,7 @@
 
 class EntityPass implements CompilerPassInterface
 {
-    public const TAG = 'thuecat.entity';
+    final public const TAG = 'thuecat.entity';
 
     public function process(ContainerBuilder $container): void
     {

diff --git a/Classes/DependencyInjection/UrlProvidersPass.php b/Classes/DependencyInjection/UrlProvidersPass.php
@@ -29,7 +29,7 @@
 
 class UrlProvidersPass implements CompilerPassInterface
 {
-    public const TAG = 'thuecat:urlprovider';
+    final public const TAG = 'thuecat:urlprovider';
 
     public function process(ContainerBuilder $container): void
     {

diff --git a/Classes/Domain/Import/Entity/Properties/DayOfWeek.php b/Classes/Domain/Import/Entity/Properties/DayOfWeek.php
@@ -25,11 +25,8 @@
 
 class DayOfWeek
 {
-    protected string $dayOfWeek = '';
-
     public function __construct(
-        string $dayOfWeek
+        protected string $dayOfWeek
     ) {
-        $this->dayOfWeek = $dayOfWeek;
     }
 }
diff --git a/Classes/Domain/Import/Entity/Properties/Offer.php b/Classes/Domain/Import/Entity/Properties/Offer.php
@@ -58,7 +58,7 @@ public function setOfferType($offerType): void
         }
 
         $this->offerTypes = array_map(
-            [PropertyValues::class, 'removePrefixFromEntry'],
+            PropertyValues::removePrefixFromEntry(...),
             $offerType
         );
     }

diff --git a/Classes/Domain/Import/Entity/Properties/OpeningHour.php b/Classes/Domain/Import/Entity/Properties/OpeningHour.php
@@ -27,9 +27,9 @@
 
 class OpeningHour
 {
-    protected ?DateTimeImmutable $validFrom;
+    protected ?DateTimeImmutable $validFrom = null;
 
-    protected ?DateTimeImmutable $validThrough;
+    protected ?DateTimeImmutable $validThrough = null;
 
     protected DateTimeImmutable $opens;
 

diff --git a/Classes/Domain/Import/EntityMapper.php b/Classes/Domain/Import/EntityMapper.php
@@ -51,7 +51,7 @@ public function mapDataToEntity(
 
         try {
             return $serializer->deserialize(
-                json_encode($jsonLD),
+                json_encode($jsonLD, JSON_THROW_ON_ERROR),
                 $targetClassName,
                 'json',
                 $context

diff --git a/Classes/Domain/Import/EntityMapper/CustomAnnotationExtractor.php b/Classes/Domain/Import/EntityMapper/CustomAnnotationExtractor.php
@@ -54,26 +54,26 @@
  */
 class CustomAnnotationExtractor implements PropertyDescriptionExtractorInterface, PropertyTypeExtractorInterface, ConstructorArgumentTypeExtractorInterface
 {
-    public const PROPERTY = 0;
-    public const ACCESSOR = 1;
-    public const MUTATOR = 2;
+    final public const PROPERTY = 0;
+    final public const ACCESSOR = 1;
+    final public const MUTATOR = 2;
 
     /**
      * @var array<string, array{DocBlock|null, int|null, string|null}>
      */
-    private $docBlocks = [];
+    private array $docBlocks = [];
 
     /**
      * @var Context[]
      */
-    private $contexts = [];
+    private array $contexts = [];
 
-    private $docBlockFactory;
-    private $contextFactory;
-    private $phpDocTypeHelper;
-    private $mutatorPrefixes;
-    private $accessorPrefixes;
-    private $arrayMutatorPrefixes;
+    private readonly \phpDocumentor\Reflection\DocBlockFactoryInterface $docBlockFactory;
+    private readonly \phpDocumentor\Reflection\Types\ContextFactory $contextFactory;
+    private readonly \Symfony\Component\PropertyInfo\Util\PhpDocTypeHelper $phpDocTypeHelper;
+    private readonly array $mutatorPrefixes;
+    private readonly array $accessorPrefixes;
+    private readonly array $arrayMutatorPrefixes;
 
     /**
      * @param string[]|null $mutatorPrefixes
@@ -83,7 +83,7 @@ class CustomAnnotationExtractor implements PropertyDescriptionExtractorInterface
     public function __construct(DocBlockFactoryInterface $docBlockFactory = null, array $mutatorPrefixes = null, array $accessorPrefixes = null, array $arrayMutatorPrefixes = null)
     {
         if (!class_exists(DocBlockFactory::class)) {
-            throw new LogicException(sprintf('Unable to use the "%s" class as the "phpdocumentor/reflection-docblock" package is not installed. Try running composer require "phpdocumentor/reflection-docblock".', __CLASS__));
+            throw new LogicException(sprintf('Unable to use the "%s" class as the "phpdocumentor/reflection-docblock" package is not installed. Try running composer require "phpdocumentor/reflection-docblock".', self::class));
         }
 
         $this->docBlockFactory = $docBlockFactory ?: DocBlockFactory::createInstance();
@@ -246,7 +246,7 @@ private function getDocBlockFromConstructor(string $class, string $property): ?D
             $docBlock = $this->docBlockFactory->create($reflectionConstructor, $this->contextFactory->createFromReflector($reflectionConstructor));
 
             return $this->filterDocBlockParams($docBlock, $property);
-        } catch (InvalidArgumentException $e) {
+        } catch (InvalidArgumentException) {
             return null;
         }
     }
@@ -320,7 +320,7 @@ private function getDocBlockFromProperty(string $class, string $property): ?DocB
 
         try {
             return $this->docBlockFactory->create($reflectionProperty, $this->createFromReflector($reflector));
-        } catch (InvalidArgumentException|RuntimeException $e) {
+        } catch (InvalidArgumentException|RuntimeException) {
             return null;
         }
     }
@@ -348,7 +348,7 @@ private function getDocBlockFromMethod(string $class, string $ucFirstProperty, i
                 ) {
                     break;
                 }
-            } catch (ReflectionException $e) {
+            } catch (ReflectionException) {
                 // Try the next prefix if the method doesn't exist
             }
         }
@@ -367,7 +367,7 @@ private function getDocBlockFromMethod(string $class, string $ucFirstProperty, i
 
         try {
             return [$this->docBlockFactory->create($reflectionMethod, $this->createFromReflector($reflector)), $prefix];
-        } catch (InvalidArgumentException|RuntimeException $e) {
+        } catch (InvalidArgumentException|RuntimeException) {
             return null;
         }
     }

diff --git a/Classes/Domain/Import/EntityMapper/JsonDecode.php b/Classes/Domain/Import/EntityMapper/JsonDecode.php
@@ -33,7 +33,7 @@
  */
 class JsonDecode extends SymfonyJsonDecode
 {
-    public const ACTIVE_LANGUAGE = 'active_language';
+    final public const ACTIVE_LANGUAGE = 'active_language';
 
     /**
      * @var array[]
@@ -92,12 +92,11 @@ private function process(
      *
      * This decode will resolve the list to a single value based on current language settings from context.
      *
-     * @param mixed $value
      *
      * @return mixed
      */
     private function decodeLanguageSpecificValue(
-        &$value,
+        mixed &$value,
         string $activeLanguage
     ) {
         if (is_array($value) === false) {
@@ -154,12 +153,11 @@ private function decodeLanguageSpecificValue(
      *
      * This decode will resolve single values wrapped in array with extra info.
      *
-     * @param mixed $value
      *
      * @return mixed
      */
     private function decodeSingleValues(
-        &$value
+        mixed &$value
     ) {
         if (is_array($value) === false) {
             return $value;
@@ -189,12 +187,11 @@ private function decodeSingleValues(
     /**
      * Prepare data structure for PHP \DateTimeImmutable.
      *
-     * @param mixed $value
      *
      * @return mixed
      */
     private function decodeDateTime(
-        &$value
+        mixed &$value
     ) {
         $supportedTypes = [
             'schema:Time',
@@ -214,11 +211,9 @@ private function decodeDateTime(
     }
 
     /**
-     * @param mixed $key
-     *
      * @return mixed
      */
-    private function mapKey($key)
+    private function mapKey(mixed $key)
     {
         if (is_string($key) === false) {
             return $key;
@@ -240,7 +235,7 @@ private function mapKey($key)
     private function doesRuleMatch(array $rule, string $type): bool
     {
         if ($rule['type'] === 'beginsWith') {
-            return str_starts_with($type, $rule['comparisonValue']);
+            return str_starts_with($type, (string) $rule['comparisonValue']);
         }
 
         return false;

diff --git a/Classes/Domain/Import/EntityMapper/MappingException.php b/Classes/Domain/Import/EntityMapper/MappingException.php
@@ -28,22 +28,16 @@
 
 class MappingException extends Exception
 {
-    protected array $jsonLD = [];
-
-    protected string $targetClassName = '';
-
     public function __construct(
-        array $jsonLD,
-        string $targetClassName,
+        protected array $jsonLD,
+        protected string $targetClassName,
         Throwable $previous
     ) {
         parent::__construct(
             'Could not map incoming JSON-LD to target object: ' . $previous->getMessage(),
             1628157659,
             $previous
         );
-        $this->jsonLD = $jsonLD;
-        $this->targetClassName = $targetClassName;
     }
 
     public function getUrl(): string

diff --git a/Classes/Domain/Import/EntityMapper/PropertyValues.php b/Classes/Domain/Import/EntityMapper/PropertyValues.php
@@ -36,7 +36,7 @@ public static function removePrefixFromEntry(string $entryWithPrefix): string
     public static function removePrefixFromEntries(array $entriesWithPrefix): array
     {
         return array_map(
-            [PropertyValues::class, 'removePrefixFromEntry'],
+            PropertyValues::removePrefixFromEntry(...),
             $entriesWithPrefix
         );
     }

diff --git a/Classes/Domain/Import/Importer.php b/Classes/Domain/Import/Importer.php
@@ -43,9 +43,9 @@
 
 class Importer
 {
-    private Logger $logger;
+    private readonly Logger $logger;
 
-    private Import $import;
+    private readonly Import $import;
 
     public function __construct(
         private readonly UrlProviderRegistry $urls,
@@ -58,7 +58,7 @@ public function __construct(
         private readonly SaveData $saveData,
         LogManager $logManager
     ) {
-        $this->logger = $logManager->getLogger(__CLASS__);
+        $this->logger = $logManager->getLogger(self::class);
         $this->import = new Import();
     }
 
@@ -143,7 +143,7 @@ private function importJsonEntity(array $jsonEntity, string $url): void
             }
 
             if (!$mappedEntity instanceof MapsToType) {
-                $this->logger->error('Mapping did not result in an MapsToType instance.', ['class' => get_class($mappedEntity)]);
+                $this->logger->error('Mapping did not result in an MapsToType instance.', ['class' => $mappedEntity::class]);
                 continue;
             }
 

diff --git a/Classes/Domain/Import/Importer/FetchData.php b/Classes/Domain/Import/Importer/FetchData.php
@@ -70,7 +70,7 @@ public function jsonLDFromUrl(string $url): array
 
         $this->handleInvalidResponse($response, $request);
 
-        $jsonLD = json_decode((string)$response->getBody(), true);
+        $jsonLD = json_decode((string)$response->getBody(), true, 512, JSON_THROW_ON_ERROR);
         if (is_array($jsonLD)) {
             $this->cache->set($cacheIdentifier, $jsonLD);
             return $jsonLD;

diff --git a/Classes/Domain/Import/Importer/SaveData.php b/Classes/Domain/Import/Importer/SaveData.php
@@ -33,7 +33,7 @@
 class SaveData
 {
     /**
-     * @var mixed[]
+     * @var string[]
      */
     private array $errorLog;
 

diff --git a/Classes/Domain/Import/Model/GenericEntity.php b/Classes/Domain/Import/Model/GenericEntity.php
@@ -25,35 +25,20 @@
 
 class GenericEntity implements Entity
 {
-    private int $typo3StoragePid;
-
-    private string $typo3DatabaseTableName;
-
-    private int $typo3SystemLanguageUid;
-
     private bool $created = false;
 
     private int $typo3Uid = 0;
 
-    private string $remoteId;
-
     /**
-     * @var mixed[]
+     * @param mixed[] $data
      */
-    private array $data;
-
     public function __construct(
-        int $typo3StoragePid,
-        string $typo3DatabaseTableName,
-        int $typo3SystemLanguageUid,
-        string $remoteId,
-        array $data
+        private readonly int $typo3StoragePid,
+        private readonly string $typo3DatabaseTableName,
+        private readonly int $typo3SystemLanguageUid,
+        private readonly string $remoteId,
+        private readonly array $data
     ) {
-        $this->typo3StoragePid = $typo3StoragePid;
-        $this->typo3DatabaseTableName = $typo3DatabaseTableName;
-        $this->typo3SystemLanguageUid = $typo3SystemLanguageUid;
-        $this->remoteId = $remoteId;
-        $this->data = $data;
     }
 
     public function getTypo3StoragePid(): int

diff --git a/Classes/Domain/Import/RequestFactory.php b/Classes/Domain/Import/RequestFactory.php
@@ -56,7 +56,7 @@ public function createRequest(string $method, $uri): RequestInterface
 
         try {
             $query['api_key'] = $this->extensionConfiguration->get('thuecat', 'apiKey');
-        } catch (ExtensionConfigurationExtensionNotConfiguredException $e) {
+        } catch (ExtensionConfigurationExtensionNotConfiguredException) {
             // Nothing todo, not configured, don't add.
         }
 

diff --git a/Classes/Domain/Import/ResolveForeignReference.php b/Classes/Domain/Import/ResolveForeignReference.php
@@ -51,7 +51,7 @@ public function resolve(
     ): ?object {
         try {
             $jsonLD = $this->fetchData->jsonLDFromUrl($foreignReference->getId());
-        } catch (InvalidResponseException $e) {
+        } catch (InvalidResponseException) {
             return null;
         }
 

diff --git a/Classes/Domain/Import/Typo3Converter.php b/Classes/Domain/Import/Typo3Converter.php
@@ -51,7 +51,7 @@ public function convert(
         $concreteConverter = $this->registry->getConverterBasedOnType($mapped);
         if (!$concreteConverter instanceof Typo3ConcreteConverter) {
             throw new Exception(
-                'No TYPO3 Converter registered for given Entity "' . get_class($mapped) . '".',
+                'No TYPO3 Converter registered for given Entity "' . $mapped::class . '".',
                 1628244329
             );
         }