From 4dd4f1ca3319bcc9b96dc64ad7d315fd5262fdd5 Mon Sep 17 00:00:00 2001
From: seyfer <seyferseed@mail.ru>
Date: Tue, 14 Mar 2017 19:42:17 +0700
Subject: [PATCH 1/4] add gitignore and composer.lock MUST be under git

---
 .gitignore    |  3 +++
 composer.lock | 19 +++++++++++++++++++
 2 files changed, 22 insertions(+)
 create mode 100644 .gitignore
 create mode 100644 composer.lock

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..e22063f
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,3 @@
+# Created by .ignore support plugin (hsz.mobi)
+.idea/
+vendor/
diff --git a/composer.lock b/composer.lock
new file mode 100644
index 0000000..fba8b32
--- /dev/null
+++ b/composer.lock
@@ -0,0 +1,19 @@
+{
+    "_readme": [
+        "This file locks the dependencies of your project to a known state",
+        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
+        "This file is @generated automatically"
+    ],
+    "content-hash": "1abec36d4e896f3de67ced57d4be35c9",
+    "packages": [],
+    "packages-dev": [],
+    "aliases": [],
+    "minimum-stability": "stable",
+    "stability-flags": [],
+    "prefer-stable": false,
+    "prefer-lowest": false,
+    "platform": {
+        "php": ">=5.4.0"
+    },
+    "platform-dev": []
+}

From 2d9da661e825dec3ba600eb5973db6225f448c3e Mon Sep 17 00:00:00 2001
From: seyfer <seyferseed@mail.ru>
Date: Tue, 14 Mar 2017 19:43:16 +0700
Subject: [PATCH 2/4] fix fromatting to PSR

---
 src/FlashMessages.php | 289 +++++++++++++++++++++---------------------
 1 file changed, 148 insertions(+), 141 deletions(-)

diff --git a/src/FlashMessages.php b/src/FlashMessages.php
index 140b3bb..d1a75db 100644
--- a/src/FlashMessages.php
+++ b/src/FlashMessages.php
@@ -1,14 +1,15 @@
 <?php
 namespace Plasticbrain\FlashMessages;
 
-class FlashMessages {
+class FlashMessages
+{
 
     // Message types and shortcuts
     const INFO    = 'i';
     const SUCCESS = 's';
     const WARNING = 'w';
     const ERROR   = 'e';
-    
+
     // Default message type
     const defaultType = self::INFO;
 
@@ -24,29 +25,29 @@ class FlashMessages {
     // 
     protected $msgTypes = [
         self::ERROR   => 'error',
-        self::WARNING => 'warning', 
-        self::SUCCESS => 'success', 
-        self::INFO    => 'info', 
+        self::WARNING => 'warning',
+        self::SUCCESS => 'success',
+        self::INFO    => 'info',
     ];
-    
+
     // Each message gets wrapped in this
-    protected $msgWrapper = "<div class='%s'>%s</div>\n"; 
-    
+    protected $msgWrapper = "<div class='%s'>%s</div>\n";
+
     // Prepend and append to each message (inside of the wrapper)
-    protected $msgBefore = '';  
-    protected $msgAfter  = ''; 
-    
+    protected $msgBefore = '';
+    protected $msgAfter  = '';
+
     // HTML for the close button
-    protected $closeBtn  = '<button type="button" class="close" 
+    protected $closeBtn = '<button type="button" class="close" 
                                 data-dismiss="alert" 
                                 aria-label="Close">
                                 <span aria-hidden="true">&times;</span>
                             </button>';
-    
+
     // CSS Classes
     protected $stickyCssClass = 'sticky';
-    protected $msgCssClass = 'alert dismissable';
-    protected $cssClassMap = [ 
+    protected $msgCssClass    = 'alert dismissable';
+    protected $cssClassMap    = [
         self::INFO    => 'alert-info',
         self::SUCCESS => 'alert-success',
         self::WARNING => 'alert-warning',
@@ -60,13 +61,11 @@ class FlashMessages {
     protected $msgId;
 
 
-
-
     /**
      * __construct
      *
      */
-    public function __construct() 
+    public function __construct()
     {
 
         // Generate a unique ID for this user and session
@@ -79,133 +78,133 @@ public function __construct()
 
     /**
      * Add an info message
-     * 
-     * @param  string  $message      The message text
-     * @param  string  $redirectUrl  Where to redirect once the message is added
-     * @param  boolean $sticky       Sticky the message (hides the close button)
+     *
+     * @param  string $message The message text
+     * @param  string $redirectUrl Where to redirect once the message is added
+     * @param  boolean $sticky Sticky the message (hides the close button)
      * @return object
-     * 
+     *
      */
-    public function info($message, $redirectUrl=null, $sticky=false)
+    public function info($message, $redirectUrl = null, $sticky = false)
     {
         return $this->add($message, self::INFO, $redirectUrl, $sticky);
     }
 
     /**
      * Add a success message
-     * 
-     * @param  string  $message      The message text
-     * @param  string  $redirectUrl  Where to redirect once the message is added
-     * @param  boolean $sticky       Sticky the message (hides the close button)
+     *
+     * @param  string $message The message text
+     * @param  string $redirectUrl Where to redirect once the message is added
+     * @param  boolean $sticky Sticky the message (hides the close button)
      * @return object
-     * 
+     *
      */
-    public function success($message, $redirectUrl=null, $sticky=false)
+    public function success($message, $redirectUrl = null, $sticky = false)
     {
         return $this->add($message, self::SUCCESS, $redirectUrl, $sticky);
     }
 
     /**
      * Add a warning message
-     * 
-     * @param  string  $message      The message text
-     * @param  string  $redirectUrl  Where to redirect once the message is added
-     * @param  boolean $sticky       Sticky the message (hides the close button)
+     *
+     * @param  string $message The message text
+     * @param  string $redirectUrl Where to redirect once the message is added
+     * @param  boolean $sticky Sticky the message (hides the close button)
      * @return object
-     * 
+     *
      */
-    public function warning($message, $redirectUrl=null, $sticky=false)
+    public function warning($message, $redirectUrl = null, $sticky = false)
     {
         return $this->add($message, self::WARNING, $redirectUrl, $sticky);
     }
 
     /**
      * Add an error message
-     * 
-     * @param  string  $message      The message text
-     * @param  string  $redirectUrl  Where to redirect once the message is added
-     * @param  boolean $sticky       Sticky the message (hides the close button)
+     *
+     * @param  string $message The message text
+     * @param  string $redirectUrl Where to redirect once the message is added
+     * @param  boolean $sticky Sticky the message (hides the close button)
      * @return object
-     * 
+     *
      */
-    public function error($message, $redirectUrl=null, $sticky=false)
+    public function error($message, $redirectUrl = null, $sticky = false)
     {
         return $this->add($message, self::ERROR, $redirectUrl, $sticky);
     }
 
     /**
      * Add a sticky message
-     * 
-     * @param  string  $message      The message text
-     * @param  string  $redirectUrl  Where to redirect once the message is added
-     * @param  string  $type         The $msgType
+     *
+     * @param  string $message The message text
+     * @param  string $redirectUrl Where to redirect once the message is added
+     * @param  string $type The $msgType
      * @return object
-     * 
+     *
      */
-    public function sticky($message=true, $redirectUrl=null, $type=self::defaultType)
-    {   
+    public function sticky($message = true, $redirectUrl = null, $type = self::defaultType)
+    {
         return $this->add($message, $type, $redirectUrl, true);
     }
 
     /**
      * Add a flash message to the session data
-     * 
-     * @param  string  $message      The message text
-     * @param  string  $type         The $msgType
-     * @param  string  $redirectUrl  Where to redirect once the message is added
-     * @param  boolean $sticky       Whether or not the message is stickied 
+     *
+     * @param  string $message The message text
+     * @param  string $type The $msgType
+     * @param  string $redirectUrl Where to redirect once the message is added
+     * @param  boolean $sticky Whether or not the message is stickied
      * @return object
-     * 
+     *
      */
-    public function add($message, $type=self::defaultType, $redirectUrl=null, $sticky=false) 
+    public function add($message, $type = self::defaultType, $redirectUrl = null, $sticky = false)
     {
 
         // Make sure a message and valid type was passed
         if (!isset($message[0])) return false;
         if (strlen(trim($type)) > 1) $type = strtolower($type[0]);
         if (!array_key_exists($type, $this->msgTypes)) $type = $this->defaultType;
-        
+
         // Add the message to the session data
-        if (!array_key_exists( $type, $_SESSION['flash_messages'] )) $_SESSION['flash_messages'][$type] = array();
+        if (!array_key_exists($type, $_SESSION['flash_messages'])) $_SESSION['flash_messages'][$type] = [];
         $_SESSION['flash_messages'][$type][] = ['sticky' => $sticky, 'message' => $message];
 
         // Handle the redirect if needed
         if (!is_null($redirectUrl)) $this->redirectUrl = $redirectUrl;
         $this->doRedirect();
-        
+
         return $this;
     }
 
     /**
      * Display the flash messages
-     * 
-     * @param  mixed   $types   (null)  print all of the message types
+     *
+     * @param  mixed $types (null)  print all of the message types
      *                          (array)  print the given message types
      *                          (string)   print a single message type
-     * @param  boolean $print   Whether to print the data or return it
+     * @param  boolean $print Whether to print the data or return it
      * @return string
-     * 
+     *
      */
-    public function display($types=null, $print=true) 
+    public function display($types = null, $print = true)
     {
 
         if (!isset($_SESSION['flash_messages'])) return false;
-        
+
         $output = '';
 
         // Print all the message types
-        if (is_null($types) || !$types || (is_array($types) && empty($types)) ) {
+        if (is_null($types) || !$types || (is_array($types) && empty($types))) {
             $types = array_keys($this->msgTypes);
 
-        // Print multiple message types (as defined by an array)
+            // Print multiple message types (as defined by an array)
         } elseif (is_array($types) && !empty($types)) {
             $theTypes = $types;
-            $types = [];
-            foreach($theTypes as $type) {
+            $types    = [];
+            foreach ($theTypes as $type) {
                 $types[] = strtolower($type[0]);
             }
 
-        // Print only a single message type
+            // Print only a single message type
         } else {
             $types = [strtolower($types[0])];
         }
@@ -213,110 +212,113 @@ public function display($types=null, $print=true)
 
         // Retrieve and format the messages, then remove them from session data
         foreach ($types as $type) {
-            if (!isset($_SESSION['flash_messages'][$type]) || empty($_SESSION['flash_messages'][$type]) ) continue;
-            foreach( $_SESSION['flash_messages'][$type] as $msgData ) {
+            if (!isset($_SESSION['flash_messages'][$type]) || empty($_SESSION['flash_messages'][$type])) continue;
+            foreach ($_SESSION['flash_messages'][$type] as $msgData) {
                 $output .= $this->formatMessage($msgData, $type);
             }
-            $this->clear($type);            
+            $this->clear($type);
         }
 
-        
+
         // Print everything to the screen (or return the data)
-        if ($print) { 
-            echo $output; 
-        } else { 
-            return $output; 
+        if ($print) {
+            echo $output;
+        } else {
+            return $output;
         }
     }
 
-        /**
+    /**
      * See if there are any queued error messages
-     * 
-     * @return boolean 
-     * 
+     *
+     * @return boolean
+     *
      */
     public function hasErrors()
     {
-        return empty($_SESSION['flash_messages'][self::ERROR]) ? false : true;  
+        return empty($_SESSION['flash_messages'][self::ERROR]) ? false : true;
     }
 
     /**
      * See if there are any queued message
-     * 
-     * @param  string  $type  The $msgType
+     *
+     * @param  string $type The $msgType
      * @return boolean
-     * 
+     *
      */
-    public function hasMessages($type=null) {
+    public function hasMessages($type = null)
+    {
         if (!is_null($type)) {
-            if (!empty($_SESSION['flash_messages'][$type])) return $_SESSION['flash_messages'][$type]; 
+            if (!empty($_SESSION['flash_messages'][$type])) return $_SESSION['flash_messages'][$type];
         } else {
             foreach (array_keys($this->msgTypes) as $type) {
-                if (isset($_SESSION['flash_messages'][$type]) && !empty($_SESSION['flash_messages'][$type])) return $_SESSION['flash_messages'][$type]; 
+                if (isset($_SESSION['flash_messages'][$type]) && !empty($_SESSION['flash_messages'][$type])) return $_SESSION['flash_messages'][$type];
             }
         }
+
         return false;
     }
 
     /**
      * Format a message
-     * 
-     * @param  array  $msgDataArray   Array of message data
-     * @param  string $type           The $msgType
+     *
+     * @param  array $msgDataArray Array of message data
+     * @param  string $type The $msgType
      * @return string                 The formatted message
-     * 
+     *
      */
     protected function formatMessage($msgDataArray, $type)
     {
-     
-        $msgType = isset($this->msgTypes[$type]) ? $type : $this->defaultType;
-        $cssClass = $this->msgCssClass . ' ' . $this->cssClassMap[$type];
+
+        $msgType   = isset($this->msgTypes[$type]) ? $type : $this->defaultType;
+        $cssClass  = $this->msgCssClass . ' ' . $this->cssClassMap[$type];
         $msgBefore = $this->msgBefore;
 
         // If sticky then append the sticky CSS class
         if ($msgDataArray['sticky']) {
             $cssClass .= ' ' . $this->stickyCssClass;
 
-        // If it's not sticky then add the close button
+            // If it's not sticky then add the close button
         } else {
             $msgBefore = $this->closeBtn . $msgBefore;
         }
 
         // Wrap the message if necessary
-        $formattedMessage = $msgBefore . $msgDataArray['message'] . $this->msgAfter; 
+        $formattedMessage = $msgBefore . $msgDataArray['message'] . $this->msgAfter;
 
         return sprintf(
-            $this->msgWrapper, 
-            $cssClass, 
+            $this->msgWrapper,
+            $cssClass,
             $formattedMessage
         );
     }
 
     /**
      * Redirect the user if a URL was given
-     * 
-     * @return object 
-     * 
+     *
+     * @return object
+     *
      */
     protected function doRedirect()
-    {   
+    {
         if ($this->redirectUrl) {
             header('Location: ' . $this->redirectUrl);
             exit();
         }
+
         return $this;
     }
 
     /**
      * Clear the messages from the session data
-     * 
-     * @param  mixed  $types  (array) Clear all of the message types in array
+     *
+     * @param  mixed $types (array) Clear all of the message types in array
      *                        (string)  Only clear the one given message type
-     * @return object 
-     * 
+     * @return object
+     *
      */
-    protected function clear($types=[]) 
-    { 
+    protected function clear($types = [])
+    {
         if ((is_array($types) && empty($types)) || is_null($types) || !$types) {
             unset($_SESSION['flash_messages']);
         } elseif (!is_array($types)) {
@@ -330,104 +332,109 @@ protected function clear($types=[])
         return $this;
     }
 
-    
 
     /**
      * Set the HTML that each message is wrapped in
-     * 
-     * @param string $msgWrapper The HTML that each message is wrapped in. 
-     *                           Note: Two placeholders (%s) are expected.  
+     *
+     * @param string $msgWrapper The HTML that each message is wrapped in.
+     *                           Note: Two placeholders (%s) are expected.
      *                           The first is the $msgCssClass,
      *                           The second is the message text.
      * @return object
-     * 
+     *
      */
-    public function setMsgWrapper($msgWrapper='')
+    public function setMsgWrapper($msgWrapper = '')
     {
         $this->msgWrapper = $msgWrapper;
+
         return $this;
     }
 
     /**
      * Prepend string to the message (inside of the message wrapper)
-     * 
+     *
      * @param string $msgBefore string to prepend to the message
      * @return object
-     * 
+     *
      */
-    public function setMsgBefore($msgBefore='')
+    public function setMsgBefore($msgBefore = '')
     {
         $this->msgBefore = $msgBefore;
+
         return $this;
     }
 
     /**
      * Append string to the message (inside of the message wrapper)
-     * 
+     *
      * @param string $msgAfter string to append to the message
      * @return object
-     * 
+     *
      */
-    public function setMsgAfter($msgAfter='')
+    public function setMsgAfter($msgAfter = '')
     {
         $this->msgAfter = $msgAfter;
+
         return $this;
     }
 
     /**
      * Set the HTML for the close button
-     * 
-     * @param string  $closeBtn  HTML to use for the close button
+     *
+     * @param string $closeBtn HTML to use for the close button
      * @return object
-     * 
+     *
      */
-    public function setCloseBtn($closeBtn='')
+    public function setCloseBtn($closeBtn = '')
     {
         $this->closeBtn = $closeBtn;
+
         return $this;
     }
 
     /**
      * Set the CSS class for sticky notes
-     * 
-     * @param string  $stickyCssClass  the CSS class to use for sticky messages
+     *
+     * @param string $stickyCssClass the CSS class to use for sticky messages
      * @return object
-     * 
+     *
      */
-    public function setStickyCssClass($stickyCssClass='')
+    public function setStickyCssClass($stickyCssClass = '')
     {
         $this->stickyCssClass = $stickyCssClass;
+
         return $this;
     }
 
     /**
      * Set the CSS class for messages
-     * 
+     *
      * @param string $msgCssClass The CSS class to use for messages
-     * 
-     * @return object 
-     * 
+     *
+     * @return object
+     *
      */
-    public function setMsgCssClass($msgCssClass='')
+    public function setMsgCssClass($msgCssClass = '')
     {
         $this->msgCssClass = $msgCssClass;
+
         return $this;
     }
 
     /**
      * Set the CSS classes for message types
      *
-     * @param mixed  $msgType    (string) The message type 
+     * @param mixed $msgType (string) The message type
      *                           (array) key/value pairs for the class map
-     * @param mixed  $cssClass   (string) the CSS class to use
+     * @param mixed $cssClass (string) the CSS class to use
      *                           (null) not used when $msgType is an array
-     * @return object 
-     * 
+     * @return object
+     *
      */
-    public function setCssClassMap($msgType, $cssClass=null) 
+    public function setCssClassMap($msgType, $cssClass = null)
     {
 
-        if (!is_array($msgType) ) {
+        if (!is_array($msgType)) {
             // Make sure there's a CSS class set
             if (is_null($cssClass)) return $this;
             $msgType = [$msgType => $cssClass];

From 0745d4017cce170865aef4aceac2c4e6bee935a7 Mon Sep 17 00:00:00 2001
From: seyfer <seyferseed@mail.ru>
Date: Tue, 14 Mar 2017 19:50:37 +0700
Subject: [PATCH 3/4] add getMessages function

---
 src/FlashMessages.php | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/src/FlashMessages.php b/src/FlashMessages.php
index d1a75db..0c5a0dd 100644
--- a/src/FlashMessages.php
+++ b/src/FlashMessages.php
@@ -175,6 +175,31 @@ public function add($message, $type = self::defaultType, $redirectUrl = null, $s
         return $this;
     }
 
+    /**
+     * @param null $type
+     * @return array
+     */
+    public function getMessages($type = null)
+    {
+        if (!isset($_SESSION['flash_messages'])) {
+            return [];
+        }
+
+        if (isset($type) &&
+            (!isset($_SESSION['flash_messages'][$type]) || empty($_SESSION['flash_messages'][$type]))
+        ) {
+            return [];
+        }
+
+        if (isset($type) && !empty($type)) {
+            $msgData = $_SESSION['flash_messages'][$type];
+        } else {
+            return $_SESSION['flash_messages'];
+        }
+
+        return $msgData;
+    }
+
     /**
      * Display the flash messages
      *

From ed0fabfdc20aea52e63d1369f605c28c10ab47fa Mon Sep 17 00:00:00 2001
From: seyfer <seyferseed@gmail.com>
Date: Sun, 16 Jun 2019 21:33:40 +0200
Subject: [PATCH 4/4] update

---
 composer.json         |  9 ++++-
 composer.lock         |  2 +-
 src/FlashMessages.php | 87 ++++++++++++++++++++++---------------------
 3 files changed, 52 insertions(+), 46 deletions(-)

diff --git a/composer.json b/composer.json
index 457a6ef..90aedec 100644
--- a/composer.json
+++ b/composer.json
@@ -1,7 +1,12 @@
 {
     "name": "plasticbrain/php-flash-messages",
     "description": "A modern take on PHP session-based flash messages",
-    "keywords": ["flash", "messages", "session", "bootstrap"],
+    "keywords": [
+        "flash",
+        "messages",
+        "session",
+        "bootstrap"
+    ],
     "authors": [
         {
             "name": "Mike Everhart",
@@ -10,7 +15,7 @@
     ],
     "license": "MIT",
     "require": {
-        "php": ">=5.4.0" 
+        "php": ">=5.4.0"
     },
     "require-dev": {},
     "autoload": {
diff --git a/composer.lock b/composer.lock
index fba8b32..2c43d3d 100644
--- a/composer.lock
+++ b/composer.lock
@@ -1,7 +1,7 @@
 {
     "_readme": [
         "This file locks the dependencies of your project to a known state",
-        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
+        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
     "content-hash": "1abec36d4e896f3de67ced57d4be35c9",
diff --git a/src/FlashMessages.php b/src/FlashMessages.php
index 0c5a0dd..8e93cb1 100644
--- a/src/FlashMessages.php
+++ b/src/FlashMessages.php
@@ -1,33 +1,34 @@
 <?php
+
 namespace Plasticbrain\FlashMessages;
 
 class FlashMessages
 {
 
     // Message types and shortcuts
-    const INFO    = 'i';
+    const INFO = 'i';
     const SUCCESS = 's';
     const WARNING = 'w';
-    const ERROR   = 'e';
+    const ERROR = 'e';
 
     // Default message type
     const defaultType = self::INFO;
 
     // Message types and order
-    // 
-    // Note:  The order that message types are listed here is the same order 
+    //
+    // Note:  The order that message types are listed here is the same order
     // they will be printed on the screen (ie: when displaying all messages)
-    // 
+    //
     // This can be overridden with the display() method by manually defining
     // the message types in the order you want to display them. For example:
-    // 
+    //
     // $msg->display([$msg::SUCCESS, $msg::INFO, $msg::ERROR, $msg::WARNING])
-    // 
+    //
     protected $msgTypes = [
-        self::ERROR   => 'error',
+        self::ERROR => 'error',
         self::WARNING => 'warning',
         self::SUCCESS => 'success',
-        self::INFO    => 'info',
+        self::INFO => 'info',
     ];
 
     // Each message gets wrapped in this
@@ -35,7 +36,7 @@ class FlashMessages
 
     // Prepend and append to each message (inside of the wrapper)
     protected $msgBefore = '';
-    protected $msgAfter  = '';
+    protected $msgAfter = '';
 
     // HTML for the close button
     protected $closeBtn = '<button type="button" class="close" 
@@ -46,12 +47,12 @@ class FlashMessages
 
     // CSS Classes
     protected $stickyCssClass = 'sticky';
-    protected $msgCssClass    = 'alert dismissable';
-    protected $cssClassMap    = [
-        self::INFO    => 'alert-info',
+    protected $msgCssClass = 'alert dismissable';
+    protected $cssClassMap = [
+        self::INFO => 'alert-info',
         self::SUCCESS => 'alert-success',
         self::WARNING => 'alert-warning',
-        self::ERROR   => 'alert-danger',
+        self::ERROR => 'alert-danger',
     ];
 
     // Where to redirect the user after a message is queued
@@ -79,9 +80,9 @@ public function __construct()
     /**
      * Add an info message
      *
-     * @param  string $message The message text
-     * @param  string $redirectUrl Where to redirect once the message is added
-     * @param  boolean $sticky Sticky the message (hides the close button)
+     * @param string $message The message text
+     * @param string $redirectUrl Where to redirect once the message is added
+     * @param boolean $sticky Sticky the message (hides the close button)
      * @return object
      *
      */
@@ -93,9 +94,9 @@ public function info($message, $redirectUrl = null, $sticky = false)
     /**
      * Add a success message
      *
-     * @param  string $message The message text
-     * @param  string $redirectUrl Where to redirect once the message is added
-     * @param  boolean $sticky Sticky the message (hides the close button)
+     * @param string $message The message text
+     * @param string $redirectUrl Where to redirect once the message is added
+     * @param boolean $sticky Sticky the message (hides the close button)
      * @return object
      *
      */
@@ -107,9 +108,9 @@ public function success($message, $redirectUrl = null, $sticky = false)
     /**
      * Add a warning message
      *
-     * @param  string $message The message text
-     * @param  string $redirectUrl Where to redirect once the message is added
-     * @param  boolean $sticky Sticky the message (hides the close button)
+     * @param string $message The message text
+     * @param string $redirectUrl Where to redirect once the message is added
+     * @param boolean $sticky Sticky the message (hides the close button)
      * @return object
      *
      */
@@ -121,9 +122,9 @@ public function warning($message, $redirectUrl = null, $sticky = false)
     /**
      * Add an error message
      *
-     * @param  string $message The message text
-     * @param  string $redirectUrl Where to redirect once the message is added
-     * @param  boolean $sticky Sticky the message (hides the close button)
+     * @param string $message The message text
+     * @param string $redirectUrl Where to redirect once the message is added
+     * @param boolean $sticky Sticky the message (hides the close button)
      * @return object
      *
      */
@@ -135,9 +136,9 @@ public function error($message, $redirectUrl = null, $sticky = false)
     /**
      * Add a sticky message
      *
-     * @param  string $message The message text
-     * @param  string $redirectUrl Where to redirect once the message is added
-     * @param  string $type The $msgType
+     * @param string $message The message text
+     * @param string $redirectUrl Where to redirect once the message is added
+     * @param string $type The $msgType
      * @return object
      *
      */
@@ -149,10 +150,10 @@ public function sticky($message = true, $redirectUrl = null, $type = self::defau
     /**
      * Add a flash message to the session data
      *
-     * @param  string $message The message text
-     * @param  string $type The $msgType
-     * @param  string $redirectUrl Where to redirect once the message is added
-     * @param  boolean $sticky Whether or not the message is stickied
+     * @param string $message The message text
+     * @param string $type The $msgType
+     * @param string $redirectUrl Where to redirect once the message is added
+     * @param boolean $sticky Whether or not the message is stickied
      * @return object
      *
      */
@@ -203,10 +204,10 @@ public function getMessages($type = null)
     /**
      * Display the flash messages
      *
-     * @param  mixed $types (null)  print all of the message types
+     * @param mixed $types (null)  print all of the message types
      *                          (array)  print the given message types
      *                          (string)   print a single message type
-     * @param  boolean $print Whether to print the data or return it
+     * @param boolean $print Whether to print the data or return it
      * @return string
      *
      */
@@ -224,7 +225,7 @@ public function display($types = null, $print = true)
             // Print multiple message types (as defined by an array)
         } elseif (is_array($types) && !empty($types)) {
             $theTypes = $types;
-            $types    = [];
+            $types = [];
             foreach ($theTypes as $type) {
                 $types[] = strtolower($type[0]);
             }
@@ -267,7 +268,7 @@ public function hasErrors()
     /**
      * See if there are any queued message
      *
-     * @param  string $type The $msgType
+     * @param string $type The $msgType
      * @return boolean
      *
      */
@@ -287,16 +288,16 @@ public function hasMessages($type = null)
     /**
      * Format a message
      *
-     * @param  array $msgDataArray Array of message data
-     * @param  string $type The $msgType
+     * @param array $msgDataArray Array of message data
+     * @param string $type The $msgType
      * @return string                 The formatted message
      *
      */
     protected function formatMessage($msgDataArray, $type)
     {
 
-        $msgType   = isset($this->msgTypes[$type]) ? $type : $this->defaultType;
-        $cssClass  = $this->msgCssClass . ' ' . $this->cssClassMap[$type];
+        $msgType = isset($this->msgTypes[$type]) ? $type : $this->defaultType;
+        $cssClass = $this->msgCssClass . ' ' . $this->cssClassMap[$type];
         $msgBefore = $this->msgBefore;
 
         // If sticky then append the sticky CSS class
@@ -337,7 +338,7 @@ protected function doRedirect()
     /**
      * Clear the messages from the session data
      *
-     * @param  mixed $types (array) Clear all of the message types in array
+     * @param mixed $types (array) Clear all of the message types in array
      *                        (string)  Only clear the one given message type
      * @return object
      *
@@ -473,4 +474,4 @@ public function setCssClassMap($msgType, $cssClass = null)
     }
 
 
-}
\ No newline at end of file
+}