[TASK] Adapt base code for higher PHP versions and TYPO3 13, references

#350

Classes/Controller/LogAjaxController.php

@@ -35,8 +35,9 @@ class LogAjaxController
      * @param ServerRequestInterface $request
      * @param ResponseInterface|null $response
      * @return ResponseInterface
+     * @throws \JsonException
      */
-    public function getAction(ServerRequestInterface $request, ResponseInterface $response = null): ResponseInterface
+    public function getAction(ServerRequestInterface $request, ?ResponseInterface $response): ResponseInterface
     {
         // Process query parameters
         $queryParameters = GeneralUtility::makeInstance(

Classes/Domain/Model/Configuration.php

@@ -96,11 +96,6 @@ public function __construct()
         $this->processedConfiguration = GeneralUtility::makeInstance(ProcessedConfiguration::class);
     }
 
-    public function __toString()
-    {
-        return self::class;
-    }
-
     /**
      * Restructures part of the configuration for easier use during the import process.
      */
@@ -197,7 +192,7 @@ public function getGeneralConfiguration(): array
      * @param array $generalConfiguration
      * @param array|null $defaultSteps List of default steps (if null will be guessed by the repository)
      */
-    public function setGeneralConfiguration(array $generalConfiguration, array $defaultSteps = null): void
+    public function setGeneralConfiguration(array $generalConfiguration, ?array $defaultSteps): void
     {
         $this->generalConfiguration = $generalConfiguration;
         $stepUtility = GeneralUtility::makeInstance(StepUtility::class);

Classes/Domain/Model/Dto/QueryParameters.php

@@ -64,18 +64,13 @@ class QueryParameters
      *
      * @param array|null $parameters Query parameters from the AJAX query
      */
-    public function __construct(array $parameters = null)
+    public function __construct(?array $parameters)
     {
         if ($parameters !== null) {
             $this->setAllParameters($parameters);
         }
     }
 
-    public function __toString()
-    {
-        return self::class;
-    }
-
     /**
      * Receives the raw parameters and set the various member variables after validation and sanitation.
      *

Classes/Domain/Repository/ConfigurationRepository.php

@@ -216,7 +216,7 @@ public function findAllGroups(): array
      * @return Configuration
      * @throws \Cobweb\ExternalImport\Exception\NoConfigurationException
      */
-    public function findConfigurationObject(string $table, $index, array $defaultSteps = null): Configuration
+    public function findConfigurationObject(string $table, $index, ?array $defaultSteps): Configuration
     {
         $configuration = GeneralUtility::makeInstance(Configuration::class);
         $externalConfiguration = $this->findByTableAndIndex($table, $index);

Classes/Handler/XmlHandler.php

@@ -351,7 +351,7 @@ public function getXmlValue(\DOMNode $node): string
      * @return \DOMNodeList List of found nodes
      * @throws \Exception
      */
-    public function selectNodeWithXpath(\DOMXPath $xPathObject, string $xPath, \DOMNode $context = null): \DOMNodeList
+    public function selectNodeWithXpath(\DOMXPath $xPathObject, string $xPath, ?\DOMNode $context): \DOMNodeList
     {
         $resultNodes = $xPathObject->evaluate($xPath, $context);
         if ($resultNodes->length > 0) {

Classes/Importer.php

@@ -31,6 +31,7 @@
 use Psr\Log\LoggerAwareTrait;
 use TYPO3\CMS\Core\Configuration\ExtensionConfiguration;
 use TYPO3\CMS\Core\Messaging\AbstractMessage;
+use TYPO3\CMS\Core\Type\ContextualFeedbackSeverity;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Extbase\Utility\LocalizationUtility;
 
@@ -46,7 +47,7 @@ class Importer implements LoggerAwareInterface
     /**
      * @var array Extension configuration
      */
-    protected $extensionConfiguration = [];
+    protected array $extensionConfiguration = [];
 
     /**
      * @var array List of result messages
@@ -214,7 +215,7 @@ public function __toString()
      * @param array|null $defaultSteps List of default steps (if null will be guessed by the Configuration object)
      * @throws NoConfigurationException
      */
-    protected function initialize(string $table, $index, array $defaultSteps = null): void
+    protected function initialize(string $table, $index, ?array $defaultSteps): void
     {
         // Assign back-reference to reporting utility
         $this->reportingUtility->setImporter($this);
@@ -265,7 +266,7 @@ public function synchronize(string $table, $index): array
                         $e->getMessage(),
                     ]
                 ),
-                AbstractMessage::WARNING
+                ContextualFeedbackSeverity::WARNING->value
             );
         } catch (NoConfigurationException $e) {
             $this->addMessage(
@@ -401,7 +402,7 @@ public function runSteps(): void
                             'LLL:EXT:external_import/Resources/Private/Language/ExternalImport.xlf:importAborted',
                             'external_import'
                         ),
-                        AbstractMessage::WARNING
+                        ContextualFeedbackSeverity::WARNING->value
                     );
                 }
                 $this->currentData = $step->getData();
@@ -534,7 +535,7 @@ public function debug(string $message, int $severity = 0, $data = null): void
      * @param string $text The message itself
      * @param int $status Status of the message. Expected is "success", "warning" or "error"
      */
-    public function addMessage(string $text, int $status = AbstractMessage::ERROR): void
+    public function addMessage(string $text, int $status = ContextualFeedbackSeverity::ERROR->value): void
     {
         if (!empty($text)) {
             $this->messages[$status][] = $text;
@@ -557,9 +558,9 @@ public function getMessages(): array
     public function resetMessages(): void
     {
         $this->messages = [
-                AbstractMessage::ERROR => [],
-                AbstractMessage::WARNING => [],
-                AbstractMessage::OK => [],
+            ContextualFeedbackSeverity::ERROR->value => [],
+            ContextualFeedbackSeverity::WARNING->value => [],
+            ContextualFeedbackSeverity::OK->value => [],
         ];
     }