Amélioration de l'import des messages du FlashMessenger par l'aide de vue Messenger

src/UnicaenApp/View/Helper/Messenger.php

@@ -164,79 +164,77 @@ class Messenger extends AbstractHelper implements MessageAwareInterface, EventMa
     /**
      * Importe les messages n-1 du FlashMessenger.
      *
-     * @param string $namespace Facultatif, ex: 'these/danger' ou 'these/*'
+     * @param string $namespace
      * @return static
      */
     protected function importFlashMessages($namespace = null)
     {
-        $fm = $this->getPluginFlashMessenger();
-
-        if ($namespace) {
-            $array = $this->extractSeveritiesAndNamespaces($namespace);
-
-            foreach ($array as $sev => $ns) {
-                foreach ($fm->getMessagesFromNamespace($ns) as $message) {
-                    $this->addMessage($message, $sev);
-                }
-            }
-        }
-        else {
-            foreach ($fm->getErrorMessages() as $message) {
-                $this->addMessage($message, self::ERROR);
-            }
-            foreach ($fm->getSuccessMessages() as $message) {
-                $this->addMessage($message, self::SUCCESS);
-            }
-            foreach ($fm->getInfoMessages() as $message) {
-                $this->addMessage($message, self::INFO);
-            }
-            foreach ($fm->getWarningMessages() as $message) {
-                $this->addMessage($message, self::WARNING);
-            }
-        }
-
-        return $this;
+        return $this->_importFromFlashMessages($currentMessages = false, $namespace);
     }
 
     /**
      * Importe les messages courants du FlashMessenger.
      *
-     * @param string $namespace Facultatif, ex: 'these/danger' ou 'these/*'
+     * @param string $namespace
      * @return static
      */
     protected function importCurrentFlashMessages($namespace = null)
     {
+        return $this->_importFromFlashMessages($currentMessages = true, $namespace);
+    }
+
+    /**
+     * @param bool   $currentMessages
+     * @param string $namespace Facultatif, ex: 'info', 'these/danger', 'these/*', 'these' (i.e. 'these/*')
+     * @return static
+     */
+    private function _importFromFlashMessages($currentMessages, $namespace = null)
+    {
+        $getMethod = $currentMessages ? 'getCurrentMessagesFromNamespace' : 'getMessagesFromNamespace';
+
         $fm = $this->getPluginFlashMessenger();
 
         if ($namespace) {
+            $severities = [self::ERROR, self::SUCCESS, self::INFO, self::WARNING];
+            if (in_array($namespace, $severities)) {
+                foreach ($fm->$getMethod($namespace) as $message) {
+                    $this->addMessage($message, $namespace);
+                }
+                if ($currentMessages) {
+                    /* Si on importe alors on nettoie pour éviter un deuxième affichage */
+                    $fm->clearCurrentMessagesFromNamespace($namespace);
+                }
+            } else {
                 $array = $this->extractSeveritiesAndNamespaces($namespace);
-
                 foreach ($array as $sev => $ns) {
-                foreach ($fm->getCurrentMessagesFromNamespace($ns) as $message) {
+                    foreach ($fm->$getMethod($ns) as $message) {
                         $this->addMessage($message, $sev);
                     }
-
+                    if ($currentMessages) {
                         /* Si on importe alors on nettoie pour éviter un deuxième affichage */
                         $fm->clearCurrentMessagesFromNamespace($ns);
                     }
                 }
+            }
+        }
         else {
-            foreach ($fm->getCurrentErrorMessages() as $message) {
+            foreach ($fm->$getMethod('error') as $message) {
                 $this->addMessage($message, self::ERROR);
             }
-            foreach ($fm->getCurrentSuccessMessages() as $message) {
+            foreach ($fm->$getMethod('success') as $message) {
                 $this->addMessage($message, self::SUCCESS);
             }
-            foreach ($fm->getCurrentInfoMessages() as $message) {
+            foreach ($fm->$getMethod('info') as $message) {
                 $this->addMessage($message, self::INFO);
             }
-            foreach ($fm->getCurrentWarningMessages() as $message) {
+            foreach ($fm->$getMethod('warning') as $message) {
                 $this->addMessage($message, self::WARNING);
             }
 
-            /* Si on importe alors on nettoie pour éviter un deuxième affichage */
+            if ($currentMessages) {
                 $fm->clearCurrentMessagesFromContainer();
             }
+        }
 
         return $this;
     }
@@ -247,12 +245,18 @@ class Messenger extends AbstractHelper implements MessageAwareInterface, EventMa
      */
     private function extractSeveritiesAndNamespaces($namespace)
     {
-        // $namespace peut être de la forme 'namespace/severity' (ex: 'these/danger')
-        if (($pos = strrpos($namespace, $sep = self::NAMESPACED_SEVERITY_SEPARATOR)) !== false) {
+        // Normalisation : $namespace doit être de la forme 'namespace/severity' ou 'namespace/*'.
+        // Ex: 'these/danger' ou 'these/*'
+        $separatorFound = strrpos($namespace, $sep = self::NAMESPACED_SEVERITY_SEPARATOR) !== false;
+        if (! $separatorFound) {
+            $namespace = $namespace . '/*';
+        }
+
         $parts = explode($sep, $namespace);
         $severity = array_pop($parts);
-            // si $namespace est de la forme 'namespace/*' (ex: 'these/*'), cela revient à importer les namespaces
-            // 'namespace/danger', 'namespace/success', 'namespace/info' et 'namespace/warning'
+
+        // Si $namespace est de la forme 'namespace/*', cela revient à importer les namespaces
+        // 'namespace/danger', 'namespace/success', 'namespace/info' et 'namespace/warning'.
         if ($severity === '*') {
             $namespacePrefix = implode(self::NAMESPACED_SEVERITY_SEPARATOR, $parts) . '/';
             $array = [
@@ -266,12 +270,6 @@ class Messenger extends AbstractHelper implements MessageAwareInterface, EventMa
                 $severity => $namespace,
             ];
         }
-        }
-        else {
-            $array = [
-                self::INFO => $namespace,
-            ];
-        }
 
         return $array;
     }