Fixed request binding

Author: GrahamCampbell

CHANGELOG.md

@@ -10,6 +10,7 @@ CHANGE LOG
 ## V0.3 Alpha (Upcoming)
 
 * PHP 5.6 and HHVM compatibility
+* Fixed request binding
 * Composer tweaks
 
 

src/Classes/Navigation.php

@@ -312,6 +312,17 @@ public function getRequest()
         return $this->request;
     }
 
+    /**
+     * Set the request instance.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @return void
+     */
+    public function setRequest(Request $request)
+    {
+        return $this->request = $request;
+    }
+
     /**
      * Get the url instance.
      *

src/NavigationServiceProvider.php

@@ -70,7 +70,9 @@ protected function registerNavigation()
             $htmlmin = $app['htmlmin'];
             $view = $app['config']['graham-campbell/navigation::view'];
 
-            return new Classes\Navigation($events, $request, $url, $htmlmin, $view);
+            $navigation = new Classes\Navigation($events, $request, $url, $htmlmin, $view);
+            $app->refresh('request', $navigation, 'setRequest');
+            return $navigation;
         });
     }
 

tests/Classes/NavigationTest.php

@@ -17,6 +17,7 @@
 namespace GrahamCampbell\Tests\Navigation\Classes;
 
 use Mockery;
+use Illuminate\Http\Request;
 use GrahamCampbell\Navigation\Classes\Navigation;
 use GrahamCampbell\TestBench\Classes\AbstractTestCase;
 
@@ -257,6 +258,19 @@ public function testGetHTMLWithBar()
         $this->assertEquals($return, 'html goes here');
     }
 
+    public function testSetRequest()
+    {
+        $navigation = $this->getNavigation()();
+
+        $request = new Request();
+
+        $navigation->setRequest($request);
+
+        $return = $navigation->getRequest();
+
+        $this->assertEquals($request, $return);
+    }
+
     protected function getNavigation()
     {
         $events = Mockery::mock('Illuminate\Events\Dispatcher');