Instance of RouteGroup is now bound to the route group callback

Author: Designcise

composer.json

@@ -1,6 +1,6 @@
 {
     "name": "designcise/bitframe",
-    "version": "1.0.4",
+    "version": "1.0.5",
     "description": "PHP PSR-15 / PSR-7 middleware dispatcher microframework",
     "type": "library",
     "keywords": ["Designcise", "BitFrame", "Microframework", "Framework", "Middleware Dispatcher", "PSR-7", "PSR-15"],

src/Router/RouteGroup.php

@@ -53,7 +53,7 @@ public function __construct(
      */
     public function __invoke()
     {
-        call_user_func_array($this->callback, [$this]);
+        call_user_func_array($this->callback->bindTo($this), [$this]);
     }
 
     /**

test/RouteGroupTest.php

@@ -16,7 +16,7 @@
 
 use \PHPUnit\Framework\TestCase;
 
-use \BitFrame\Router\RouteGroup;
+use \BitFrame\Router\{RouteGroup, RouteCollectionInterface};
 
 /**
  * @covers \BitFrame\Router\RouteGroup
@@ -28,7 +28,7 @@ class RouteGroupTest extends TestCase
      */
     public function testGroupIsInvokedAndAddsRoutesToCollection()
     {
-        $callback   = function() {};
+        $callback = function() {};
         $collection = $this->createMock('\BitFrame\Router\RouteCollectionInterface');
         $route = $this->createMock('\BitFrame\Router\Route');
 
@@ -86,7 +86,13 @@ public function testGroupIsInvokedAndAddsRoutesToCollection()
             ->with($this->equalTo('HEAD'), $this->equalTo('/acme/route'), $this->equalTo($callback))
             ->will($this->returnValue($route));
 
-        $group = new RouteGroup('/acme', function ($route) use ($callback) {
+        $phpunit = $this;
+        
+        $group = new RouteGroup('/acme', function (RouteCollectionInterface $route) use ($callback, $phpunit) {
+            // RouteGroup implements RouteCollectionInterface, so...
+            $phpunit->assertInstanceOf(RouteGroup::class, $this);
+            $phpunit->assertInstanceOf(RouteCollectionInterface::class, $this);
+            
             $route->get('/route', $callback)->setHost('example.com')->setScheme('https');
             $route->post('/route', $callback);
             $route->put('/route', $callback);
@@ -98,4 +104,29 @@ public function testGroupIsInvokedAndAddsRoutesToCollection()
 
         $group();
     }
+    
+    public function testRouteGroupClassContextIsBoundToRouteGroupCollection()
+    {
+        $callback = function() {};
+        $collection = $this->createMock('\BitFrame\Router\RouteCollectionInterface');
+        $route = $this->createMock('\BitFrame\Router\Route');
+        
+        $phpunit = $this;
+        
+        $group = new RouteGroup('/acme', function () use ($callback, $phpunit) {
+            // RouteGroup implements RouteCollectionInterface, so...
+            $phpunit->assertInstanceOf(RouteGroup::class, $this);
+            $phpunit->assertInstanceOf(RouteCollectionInterface::class, $this);
+            
+            $this->get('/route', $callback)->setHost('example.com')->setScheme('https');
+            $this->post('/route', $callback);
+            $this->put('/route', $callback);
+            $this->patch('/route', $callback);
+            $this->delete('/route', $callback);
+            $this->options('/route', $callback);
+            $this->head('/route', $callback);
+        }, $collection);
+        
+        $group();
+    }
 }