Added helpers unit test

2 files changed, 11 insertions, 5 deletions

diff --git a/src/Routing/UrlGenerator.php b/src/Routing/UrlGenerator.php
index 33eef7b0..6df52425 100644
--- a/src/Routing/UrlGenerator.php
+++ b/src/Routing/UrlGenerator.php
@@ -9,7 +9,7 @@ class UrlGenerator
      * @param array  $parameters
      * @return string
      */
-    public static function to($path, $parameters = [])
+    public function to($path, $parameters = [])
     {
         $path = '/' . ltrim($path, '/');
         $request = app('request');
diff --git a/src/helpers.php b/src/helpers.php
index b942068f..de303963 100644
--- a/src/helpers.php
+++ b/src/helpers.php
@@ -69,7 +69,7 @@ function request($key = null, $default = null)
  */
 function session($key = null, $default = null)
 {
-    $session = request()->getSession();
+    $session = app('session');
 
     if (is_null($key)) {
         return $session;
@@ -97,9 +97,15 @@ function view($template = null, $data = null)
 /**
  * @param string $path
  * @param array  $parameters
- * @return string
+ * @return UrlGenerator|string
  */
-function url($path, $parameters = [])
+function url($path = null, $parameters = [])
 {
-    return UrlGenerator::to($path, $parameters);
+    $urlGenerator = app('routing.urlGenerator');
+
+    if (is_null($path)) {
+        return $urlGenerator;
+    }
+
+    return $urlGenerator->to($path, $parameters);
 }