[#14349] - Adjusting the interfaces again

phalcon · Sep 7, 2019 · 8ad287c · 8ad287c
1 parent a92d80e
commit 8ad287c
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 15 deletions.
diff --git a/phalcon/Flash/AbstractFlash.zep b/phalcon/Flash/AbstractFlash.zep
@@ -92,9 +92,9 @@ abstract class AbstractFlash extends AbstractDiAware implements FlashInterface
      * $flash->error("This is an error");
      *```
      */
-    public function error(string message) -> void
+    public function error(string message) -> string
     {
-        this->{"message"}("error", message);
+        return this->{"message"}("error", message);
     }
 
     /**
@@ -147,9 +147,9 @@ abstract class AbstractFlash extends AbstractDiAware implements FlashInterface
      * $flash->notice("This is an information");
      *```
      */
-    public function notice(string message) -> void
+    public function notice(string message) -> string
     {
-        this->{"message"}("notice", message);
+        return this->{"message"}("notice", message);
     }
 
     /**
@@ -220,9 +220,9 @@ abstract class AbstractFlash extends AbstractDiAware implements FlashInterface
      * $flash->success("The process was finished successfully");
      *```
      */
-    public function success(string message) -> void
+    public function success(string message) -> string
     {
-        this->{"message"}("success", message);
+        return this->{"message"}("success", message);
     }
 
     /**
@@ -311,9 +311,9 @@ abstract class AbstractFlash extends AbstractDiAware implements FlashInterface
      * $flash->warning("Hey, this is important");
      *```
      */
-    public function warning(string message) -> void
+    public function warning(string message) -> string
     {
-        this->{"message"}("warning", message);
+        return this->{"message"}("warning", message);
     }
 
 

diff --git a/phalcon/Flash/Direct.zep b/phalcon/Flash/Direct.zep
@@ -21,7 +21,7 @@ class Direct extends AbstractFlash
     /**
      * Outputs a message
      */
-    public function message(string type, var message) -> string
+    public function message(string type, var message) -> string | null
     {
         return this->outputMessage(type, message);
     }

diff --git a/phalcon/Flash/FlashInterface.zep b/phalcon/Flash/FlashInterface.zep
@@ -20,25 +20,25 @@ interface FlashInterface
     /**
      * Shows a HTML error message
      */
-    public function error(string message) -> void;
+    public function error(string message) -> string;
 
     /**
      * Outputs a message
      */
-    public function message(string type, string message) -> void;
+    public function message(string type, string message) -> string | null;
 
     /**
      * Shows a HTML notice/information message
      */
-    public function notice(string message) -> void;
+    public function notice(string message) -> string;
 
     /**
      * Shows a HTML success message
      */
-    public function success(string message) -> void;
+    public function success(string message) -> string;
 
     /**
      * Shows a HTML warning message
      */
-    public function warning(string message) -> void;
+    public function warning(string message) -> string;
 }
diff --git a/phalcon/Flash/Session.zep b/phalcon/Flash/Session.zep
@@ -57,7 +57,7 @@ class Session extends AbstractFlash
     /**
      * Adds a message to the session flasher
      */
-    public function message(string type, string message) -> void
+    public function message(string type, string message) -> string | null
     {
         var messages;
 
@@ -70,6 +70,8 @@ class Session extends AbstractFlash
         let messages[type][] = message;
 
         this->setSessionMessages(messages);
+
+        return null;
     }
 
     /**