Feature/patch issue 34 (#41)

Fix issue #34

Author: mbunge

CHANGELOG.md

@@ -1,5 +1,11 @@
 # Hawkbit Changelog
 
+## 2.3.2
+
+### Fixed
+
+ - Fix issue #34. Bind closure always to application instance.
+
 ## 2.3.1
 
 ### Fixed

src/Application/AbstractApplication.php

@@ -1,9 +1,12 @@
 <?php
 /**
- * Created by PhpStorm.
- * User: marco.bunge
- * Date: 03.11.2016
- * Time: 08:54
+ * The Hawkbit Micro Framework. An advanced derivate of Proton Micro Framework
+ *
+ * @author Marco Bunge <marco_bunge@web.de>
+ * @author Daniyal Hamid (@Designcise) <hello@designcise.com>
+ * @copyright Marco Bunge <marco_bunge@web.de>
+ *
+ * @license MIT
  */
 
 namespace Hawkbit\Application;
@@ -374,7 +377,7 @@ public function validateContract($class, $contract)
     protected function bindClosureToInstance($closure, $instance)
     {
         if ($closure instanceof \Closure) {
-            \Closure::bind($closure, $instance, get_class($instance));
+            $closure = $closure->bind($closure, $instance, get_class($instance));
         }
 
         return $closure;
@@ -436,4 +439,4 @@ abstract public function shutdown();
      * @return void
      */
     abstract public function init();
-}
+}

tests/ApplicationTest.php

@@ -29,13 +29,29 @@
 
 class ApplicationTest extends \PHPUnit_Framework_TestCase
 {
-    /**
-     *
-     */
-    protected function tearDown()
+    public function testAppInstanceAccessInClosure()
     {
-        restore_error_handler();
-        restore_exception_handler();
+
+        $app = new Application(true);
+
+        $appInstanceInClosure = false;
+
+        $app->get(
+            '/',
+            function (ServerRequestInterface $request, ResponseInterface $response, array $args = [])
+            use(&$appInstanceInClosure){
+                $that = $this;
+                $appInstanceInClosure = $this instanceof Application\ApplicationInterface;
+                return $response;
+            }
+        );
+
+        $request = ServerRequestFactory::fromGlobals();
+        $response = $app->handle($request);
+
+        $this->assertTrue($appInstanceInClosure);
+        $this->assertEquals(200, $response->getStatusCode());
+
     }
 
 
@@ -508,7 +524,8 @@ public function testAjaxRequestRecogniseHTML()
         $this->assertEquals('application/json', $app->getContentType());
     }
 
-    public function testRootRequestWithoutPublicAsDocumentRoot(){
+    public function testRootRequestWithoutPublicAsDocumentRoot()
+    {
         $app = new Application();
         $app->get('/', function (ServerRequestInterface $request, ResponseInterface $response) {
             $response->getBody()->write('<h1>HELLO</h1>');
@@ -525,7 +542,9 @@ public function testRootRequestWithoutPublicAsDocumentRoot(){
         $this->assertEquals('text/html', $app->getContentType());
         $_SERVER = $tmpServer;
     }
-    public function testExampleRequestWithoutPublicAsDocumentRoot(){
+
+    public function testExampleRequestWithoutPublicAsDocumentRoot()
+    {
         $app = new Application();
 
         $app->get('/', function (ServerRequestInterface $request, ResponseInterface $response) {
@@ -549,4 +568,15 @@ public function testExampleRequestWithoutPublicAsDocumentRoot(){
         $this->assertEquals('text/html', $app->getContentType());
         $_SERVER = $tmpServer;
     }
+
+    /**
+     *
+     */
+    protected function tearDown()
+    {
+        restore_error_handler();
+        restore_exception_handler();
+    }
+
+
 }

tests/Stratigility/MiddlewarePipeAdapterTest.php

@@ -26,9 +26,10 @@ public function testFunctionalPiping()
         $handleRoute = false;
         $handleMiddleware = false;
         $application = new Application();
-        $application->get('/', function ($request, ResponseInterface $response) use(&$handleRoute) {
-            $this->assertInstanceOf(ServerRequestInterface::class, $request);
-            $this->assertInstanceOf(ResponseInterface::class, $response);
+        $testCase = $this;
+        $application->get('/', function ($request, ResponseInterface $response) use(&$handleRoute, $testCase) {
+            $testCase->assertInstanceOf(ServerRequestInterface::class, $request);
+            $testCase->assertInstanceOf(ResponseInterface::class, $response);
             $response->getBody()->write('Hello World');
             $handleRoute = true;
             return $response;