Test with Slim

Author: snapshotpl

README.md

@@ -5,12 +5,8 @@ This middleware provide framework-agnostic possibility to attach [PHP Debug bar]
 
 ## Installation
 
-```json
-{
-    "require": {
-        "php-middleware/php-debug-bar": "^1.1.0"
-    }
-}
+```
+composer require php-middleware/php-debug-bar
 ```
 
 To build this middleware you need to injecting inside `PhpDebugBarMiddleware` instance `DebugBar\JavascriptRenderer` (you can get it from `DebugBar\StandardDebugBar`) and add middleware to your middleware runner. Or use default factory.
@@ -32,12 +28,24 @@ $app->run($request, $response);
 
 You don't need to copy any static assets from phpdebugbar vendor!
 
+### How to install on Slim 3?
+
+Add existing factory to container:
+
+```php
+$container['debugbar_middleware'] = new PhpMiddleware\PhpDebugBar\PhpDebugBarMiddlewareFactory();
+```
+
+and add middleware from container to app:
+
+```php
+$app->add($app->getContainer()->get('debugbar_middleware'));
+```
+
 ## It's just works with any modern php framework!
 
 Middleware tested on:
-* [Expressive](https://github.com/zendframework/zend-expressive)
-
-Middleware should works with:
+* [Zend Expressive](https://github.com/zendframework/zend-expressive)
 * [Slim 3.x](https://github.com/slimphp/Slim)
 
 And any other modern framework [supported middlewares and PSR-7](https://mwop.net/blog/2015-01-08-on-http-middleware-and-psr-7.html).

composer.json

@@ -16,7 +16,8 @@
     },
     "require-dev": {
         "phpunit/phpunit": "^4.8.6",
-        "mikey179/vfsStream": "^1.6"
+        "mikey179/vfsStream": "^1.6",
+        "slim/slim": "^3.1"
     },
     "autoload": {
         "psr-4": {

src/PhpDebugBarMiddleware.php

@@ -79,33 +79,43 @@ public function __invoke(ServerRequestInterface $request, ResponseInterface $res
      */
     private function getStaticFile(UriInterface $uri)
     {
-        if (strpos($uri->getPath(), $this->debugBarRenderer->getBaseUrl()) !== 0) {
+        $path = $this->extractPath($uri);
+        
+        if (strpos($path, $this->debugBarRenderer->getBaseUrl()) !== 0) {
             return;
         }
 
-        if (method_exists($uri, 'getBasePath')) {
-            if (empty($uri->getBasePath())) {
-                return;
-            }
-            $path = $uri->getBasePath() ?: $uri->getPath();
-        } else {
-            $path = $uri->getPath();
-        }
-
         $pathToFile = substr($path, strlen($this->debugBarRenderer->getBaseUrl()));
-
+        
         $fullPathToFile = $this->debugBarRenderer->getBasePath() . $pathToFile;
-
+        
         if (!file_exists($fullPathToFile)) {
             return;
         }
-        $fullPathToFile = str_replace('/', DIRECTORY_SEPARATOR, $fullPathToFile);
 
-        $stream = new Stream($fullPathToFile, 'r');
-        $staticResponse = new Response($stream);
         $contentType = $this->getContentTypeByFileName($fullPathToFile);
-
-        return $staticResponse->withHeader('Content-type', $contentType);
+        $stream = new Stream($fullPathToFile, 'r');
+        
+        return new Response($stream, 200, [
+            'Content-type' => $contentType,
+        ]);
+    }
+    
+    /**
+     * @param UriInterface $uri
+     * 
+     * @return string
+     */
+    private function extractPath(UriInterface $uri)
+    {
+        // Slim3 compatibility
+        if (method_exists($uri, 'getBasePath')) {
+            $basePath = $uri->getBasePath();
+            if (!empty($basePath)) {
+                return $basePath;
+            }
+        }
+        return $uri->getPath();
     }
 
     /**

src/PhpDebugBarMiddlewareFactory.php

@@ -9,7 +9,7 @@
  *
  * @author Witold Wasiczko <witold@wasiczko.pl>
  */
-class PhpDebugBarMiddlewareFactory
+final class PhpDebugBarMiddlewareFactory
 {
     public function __invoke()
     {

test/Slim3Test.php

@@ -0,0 +1,70 @@
+<?php
+
+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+
+namespace PhpMiddlewareTest\PhpDebugBar;
+
+use DebugBar\StandardDebugBar;
+use PhpMiddleware\PhpDebugBar\PhpDebugBarMiddleware;
+use PHPUnit_Framework_TestCase;
+use Slim\App;
+
+/**
+ * Description of Slim3Test
+ *
+ * @author witold
+ */
+class Slim3Test extends PHPUnit_Framework_TestCase {
+
+    public function testSlim3() {
+        $app = new App();
+        $app->getContainer()['enviroment'] = function() {
+            $items = array(
+                'DOCUMENT_ROOT' => '/home/witold/projects/slim3/public',
+                'REMOTE_ADDR' => '127.0.0.1',
+                'REMOTE_PORT' => '59638',
+                'SERVER_SOFTWARE' => 'PHP 7.0.4-7ubuntu2.1 Development Server',
+                'SERVER_PROTOCOL' => 'HTTP/1.1',
+                'SERVER_NAME' => '0.0.0.0',
+                'SERVER_PORT' => '8080',
+                'REQUEST_URI' => '/phpdebugbar/debugbar.js',
+                'REQUEST_METHOD' => 'GET',
+                'SCRIPT_NAME' => '/phpdebugbar/debugbar.js',
+                'SCRIPT_FILENAME' => '/home/witold/projects/slim3/public/public/index.php',
+                'PHP_SELF' => '/phpdebugbar/debugbar.js',
+                'HTTP_HOST' => '0.0.0.0:8080',
+                'HTTP_CONNECTION' => 'keep-alive',
+                'HTTP_CACHE_CONTROL' => 'max-age=0',
+                'HTTP_UPGRADE_INSECURE_REQUESTS' => '1',
+                'HTTP_USER_AGENT' => 'Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/51.0.2704.106 Safari/537.36',
+                'HTTP_ACCEPT' => 'text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,*/*;q=0.8',
+                'HTTP_ACCEPT_ENCODING' => 'gzip, deflate, sdch',
+                'HTTP_ACCEPT_LANGUAGE' => 'pl-PL,pl;q=0.8,en-US;q=0.6,en;q=0.4',
+                'HTTP_COOKIE' => 'zdt-hidden=0; PHPSESSID=tfun32lfu86islmbfk68s9eqi4',
+                'REQUEST_TIME_FLOAT' => 1469139685.1076889,
+                'REQUEST_TIME' => 1469139685,
+            );
+            return new \Slim\Http\Environment($items);
+        };
+
+        $debugbar = new StandardDebugBar();
+        $debugbarRenderer = $debugbar->getJavascriptRenderer('/phpdebugbar');
+        $middleware = new PhpDebugBarMiddleware($debugbarRenderer);
+        $app->add($middleware);
+
+        $app->get('/', function ($request, $response, $args) {
+            $response->getBody()->write(' Hello ');
+
+            return $response;
+        });
+
+        $response = $app->run(true);
+
+        $this->assertContains('phpdebugbar', (string) $response->getBody());
+    }
+
+}