Merge pull request #13 from php-middleware/feature/config-provider

Config provider for zend expressive

Author: snapshotpl

Diff for: README.md

@@ -28,6 +28,20 @@ $app->run($request, $response);
 
 You don't need to copy any static assets from phpdebugbar vendor!
 
+### How to install on Zend Expressive?
+
+Use [mtymek/expressive-config-manager](https://github.com/mtymek/expressive-config-manager) and add
+`PhpMiddleware\PhpDebugBar\ConfigProvider` class name:
+
+```php
+$configManager = new \Zend\Expressive\ConfigManager\ConfigManager([
+    \PhpMiddleware\PhpDebugBar\ConfigProvider::class,
+    new \Zend\Expressive\ConfigManager\PhpFileProvider('config/autoload/{{,*.}global,{,*.}local}.php'),
+]);
+```
+
+more [about config manager](https://zendframework.github.io/zend-expressive/cookbook/modular-layout/).
+
 ### How to install on Slim 3?
 
 Add existing factory to container:

Diff for: config/dependency.config.php

@@ -0,0 +1,7 @@
+<?php
+
+return [
+    'factories' => [
+        PhpMiddleware\PhpDebugBar\PhpDebugBarMiddleware::class => PhpMiddleware\PhpDebugBar\PhpDebugBarMiddlewareFactory::class,
+    ],
+];

Diff for: config/zend-expressive.middleware_pipeline.config.php

@@ -0,0 +1,12 @@
+<?php
+
+use PhpMiddleware\PhpDebugBar\PhpDebugBarMiddleware;
+
+return [
+    PhpDebugBarMiddleware::class => [
+        'middleware' => [
+            PhpDebugBarMiddleware::class,
+        ],
+        'priority' => 1000,
+    ],
+];

Diff for: src/ConfigProvider.php

@@ -0,0 +1,20 @@
+<?php
+
+namespace PhpMiddleware\PhpDebugBar;
+
+final class ConfigProvider
+{
+    public static function getConfig()
+    {
+        $self = new self();
+        return $self();
+    }
+
+    public function __invoke()
+    {
+        return [
+            'dependencies' => include __DIR__ . '/../config/dependency.config.php',
+            'middleware_pipeline' => include __DIR__ . '/../config/zend-expressive.middleware_pipeline.config.php',
+        ];
+    }
+}

Diff for: test/ZendExpressiveTest.php

@@ -2,28 +2,30 @@
 
 namespace PhpMiddlewareTest\PhpDebugBar;
 
-use PhpMiddleware\PhpDebugBar\PhpDebugBarMiddleware;
-use PhpMiddleware\PhpDebugBar\PhpDebugBarMiddlewareFactory;
+use Interop\Container\ContainerInterface;
+use PhpMiddleware\PhpDebugBar\ConfigProvider;
+use Zend\Diactoros\Response\EmitterInterface;
 use Zend\Diactoros\ServerRequestFactory;
-use Zend\Expressive\Application;
-use Zend\Expressive\Router\FastRouteRouter;
+use Zend\Expressive\Container\ApplicationFactory;
 use Zend\ServiceManager\ServiceManager;
 
 final class ZendExpressiveTest extends AbstractMiddlewareRunnerTest
 {
-    protected function dispatchApplication(array $server, array $pipe = [])
+    private $testEmitter;
+
+    protected function setUp()
     {
-        $container = new ServiceManager([
-            'factories' => [
-                PhpDebugBarMiddleware::class => PhpDebugBarMiddlewareFactory::class,
-            ],
-        ]);
-        $router    = new FastRouteRouter();
-        $emitter = new TestEmitter();
+        parent::setUp();
+
+        $this->testEmitter = new TestEmitter();
+    }
 
-        $app = new Application($router, $container, null, $emitter);
+    protected function dispatchApplication(array $server, array $pipe = [])
+    {
+        $container = $this->createContainer();
 
-        $app->pipe(PhpDebugBarMiddleware::class);
+        $appFactory = new ApplicationFactory();
+        $app = $appFactory($container);
 
         foreach ($pipe as $pattern => $middleware) {
             $app->get($pattern, $middleware);
@@ -36,6 +38,21 @@ protected function dispatchApplication(array $server, array $pipe = [])
 
         $app->run($serverRequest);
 
-        return $emitter->getResponse();
+        return $this->testEmitter->getResponse();
+    }
+
+    /**
+     *
+     * @return ContainerInterface
+     */
+    private function createContainer()
+    {
+        $config = ConfigProvider::getConfig();
+
+        $serviceManagerConfig = $config['dependencies'];
+        $serviceManagerConfig['services']['config'] = $config;
+        $serviceManagerConfig['services'][EmitterInterface::class] = $this->testEmitter;
+
+        return new ServiceManager($serviceManagerConfig);
     }
 }