Fixes for TYPO3 13, PHP 8.4

Classes/Command/DeleteCommand.php

@@ -17,7 +17,7 @@ class DeleteCommand extends AbstractCommand
 
     protected LanguageService $languageService;
 
-    public function __construct(string $name = null, FileRepository $fileRepository = null, $languageService = null)
+    public function __construct(?string $name = null, ?FileRepository $fileRepository = null, $languageService = null)
     {
         parent::__construct($name);
 

Classes/Command/ResetCommand.php

@@ -20,7 +20,7 @@ class ResetCommand extends AbstractCommand
 
     protected FileRepository $fileRepository;
 
-    public function __construct(string $name = null, Connection $connection = null, FileRepository $fileRepository = null)
+    public function __construct(?string $name = null, ?Connection $connection = null, ?FileRepository $fileRepository = null)
     {
         parent::__construct($name);
 

Classes/Form/Element/ShowDeleteFiles.php

@@ -18,14 +18,19 @@
  */
 
 use IchHabRecht\Filefill\Repository\FileRepository;
+use Symfony\Component\DependencyInjection\Attribute\Autoconfigure;
 use TYPO3\CMS\Backend\Form\Element\AbstractFormElement;
 use TYPO3\CMS\Core\Imaging\IconFactory;
 use TYPO3\CMS\Core\Imaging\IconSize;
 use TYPO3\CMS\Core\Localization\LanguageService;
+use TYPO3\CMS\Core\Localization\LanguageServiceFactory;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 
+#[Autoconfigure(public: true)]
 class ShowDeleteFiles extends AbstractFormElement
 {
+    protected LanguageService $languageService;
+
     /**
      * Container objects give $nodeFactory down to other containers.
      *
@@ -34,8 +39,9 @@ class ShowDeleteFiles extends AbstractFormElement
      */
     public function __construct(
         protected readonly FileRepository $fileRepository,
-        protected readonly LanguageService $languageService
+        protected readonly LanguageServiceFactory $languageServiceFactory
     ) {
+        $this->languageService = $this->languageServiceFactory->createFromUserPreferences($GLOBALS['BE_USER']);
     }
 
     /**

Classes/Form/Element/ShowMissingFiles.php

@@ -18,23 +18,29 @@
  */
 
 use Doctrine\DBAL\ParameterType;
+use Symfony\Component\DependencyInjection\Attribute\Autoconfigure;
 use TYPO3\CMS\Backend\Form\Element\AbstractFormElement;
 use TYPO3\CMS\Core\Database\ConnectionPool;
 use TYPO3\CMS\Core\Imaging\IconFactory;
 use TYPO3\CMS\Core\Imaging\IconSize;
 use TYPO3\CMS\Core\Localization\LanguageService;
+use TYPO3\CMS\Core\Localization\LanguageServiceFactory;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 
+#[Autoconfigure(public: true)]
 class ShowMissingFiles extends AbstractFormElement
 {
+    protected LanguageService $languageService;
+
     /**
      * Container objects give $nodeFactory down to other containers.
      *
      * @param LanguageService|null $languageService
      * @throws \InvalidArgumentException
      */
-    public function __construct(protected readonly LanguageService $languageService)
+    public function __construct(protected readonly LanguageServiceFactory $languageServiceFactory)
     {
+        $this->languageService = $this->languageServiceFactory->createFromUserPreferences($GLOBALS['BE_USER']);
     }
 
     /**

Classes/Repository/FileRepository.php

@@ -34,9 +34,9 @@ class FileRepository
     protected ResourceFactory $resourceFactory;
 
     public function __construct(
-        Connection $connection = null,
-        ProcessedFileRepository $processedFileRepository = null,
-        ResourceFactory $resourceFactory = null
+        ?Connection $connection = null,
+        ?ProcessedFileRepository $processedFileRepository = null,
+        ?ResourceFactory $resourceFactory = null
     ) {
         $this->connection = $connection ?: GeneralUtility::makeInstance(ConnectionPool::class)->getConnectionForTable('sys_file');
         $this->processedFileRepository = $processedFileRepository ?: GeneralUtility::makeInstance(ProcessedFileRepository::class);

Classes/Resource/Handler/DomainResource.php

@@ -35,7 +35,7 @@ class DomainResource implements RemoteResourceInterface
      * @param string $configuration
      * @param ?RequestFactory $requestFactory
      */
-    public function __construct($configuration, RequestFactory $requestFactory = null)
+    public function __construct($configuration, ?RequestFactory $requestFactory = null)
     {
         $this->requestFactory = $requestFactory ?: GeneralUtility::makeInstance(RequestFactory::class);
         $urlParts = parse_url((string)$configuration);
@@ -49,7 +49,7 @@ public function __construct($configuration, RequestFactory $requestFactory = nul
      * @param FileInterface|null $fileObject
      * @return bool
      */
-    public function hasFile($fileIdentifier, $filePath, FileInterface $fileObject = null)
+    public function hasFile($fileIdentifier, $filePath, ?FileInterface $fileObject = null)
     {
         try {
             $response = $this->requestFactory->request($this->url . ltrim($filePath, '/'), 'HEAD');
@@ -66,7 +66,7 @@ public function hasFile($fileIdentifier, $filePath, FileInterface $fileObject =
      * @param FileInterface|null $fileObject
      * @return resource|string
      */
-    public function getFile($fileIdentifier, $filePath, FileInterface $fileObject = null)
+    public function getFile($fileIdentifier, $filePath, ?FileInterface $fileObject = null)
     {
         try {
             $fileName = $this->url . ltrim($filePath, '/');

Classes/Resource/RemoteResourceCollection.php

@@ -62,7 +62,7 @@ class RemoteResourceCollection implements LoggerAwareInterface
      * @param ResourceFactory|null $resourceFactory
      * @param FileRepository|null $fileRepository
      */
-    public function __construct(array $resources, ResourceFactory $resourceFactory = null, FileRepository $fileRepository = null)
+    public function __construct(array $resources, ?ResourceFactory $resourceFactory = null, ?FileRepository $fileRepository = null)
     {
         $this->resources = $resources;
         $this->resourceFactory = $resourceFactory ?: GeneralUtility::makeInstance(ResourceFactory::class);

Classes/Resource/RemoteResourceInterface.php

@@ -27,13 +27,13 @@ interface RemoteResourceInterface
      * @param FileInterface|null $fileObject
      * @return bool
      */
-    public function hasFile($fileIdentifier, $filePath, FileInterface $fileObject = null);
+    public function hasFile($fileIdentifier, $filePath, ?FileInterface $fileObject = null);
 
     /**
      * @param string $fileIdentifier
      * @param string $filePath
      * @param FileInterface|null $fileObject
      * @return resource|string
      */
-    public function getFile($fileIdentifier, $filePath, FileInterface $fileObject = null);
+    public function getFile($fileIdentifier, $filePath, ?FileInterface $fileObject = null);
 }

Configuration/Services.yaml

@@ -4,6 +4,9 @@ services:
         autoconfigure: true
         public: false
 
+    IchHabRecht\Filefill\:
+        resource: '../Classes/*'
+
     IchHabRecht\Filefill\EventListener\ResourceStorageInitializationEventListener:
         tags:
             -   name: psr.logger_aware