Configurable services

composer.json

@@ -12,6 +12,7 @@
         "php": "^5.5 || ^7.0",
         "maximebf/debugbar": "^1.10",
         "psr/http-message": "^1.0",
+        "container-interop/container-interop": "^1.1",
         "zendframework/zend-diactoros": "^1.1.3"
     },
     "require-dev": {

config/dependency.config.php

@@ -3,5 +3,6 @@
 return [
     'factories' => [
         PhpMiddleware\PhpDebugBar\PhpDebugBarMiddleware::class => PhpMiddleware\PhpDebugBar\PhpDebugBarMiddlewareFactory::class,
+        DebugBar\DataCollector\ConfigCollector::class => PhpMiddleware\PhpDebugBar\ConfigCollectorFactory::class,
     ],
 ];

config/phpdebugbar.config.php

@@ -0,0 +1,15 @@
+<?php
+
+return [
+    'phpmiddleware' => [
+        'phpdebugbar' => [
+            'javascript_renderer' => [
+                'base_url' => '/phpdebugbar',
+            ],
+            'collectors' => [
+                DebugBar\DataCollector\ConfigCollector::class,
+            ],
+            'storage' => null,
+        ],
+    ],
+];

src/ConfigCollectorFactory.php

@@ -0,0 +1,16 @@
+<?php
+
+namespace PhpMiddleware\PhpDebugBar;
+
+use DebugBar\DataCollector\ConfigCollector;
+use Interop\Container\ContainerInterface;
+
+final class ConfigCollectorFactory
+{
+    public function __invoke(ContainerInterface $container)
+    {
+        $data = $container->get('config');
+
+        return new ConfigCollector($data, 'Config');
+    }
+}

src/ConfigProvider.php

@@ -12,9 +12,10 @@ public static function getConfig()
 
     public function __invoke()
     {
-        return [
-            'dependencies' => include __DIR__ . '/../config/dependency.config.php',
-            'middleware_pipeline' => include __DIR__ . '/../config/zend-expressive.middleware_pipeline.config.php',
-        ];
+        $config = include __DIR__ . '/../config/phpdebugbar.config.php';
+        $config['dependencies'] = include __DIR__ . '/../config/dependency.config.php';
+        $config['middleware_pipeline'] = include __DIR__ . '/../config/zend-expressive.middleware_pipeline.config.php';
+
+        return $config;
     }
 }

src/JavascriptRendererFactory.php

@@ -0,0 +1,36 @@
+<?php
+
+namespace PhpMiddleware\PhpDebugBar;
+
+use DebugBar\DebugBar;
+use DebugBar\JavascriptRenderer;
+use Interop\Container\ContainerInterface;
+
+final class JavascriptRendererFactory
+{
+    public function __invoke(ContainerInterface $container = null)
+    {
+        if ($container === null || !$container->has(DebugBar::class)) {
+            $standardDebugBarFactory = new StandardDebugBarFactory();
+            $debugbar = $standardDebugBarFactory($container);
+        } else {
+            $debugbar = $container->get(DebugBar::class);
+        }
+
+        $renderer = new JavascriptRenderer($debugbar);
+
+        $config = $container !== null && $container->has('config') ? $container->get('config') : [];
+
+        if (isset($config['phpmiddleware']['phpdebugbar']['javascript_renderer'])) {
+            $rendererOptions = $config['phpmiddleware']['phpdebugbar']['javascript_renderer'];
+        } else {
+            $rendererOptions = [
+                'base_url' => '/phpdebugbar',
+            ];
+        }
+
+        $renderer->setOptions($rendererOptions);
+
+        return $renderer;
+    }
+}

src/PhpDebugBarMiddlewareFactory.php

@@ -2,20 +2,19 @@
 
 namespace PhpMiddleware\PhpDebugBar;
 
-use DebugBar\StandardDebugBar;
+use DebugBar\JavascriptRenderer;
+use Interop\Container\ContainerInterface;
 
-/**
- * Default, simple factory for middleware
- *
- * @author Witold Wasiczko <witold@wasiczko.pl>
- */
 final class PhpDebugBarMiddlewareFactory
 {
-    public function __invoke()
+    public function __invoke(ContainerInterface $container = null)
     {
-        $debugbar = new StandardDebugBar();
-        $renderer = $debugbar->getJavascriptRenderer('/phpdebugbar');
-
+        if ($container === null || !$container->has(JavascriptRenderer::class)) {
+            $rendererFactory = new JavascriptRendererFactory();
+            $renderer = $rendererFactory($container);
+        } else {
+            $renderer = $container->get(JavascriptRenderer::class);
+        }
         return new PhpDebugBarMiddleware($renderer);
     }
 }

src/StandardDebugBarFactory.php

@@ -0,0 +1,32 @@
+<?php
+
+namespace PhpMiddleware\PhpDebugBar;
+
+use DebugBar\StandardDebugBar;
+use Interop\Container\ContainerInterface;
+
+final class StandardDebugBarFactory
+{
+    public function __invoke(ContainerInterface $container = null)
+    {
+        $debugBar = new StandardDebugBar();
+
+        if ($container !== null) {
+            $config = $container->has('config') ? $container->get('config') : [];
+
+            $collectors = isset($config['phpmiddleware']['phpdebugbar']['collectors']) ? $config['phpmiddleware']['phpdebugbar']['collectors'] : [];
+
+            foreach ($collectors as $collectorName) {
+                $collector = $container->get($collectorName);
+                $debugBar->addCollector($collector);
+            }
+
+            if (isset($config['phpmiddleware']['phpdebugbar']['storage']) && is_string($config['phpmiddleware']['phpdebugbar']['storage'])) {
+                $storage = $container->get($config['phpmiddleware']['phpdebugbar']['storage']);
+                $debugBar->setStorage($config['phpmiddleware']['phpdebugbar']['storage']);
+            }
+        }
+
+        return $debugBar;
+    }
+}

test/ZendExpressiveTest.php

@@ -4,10 +4,12 @@
 
 use Interop\Container\ContainerInterface;
 use PhpMiddleware\PhpDebugBar\ConfigProvider;
+use Psr\Http\Message\ServerRequestInterface;
 use Zend\Diactoros\Response\EmitterInterface;
 use Zend\Diactoros\ServerRequestFactory;
 use Zend\Expressive\Container\ApplicationFactory;
 use Zend\ServiceManager\ServiceManager;
+use Zend\Stratigility\Http\ResponseInterface;
 
 final class ZendExpressiveTest extends AbstractMiddlewareRunnerTest
 {
@@ -20,6 +22,24 @@ protected function setUp()
         $this->testEmitter = new TestEmitter();
     }
 
+    final public function testContainsConfigCollectorOutput()
+    {
+        $response = $this->dispatchApplication([
+            'REQUEST_URI' => '/hello',
+            'REQUEST_METHOD' => 'GET',
+            'HTTP_ACCEPT' => 'text/html',
+        ], [
+            '/hello' => function (ServerRequestInterface $request, ResponseInterface $response, $next) {
+                $response->getBody()->write('Hello!');
+                return $response;
+            },
+        ]);
+
+        $responseBody = (string) $response->getBody();
+
+        $this->assertContains('DebugBar\\\DataCollector\\\ConfigCollector', $responseBody);
+    }
+
     protected function dispatchApplication(array $server, array $pipe = [])
     {
         $container = $this->createContainer();