added errors() helper function

getherbert · Jun 16, 2015 · 3a49cb8 · 3a49cb8
1 parent 00eecd6
commit 3a49cb8
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 1 deletion.
diff --git a/Herbert/Framework/Providers/HerbertServiceProvider.php b/Herbert/Framework/Providers/HerbertServiceProvider.php
@@ -105,6 +105,16 @@ public function register()
             'notifier',
             'Herbert\Framework\Notifier'
         );
+
+        $this->app->singleton(
+            'errors',
+            function ()
+            {
+                return session_flashed('__validation_errors', []);
+            }
+        );
+
+        $_GLOBALS['errors'] = $this->app['errors'];
     }
 
     /**

diff --git a/Herbert/Framework/Providers/TwigServiceProvider.php b/Herbert/Framework/Providers/TwigServiceProvider.php
@@ -88,7 +88,7 @@ public function constructTwig()
             $twig->addGlobal($key, $value);
         }
 
-        $twig->addGlobal('errors', session()->getFlashBag()->get('__validation_errors', []));
+        $twig->addGlobal('errors', $this->app['errors']);
 
         foreach ((array) $this->app['twig.functions'] as $function)
         {

diff --git a/bootstrap/helpers.php b/bootstrap/helpers.php
@@ -110,6 +110,28 @@ function herbert($binding = null)
     }
 }
 
+if ( ! function_exists('errors'))
+{
+    /**
+     * Get the errors.
+     *
+     * @param string key
+     * @return array
+     */
+    function errors($key = null)
+    {
+        $errors = herbert('errors');
+        $errors = isset($errors[0]) ? $errors[0] : $errors;
+
+        if (!$key)
+        {
+            return $errors;
+        }
+
+        return array_get($errors, $key);
+    }
+}
+
 if ( ! function_exists('session'))
 {
     /**