Fix: rendering empty messages when use chained empty methods warning()->error();

Author: apphp

CHANGELOG

@@ -3,6 +3,7 @@ Version 1.4.x -
 - New: added possibility to define "dark" message
 - Eng: possibility to use short syntax
 - Fix: wrong rendering on "error" message
+- Fix: rendering empty messages when use chained empty methods warning()->error();
 
 
 Version 1.3.1 - Dec 17, 2020

src/Apphp/Flash/FlashNotifier.php

@@ -24,169 +24,200 @@ class FlashNotifier
      */
     public $messages;
 
+    /**
+     * Collection of allowed methods
+     * @var array
+     */
+    protected $allowedMethods = ['primary', 'secondary', 'success', 'warning', 'info', 'error', 'danger', 'light', 'dark'];
+
+
     /**
      * Constructor - creates a new instance
      *
      * @param  SessionFlashStore  $session
      */
-    function __construct(SessionFlashStore $session)
+    public function __construct(SessionFlashStore $session)
     {
         $this->session  = $session;
         $this->messages = collect();
     }
 
     /**
-     * Return a primary message
+     * Magic method implementing methods overloading
      *
-     * @param  string|null  $message
-     * @param  bool  $important
+     * @param $name
+     * @param $arguments
      * @return $this
      */
-    public function primary($message = null, $important = false)
+    public function __call($name = '', $arguments = [])
     {
-        return $this->message($message, 'primary', $important);
+        if (in_array($name, $this->allowedMethods)) {
+
+            // Return the same object without changes if no argument passed
+            if (empty($arguments)) {
+                return $this;
+            }
+
+            if (count($arguments) > 1) {
+                return $this->$name($arguments[0], $arguments[1]);
+            } else {
+                return $this->$name($arguments[0]);
+            }
+        }
     }
 
     /**
-     * Return a secondary message
+     * Save a message
      *
      * @param  string|null  $message
+     * @param  string|null  $level
      * @param  bool  $important
      * @return $this
      */
-    public function secondary($message = null, $important = false)
+    public function message($message = null, $level = null, $important = false)
     {
-        return $this->message($message, 'secondary', $important);
+        if ( ! $message instanceof Message) {
+            $message = new Message(compact('message', 'level'));
+        }
+
+        $this->messages->push($message);
+
+        if ($important) {
+            $this->important();
+        }
+
+        return $this->flash();
     }
 
     /**
-     * Return a success message
+     * Change flash to be important
      *
-     * @param  string|null  $message
-     * @param  bool  $important
      * @return $this
      */
-    public function success($message = null, $important = false)
+    public function important()
     {
-        return $this->message($message, 'success', $important);
+        return $this->updateLastMessage(['important' => true]);
     }
 
     /**
-     * Return an error message
+     * Clear all messages
+     *
+     * @return $this
+     */
+    public function clear()
+    {
+        $this->messages = collect();
+
+        return $this;
+    }
+
+    /**
+     * Return a primary message
      *
      * @param  string|null  $message
      * @param  bool  $important
      * @return $this
      */
-    public function error($message = null, $important = false)
+    protected function primary($message = null, $important = false)
     {
-        return $this->danger($message, $important);
+        return $this->message($message, 'primary', $important);
     }
 
     /**
-     * Return a danger message
-     * Alias to error()
+     * Return a secondary message
      *
      * @param  string|null  $message
      * @param  bool  $important
      * @return $this
      */
-    public function danger($message = null, $important = false)
+    protected function secondary($message = null, $important = false)
     {
-        return $this->message($message, 'danger', $important);
+        return $this->message($message, 'secondary', $important);
     }
 
     /**
-     * Return a warning message
+     * Return a success message
      *
      * @param  string|null  $message
      * @param  bool  $important
      * @return $this
      */
-    public function warning($message = null, $important = false)
+    protected function success($message = null, $important = false)
     {
-        return $this->message($message, 'warning', $important);
+        return $this->message($message, 'success', $important);
     }
 
     /**
-     * Return an information message
+     * Return a warning message
      *
      * @param  string|null  $message
      * @param  bool  $important
      * @return $this
      */
-    public function info($message = null, $important = false)
+    protected function warning($message = null, $important = false)
     {
-        return $this->message($message, 'info', $important);
+        return $this->message($message, 'warning', $important);
     }
 
     /**
-     * Return a simple light message
+     * Return an information message
      *
      * @param  string|null  $message
      * @param  bool  $important
      * @return $this
      */
-    public function light($message = null, $important = false)
+    protected function info($message = null, $important = false)
     {
-        return $this->message($message, 'light', $important);
+        return $this->message($message, 'info', $important);
     }
 
     /**
-     * Return a simple dark message
+     * Return an error message
      *
      * @param  string|null  $message
      * @param  bool  $important
      * @return $this
      */
-    public function dark($message = null, $important = false)
+    protected function error($message = null, $important = false)
     {
-        return $this->message($message, 'light', $important);
+        return $this->danger($message, $important);
     }
 
     /**
-     * Save a message
+     * Return a danger message
+     * Alias to error()
      *
      * @param  string|null  $message
-     * @param  string|null  $level
      * @param  bool  $important
      * @return $this
      */
-    public function message($message = null, $level = null, $important = false)
+    protected function danger($message = null, $important = false)
     {
-        if ( ! $message instanceof Message) {
-            $message = new Message(compact('message', 'level'));
-        }
-
-        $this->messages->push($message);
-
-        if ($important) {
-            $this->important();
-        }
-
-        return $this->flash();
+        return $this->message($message, 'danger', $important);
     }
 
     /**
-     * Change flash to be important
+     * Return a simple light message
      *
+     * @param  string|null  $message
+     * @param  bool  $important
      * @return $this
      */
-    public function important()
+    protected function light($message = null, $important = false)
     {
-        return $this->updateLastMessage(['important' => true]);
+        return $this->message($message, 'light', $important);
     }
 
     /**
-     * Clear all messages
+     * Return a simple dark message
      *
+     * @param  string|null  $message
+     * @param  bool  $important
      * @return $this
      */
-    public function clear()
+    protected function dark($message = null, $important = false)
     {
-        $this->messages = collect();
-
-        return $this;
+        return $this->message($message, 'light', $important);
     }
 
     /**