[FEATURE] Compatibility with TYPO3 v14

.ddev/config.yaml

@@ -1,10 +1,8 @@
-name: interest
+name: interest4
 type: php
 docroot: ""
 php_version: "8.2"
 webserver_type: nginx-fpm
-#router_http_port: "8081"
-#router_https_port: "4434"
 xdebug_enabled: false
 additional_hostnames: []
 additional_fqdns: []
@@ -15,7 +13,6 @@ mutagen_enabled: false
 hooks:
   post-start:
   - exec: composer install --no-progress
-  - exec: export PHP_IDE_CONFIG="serverName=interest.ddev.site"
 omit_containers: [ddev-ssh-agent]
 webimage_extra_packages: [parallel]
 use_dns_when_possible: true

Classes/Authentication/HttpBackendUserAuthentication.php

@@ -33,7 +33,7 @@ public function getUserId(): int
         return $this->user['uid'] ?? 0;
     }
 
-    public function checkAuthentication(ServerRequestInterface $request)
+    public function checkAuthentication(ServerRequestInterface $request): void
     {
         $this->authenticateBearerToken($request);
 

Classes/Command/AbstractRecordCommandController.php

@@ -104,7 +104,7 @@ protected function handleStreamableData(InputInterface $input)
     protected function parseData(InputInterface $input)
     {
         if ($input->getOption('data') !== null) {
-            $data = json_decode($input->getOption('data'), true);
+            $data = json_decode((string)$input->getOption('data'), true);
 
             if (!is_array($data)) {
                 throw new InvalidOptionException(
@@ -129,7 +129,7 @@ protected function parseData(InputInterface $input)
     protected function parseMetaData(InputInterface $input)
     {
         if ($input->getOption('metaData') !== null) {
-            $data = json_decode($input->getOption('metaData'), true);
+            $data = json_decode((string)$input->getOption('metaData'), true);
 
             if (!is_array($data)) {
                 throw new InvalidOptionException(

Classes/Configuration/ConfigurationProvider.php

@@ -29,7 +29,7 @@ public function __construct()
         try {
             $this->extensionConfiguration = GeneralUtility::makeInstance(ExtensionConfiguration::class)
                 ->get('interest');
-        } catch (ExtensionConfigurationExtensionNotConfiguredException $exception) {
+        } catch (ExtensionConfigurationExtensionNotConfiguredException) {
             $this->extensionConfiguration = [];
         }
 

Classes/DataHandling/Operation/AbstractRecordOperation.php

@@ -41,7 +41,7 @@ abstract class AbstractRecordOperation
      *
      * @var SiteLanguage|null
      */
-    protected ?SiteLanguage $language;
+    protected ?SiteLanguage $language = null;
 
     /**
      * @var ContentObjectRenderer
@@ -142,7 +142,7 @@ public function __invoke(): void
         foreach (array_filter(array_values($this->messageQueue)) as $messageObject) {
             if ($messageObject instanceof RequiredMessageInterface) {
                 throw new IncompleteOperationException(
-                    'All required messages were not retrieved. Found: ' . get_class($messageObject),
+                    'All required messages were not retrieved. Found: ' . $messageObject::class,
                     1695260831
                 );
             }
@@ -161,7 +161,7 @@ public function getArguments(): array
             $this->getTable(),
             $this->getRemoteId(),
             // @extensionScannerIgnoreLine
-            $this->getLanguage() === null ? null : $this->getLanguage()->getHreflang(),
+            $this->getLanguage() instanceof SiteLanguage ? $this->getLanguage()->getHreflang() : null,
             null,
             $this->getMetaData(),
         ];
@@ -411,16 +411,16 @@ public function getDataHandler(): DataHandler
     public function dispatchMessage(MessageInterface $message): void
     {
         if ($message instanceof ReplacesPreviousMessageInterface) {
-            $this->messageQueue[get_class($message)] = [$message];
+            $this->messageQueue[$message::class] = [$message];
 
             return;
         }
 
-        if (!isset($this->messageQueue[get_class($message)])) {
-            $this->messageQueue[get_class($message)] = [];
+        if (!isset($this->messageQueue[$message::class])) {
+            $this->messageQueue[$message::class] = [];
         }
 
-        $this->messageQueue[get_class($message)][] = $message;
+        $this->messageQueue[$message::class][] = $message;
     }
 
     /**

Classes/DataHandling/Operation/Event/Handler/ApplyFieldDataTransformations.php

@@ -29,7 +29,7 @@ public function __invoke(AbstractRecordOperationEvent $event): void
         foreach (
             $settings['transformations.'][$recordOperation->getTable() . '.'] ?? [] as $fieldName => $configuration
         ) {
-            $fieldName = substr($fieldName, 0, -1);
+            $fieldName = substr((string)$fieldName, 0, -1);
 
             $recordOperation->setDataFieldForDataHandler(
                 $fieldName,

Classes/DataHandling/Operation/Event/Handler/FixSortingPositionsOnRemoteRelationRecords.php

@@ -151,7 +151,7 @@ protected function orderOnForeignSideOfRelation(string $table, int $relationId):
             $fieldConfiguration['type'] === 'group'
             && (
                 $fieldConfiguration['allowed'] === '*'
-                || str_contains($fieldConfiguration['foreign_table'], ',')
+                || str_contains((string)$fieldConfiguration['foreign_table'], ',')
             )
         );
 
@@ -200,7 +200,7 @@ protected function generateSortingData(): array
             if (
                 $fieldConfiguration['type'] === 'group'
                 && $fieldConfiguration['allowed'] !== '*'
-                && !str_contains($fieldConfiguration['allowed'], ',')
+                && !str_contains((string)$fieldConfiguration['allowed'], ',')
             ) {
                 $foreignTable = $fieldConfiguration['allowed'];
             }
@@ -263,9 +263,7 @@ protected function flattenRelations(array $relations, bool $prefixTable): array
             }
 
             $flattenedRelations = array_map(
-                function (int $item) use ($relationTable) {
-                    return $relationTable . '_' . $item;
-                },
+                fn(int $item) => $relationTable . '_' . $item,
                 array_column($relation, 'uid')
             );
         }

Classes/DataHandling/Operation/Event/Handler/GenerateRecordOperationHash.php

@@ -20,7 +20,7 @@ class GenerateRecordOperationHash implements RecordOperationEventHandlerInterfac
     public function __invoke(AbstractRecordOperationEvent $event): void
     {
         $event->getRecordOperation()->setHash(
-            md5(get_class($event->getRecordOperation()) . serialize($event->getRecordOperation()->getArguments()))
+            md5($event->getRecordOperation()::class . serialize($event->getRecordOperation()->getArguments()))
         );
     }
 }

Classes/DataHandling/Operation/Event/Handler/InsertTranslationFields.php

@@ -8,6 +8,7 @@
 use FriendsOfTYPO3\Interest\DataHandling\Operation\Event\RecordOperationEventHandlerInterface;
 use FriendsOfTYPO3\Interest\Domain\Repository\RemoteIdMappingRepository;
 use FriendsOfTYPO3\Interest\Utility\TcaUtility;
+use TYPO3\CMS\Core\Site\Entity\SiteLanguage;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 
 /**
@@ -25,10 +26,10 @@ public function __invoke(AbstractRecordOperationEvent $event): void
 
         if (
             // @extensionScannerIgnoreLine
-            $recordOperation->getLanguage() === null
+            !$recordOperation->getLanguage() instanceof SiteLanguage
             || (
                 // @extensionScannerIgnoreLine
-                $recordOperation->getLanguage() !== null
+                $recordOperation->getLanguage() instanceof SiteLanguage
                 // @extensionScannerIgnoreLine
                 && $recordOperation->getLanguage()->getLanguageId() === 0
             )

Classes/DataHandling/Operation/Event/Handler/Message/DataHandlerSuccessMessage.php

@@ -15,14 +15,11 @@
  */
 class DataHandlerSuccessMessage implements ReplacesPreviousMessageInterface
 {
-    private bool $success;
-
     /**
      * @param bool $success
      */
-    public function __construct(bool $success)
+    public function __construct(private readonly bool $success)
     {
-        $this->success = $success;
     }
 
     /**

Classes/DataHandling/Operation/Event/Handler/Message/PendingRelationMessage.php

@@ -16,25 +16,16 @@
  */
 class PendingRelationMessage implements RequiredMessageInterface
 {
-    private string $table;
-
-    private string $field;
-
-    /**
-     * @var string[]
-     */
-    private array $remoteIds;
-
     /**
      * @param string $table
      * @param string $field
      * @param string[] $remoteIds The pointing remote IDs in a pending relation to record $uid in $field of $table.
      */
-    public function __construct(string $table, string $field, array $remoteIds)
-    {
-        $this->table = $table;
-        $this->field = $field;
-        $this->remoteIds = $remoteIds;
+    public function __construct(
+        private readonly string $table,
+        private readonly string $field,
+        private readonly array $remoteIds
+    ) {
     }
 
     /**

Classes/DataHandling/Operation/Event/Handler/Message/RelationFieldValueMessage.php

@@ -14,33 +14,18 @@
  */
 class RelationFieldValueMessage implements RequiredMessageInterface
 {
-    private string $table;
-
-    private string $field;
-
-    /**
-     * @var int|string
-     */
-    private $id;
-
-    /**
-     * @var int|string|float|array
-     */
-    private $value;
-
     /**
      * @param string $table
      * @param string $field
      * @param int|string $id
      * @param int|string|float|array $value
      */
-    public function __construct(string $table, string $field, $id, $value)
-    {
-        $this->table = $table;
-        $this->field = $field;
-        // @extensionScannerIgnoreLine
-        $this->id = $id;
-        $this->value = $value;
+    public function __construct(
+        private readonly string $table,
+        private readonly string $field,
+        private $id,
+        private $value
+    ) {
     }
 
     /**

Classes/DataHandling/Operation/Event/Handler/PersistFileData.php

@@ -41,9 +41,12 @@ class PersistFileData implements RecordOperationEventHandlerInterface
 {
     protected RemoteIdMappingRepository $mappingRepository;
 
-    protected ResourceFactory $resourceFactory;
-
     protected AbstractRecordOperationEvent $event;
+    public function __construct(
+        protected ResourceFactory $resourceFactory,
+        private readonly OnlineMediaHelperRegistry $onlineMediaHelperRegistry
+    ) {
+    }
 
     /**
      * @param AbstractRecordOperationEvent $event
@@ -80,7 +83,7 @@ public function __invoke(AbstractRecordOperationEvent $event): void
             $settings['persistence.']['fileUploadFolderPath.'] ?? []
         );
 
-        $this->resourceFactory = GeneralUtility::makeInstance(ResourceFactory::class);
+        $this->resourceFactory = $this->resourceFactory;
 
         $storage = GeneralUtility::makeInstance(StorageRepository::class)->findByCombinedIdentifier($storagePath);
 
@@ -89,7 +92,7 @@ public function __invoke(AbstractRecordOperationEvent $event): void
         $replaceFile = null;
 
         if (
-            get_class($this->event->getRecordOperation()) === CreateRecordOperation::class
+            $this->event->getRecordOperation()::class === CreateRecordOperation::class
             && $storage->hasFileInFolder($fileBaseName, $downloadFolder)
         ) {
             [$fileBaseName, $replaceFile] = $this->handleExistingFile(
@@ -145,15 +148,15 @@ protected function createFileObject(
         Folder $downloadFolder,
         string $fileBaseName
     ): File {
-        if (get_class($this->event->getRecordOperation()) === CreateRecordOperation::class) {
+        if ($this->event->getRecordOperation()::class === CreateRecordOperation::class) {
             return $downloadFolder->createFile($fileBaseName);
         }
 
         try {
             $file = $this->resourceFactory->getFileObject(
                 $this->mappingRepository->get($this->event->getRecordOperation()->getRemoteId())
             );
-        } catch (FileDoesNotExistException $exception) {
+        } catch (FileDoesNotExistException) {
             if ($this->mappingRepository->get($this->event->getRecordOperation()->getRemoteId()) === 0) {
                 throw new NotFoundException(
                     'The file with remote ID "' . $this->event->getRecordOperation()->getRemoteId()
@@ -232,7 +235,8 @@ protected function fetchContentFromUrl(string $url): ?string
             if ($exception->getCode() >= 400) {
                 throw new NotFoundException(
                     'Request failed. URL: "' . $url . '" Message: "' . $exception->getMessage() . '"',
-                    1634667759711
+                    1634667759711,
+                    $exception
                 );
             }
 
@@ -284,7 +288,7 @@ protected function getDownloadFolder(
     ) {
         try {
             $downloadFolder = $this->resourceFactory->getFolderObjectFromCombinedIdentifier($storagePath);
-        } catch (FolderDoesNotExistException $exception) {
+        } catch (FolderDoesNotExistException) {
             [, $folderPath] = explode(':', $storagePath);
 
             $downloadFolder = $storage->createFolder($folderPath);
@@ -296,12 +300,7 @@ protected function getDownloadFolder(
         );
 
         if ($hashedSubfolders > 0) {
-            if ($fileBaseName === '') {
-                $fileNameHash = bin2hex(random_bytes($hashedSubfolders));
-            } else {
-                $fileNameHash = md5($fileBaseName);
-            }
-
+            $fileNameHash = $fileBaseName === '' ? bin2hex(random_bytes($hashedSubfolders)) : md5($fileBaseName);
             for ($i = 0; $i < $hashedSubfolders; $i++) {
                 $subfolderName = substr($fileNameHash, $i, 1);
 
@@ -328,7 +327,7 @@ protected function getDownloadFolder(
      */
     protected function getFileFromMediaUrl(string $url, Folder $downloadFolder, string $fileBaseName): ?File
     {
-        $onlineMediaHelperRegistry = GeneralUtility::makeInstance(OnlineMediaHelperRegistry::class);
+        $onlineMediaHelperRegistry = $this->onlineMediaHelperRegistry;
 
         $file = $onlineMediaHelperRegistry->transformUrlToFile(
             $url,
@@ -363,26 +362,26 @@ protected function getFileWithContent(array $data, Folder $downloadFolder, strin
         } elseif (($data['url'] ?? '') !== '') {
             $file = $this->getFileFromMediaUrl($data['url'], $downloadFolder, $fileBaseName);
 
-            if ($file === null) {
+            if (!$file instanceof File) {
                 $fileContent = $this->fetchContentFromUrl($data['url']);
             }
         } else {
             $fileContent = '';
         }
 
         // @extensionScannerIgnoreLine
-        if ($fileContent === '' || ($file !== null && $file->getSize() > 0)) {
+        if ($fileContent === '' || ($file instanceof File && $file->getSize() > 0)) {
             $this->handleEmptyFile();
         }
 
-        if ($fileBaseName === '' && $file === null) {
+        if ($fileBaseName === '' && !$file instanceof File) {
             throw new InvalidFileNameException(
                 'Empty file name.',
                 1643987693168
             );
         }
 
-        if ($file === null) {
+        if (!$file instanceof File) {
             $file = $this->createFileObject($downloadFolder, $fileBaseName);
 
             $file->setContents($fileContent);
@@ -409,7 +408,7 @@ protected function getUniqueFileName(string $fileName, Folder $folder): string
 
         $fileInfo = PathUtility::pathinfo($fileName);
 
-        $originalExtension = strlen($fileInfo['extension'] ?? '') > 0 ? '.' . $fileInfo['extension'] : '';
+        $originalExtension = ($fileInfo['extension'] ?? '') !== '' ? '.' . $fileInfo['extension'] : '';
 
         $fileName = $fileInfo['filename'];