[TASK] Ensure compatibility with PHP 8.1, references #350

Author: fsuter

Classes/Domain/Model/Log.php

@@ -28,7 +28,9 @@ class Log extends AbstractEntity
     /**
      * @var int Run status (based on FlashMessage codes)
      */
-    protected int $status = ContextualFeedbackSeverity::NOTICE->value;
+// TODO: switch when support for PHP 8.1 is dropped (or get rid of that class entirely)
+//    protected int $status = ContextualFeedbackSeverity::NOTICE->value;
+    protected int $status = -2;
 
     /**
      * @var \DateTime|null Run date and time

Classes/Handler/ArrayHandler.php

@@ -81,7 +81,7 @@ public function handleData($rawData, Importer $importer): array
                             'Using arrayPath property (value %s) returned an empty set',
                             $generalConfiguration['arrayPath']
                         ),
-                        ContextualFeedbackSeverity::WARNING->value
+                        ContextualFeedbackSeverity::WARNING
                     );
                     return [];
                 }

Classes/Handler/XmlHandler.php

@@ -75,7 +75,7 @@ public function handleData($rawData, Importer $importer): array
             } catch (\Exception $e) {
                 $importer->addMessage(
                     $e->getMessage(),
-                    ContextualFeedbackSeverity::WARNING->value
+                    ContextualFeedbackSeverity::WARNING
                 );
             }
         } else {

Classes/Importer.php

@@ -265,7 +265,7 @@ public function synchronize(string $table, $index): array
                         $e->getMessage(),
                     ]
                 ),
-                ContextualFeedbackSeverity::WARNING->value
+                ContextualFeedbackSeverity::WARNING
             );
         } catch (NoConfigurationException $e) {
             $this->addMessage(
@@ -401,7 +401,7 @@ public function runSteps(): void
                             'LLL:EXT:external_import/Resources/Private/Language/ExternalImport.xlf:importAborted',
                             'external_import'
                         ),
-                        ContextualFeedbackSeverity::WARNING->value
+                        ContextualFeedbackSeverity::WARNING
                     );
                 }
                 $this->currentData = $step->getData();
@@ -532,12 +532,12 @@ public function debug(string $message, int $severity = 0, $data = null): void
      * when the synchronization is complete.
      *
      * @param string $text The message itself
-     * @param int $status Status of the message. Expected is "success", "warning" or "error"
+     * @param ContextualFeedbackSeverity $status Status of the message
      */
-    public function addMessage(string $text, int $status = ContextualFeedbackSeverity::ERROR->value): void
+    public function addMessage(string $text, ContextualFeedbackSeverity $status = ContextualFeedbackSeverity::ERROR): void
     {
         if (!empty($text)) {
-            $this->messages[$status][] = $text;
+            $this->messages[$status->value][] = $text;
         }
     }
 
@@ -559,6 +559,8 @@ public function resetMessages(): void
         $this->messages = [
             ContextualFeedbackSeverity::ERROR->value => [],
             ContextualFeedbackSeverity::WARNING->value => [],
+            ContextualFeedbackSeverity::INFO->value => [],
+            ContextualFeedbackSeverity::NOTICE->value => [],
             ContextualFeedbackSeverity::OK->value => [],
         ];
     }

Classes/Step/StoreDataStep.php

@@ -518,31 +518,31 @@ public function run(): void
                     null,
                     [$inserts]
                 ),
-                ContextualFeedbackSeverity::OK->value
+                ContextualFeedbackSeverity::OK
             );
             $this->importer->addMessage(
                 LocalizationUtility::translate(
                     'LLL:EXT:external_import/Resources/Private/Language/ExternalImport.xlf:records_updated',
                     null,
                     [$updates]
                 ),
-                ContextualFeedbackSeverity::OK->value
+                ContextualFeedbackSeverity::OK
             );
             $this->importer->addMessage(
                 LocalizationUtility::translate(
                     'LLL:EXT:external_import/Resources/Private/Language/ExternalImport.xlf:records_deleted',
                     null,
                     [$deletes]
                 ),
-                ContextualFeedbackSeverity::OK->value
+                ContextualFeedbackSeverity::OK
             );
             $this->importer->addMessage(
                 LocalizationUtility::translate(
                     'LLL:EXT:external_import/Resources/Private/Language/ExternalImport.xlf:records_moved',
                     null,
                     [$moves]
                 ),
-                ContextualFeedbackSeverity::OK->value
+                ContextualFeedbackSeverity::OK
             );
             // Store the number of operations in the reporting utility
             $this->importer->getReportingUtility()->setValueForStep(
@@ -1053,7 +1053,7 @@ protected function reportTceErrors(array $errorLog): void
                 LocalizationUtility::translate(
                     'LLL:EXT:external_import/Resources/Private/Language/ExternalImport.xlf:things_happened'
                 ),
-                ContextualFeedbackSeverity::WARNING->value
+                ContextualFeedbackSeverity::WARNING
             );
         }
     }

Classes/Utility/SlugUtility.php

@@ -123,7 +123,7 @@ public function generateSlug(string $table, string $field, array $fieldConfigura
                         $e->getMessage(),
                         $e->getCode()
                     ),
-                    ContextualFeedbackSeverity::NOTICE->value
+                    ContextualFeedbackSeverity::NOTICE
                 );
             }
         } elseif (GeneralUtility::inList('uniqueInPid', $fieldConfiguration['eval'] ?? '')) {
@@ -152,7 +152,7 @@ public function generateSlug(string $table, string $field, array $fieldConfigura
                         $e->getMessage(),
                         $e->getCode()
                     ),
-                    ContextualFeedbackSeverity::NOTICE->value
+                    ContextualFeedbackSeverity::NOTICE
                 );
             }
         } else {

Tests/Unit/ImporterTest.php

@@ -104,7 +104,7 @@ public function getMessagesInitiallyReturnsEmptyStructure(): void
      */
     public function addMessagesAddsMessage(): void
     {
-        $this->subject->addMessage('foo', ContextualFeedbackSeverity::WARNING->value);
+        $this->subject->addMessage('foo', ContextualFeedbackSeverity::WARNING);
         self::assertCount(
             1,
             $this->subject->getMessages()[ContextualFeedbackSeverity::WARNING->value]
@@ -116,12 +116,14 @@ public function addMessagesAddsMessage(): void
      */
     public function resetMessagesInitiallyPreparesEmptyStructure(): void
     {
-        $this->subject->addMessage('foo', ContextualFeedbackSeverity::WARNING->value);
+        $this->subject->addMessage('foo', ContextualFeedbackSeverity::WARNING);
         $this->subject->resetMessages();
         self::assertSame(
             [
                 ContextualFeedbackSeverity::ERROR->value => [],
                 ContextualFeedbackSeverity::WARNING->value => [],
+                ContextualFeedbackSeverity::INFO->value => [],
+                ContextualFeedbackSeverity::NOTICE->value => [],
                 ContextualFeedbackSeverity::OK->value => [],
             ],
             $this->subject->getMessages()