Configurable

Author: snapshotpl

Diff for: 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.0",
         "zendframework/zend-diactoros": "^1.1.3"
     },
     "require-dev": {

Diff for: config/phpdebugbar.config.php

@@ -7,7 +7,7 @@
                 'base_url' => '/phpdebugbar',
             ],
             'collectors' => [],
-            'storage' => '',
+            'storage' => null,
         ],
     ],
 ];

Diff for: 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;
     }
 }

Diff for: src/JavascriptRendererFactory.php

@@ -2,16 +2,34 @@
 
 namespace PhpMiddleware\PhpDebugBar;
 
+use DebugBar\DebugBar;
 use DebugBar\JavascriptRenderer;
+use Interop\Container\ContainerInterface;
 
 final class JavascriptRendererFactory
 {
-    public function __invoke()
+    public function __invoke(ContainerInterface $container = null)
     {
-        $standardDebugBarFactory = new StandardDebugBarFactory();
-        $debugbar = $standardDebugBarFactory();
+        if ($container === null || !$container->has(DebugBar::class)) {
+            $standardDebugBarFactory = new StandardDebugBarFactory();
+            $debugbar = $standardDebugBarFactory($container);
+        } else {
+            $debugbar = $container->get(DebugBar::class);
+        }
 
-        $renderer = new JavascriptRenderer($debugbar, '/phpdebugbar');
+        $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;
     }

Diff for: src/PhpDebugBarMiddlewareFactory.php

@@ -2,18 +2,19 @@
 
 namespace PhpMiddleware\PhpDebugBar;
 
-/**
- * Default, simple factory for middleware
- *
- * @author Witold Wasiczko <[email protected]>
- */
+use DebugBar\JavascriptRenderer;
+use Interop\Container\ContainerInterface;
+
 final class PhpDebugBarMiddlewareFactory
 {
-    public function __invoke()
+    public function __invoke(ContainerInterface $container = null)
     {
-        $rendererFactory = new JavascriptRendererFactory();
-        $renderer = $rendererFactory();
-
+        if ($container === null || !$container->has(JavascriptRenderer::class)) {
+            $rendererFactory = new JavascriptRendererFactory();
+            $renderer = $rendererFactory($container);
+        } else {
+            $renderer = $container->get(JavascriptRenderer::class);
+        }
         return new PhpDebugBarMiddleware($renderer);
     }
 }

Diff for: src/StandardDebugBarFactory.php

@@ -3,11 +3,30 @@
 namespace PhpMiddleware\PhpDebugBar;
 
 use DebugBar\StandardDebugBar;
+use Interop\Container\ContainerInterface;
 
 final class StandardDebugBarFactory
 {
-    public function __invoke()
+    public function __invoke(ContainerInterface $container = null)
     {
-        return new StandardDebugBar();
+        $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;
     }
 }