Merge pull request #609 from cakephp/fix-toolbar-config

Fixed configuration passing in middleware

Author: lorenzo

src/Middleware/DebugKitMiddleware.php

@@ -11,6 +11,7 @@
  */
 namespace DebugKit\Middleware;
 
+use Cake\Core\Configure;
 use Cake\Event\EventManager;
 use DebugKit\ToolbarService;
 
@@ -31,7 +32,7 @@ class DebugKitMiddleware
      */
     public function __construct(ToolbarService $service = null)
     {
-        $service = $service ?: new ToolbarService(EventManager::instance(), []);
+        $service = $service ?: new ToolbarService(EventManager::instance(), (array)Configure::read('DebugKit'));
         $this->service = $service;
     }
 

tests/TestCase/Middleware/DebugKitMiddlewareTest.php

@@ -39,6 +39,7 @@ class DebugKitMiddlewareTest extends TestCase
         'plugin.debug_kit.requests',
         'plugin.debug_kit.panels'
     ];
+
     /**
      * setup
      *
@@ -50,6 +51,19 @@ public function setUp()
 
         $connection = ConnectionManager::get('test');
         $this->skipIf($connection->getDriver() instanceof Sqlite, 'Schema insertion/removal breaks SQLite');
+        $this->oldConfig = Configure::read('DebugKit');
+    }
+
+    /**
+     * tearDown
+     *
+     * @return void
+     */
+    public function tearDown()
+    {
+        parent::tearDown();
+
+        Configure::write('DebugKit', $this->oldConfig);
     }
 
     /**
@@ -205,4 +219,20 @@ public function testInvokeNoModifyRequestAction()
         $body = $result->getBody();
         $this->assertNotContains('<script', '' . $body);
     }
+
+    /**
+     * Test that configuration is correctly passed to the service
+     *
+     * @return void
+     */
+    public function testConfigIsPassed()
+    {
+        $config = ['foo' => 'bar'];
+        Configure::write('DebugKit', $config);
+        $layer = new DebugKitMiddleware();
+        $prop = new \ReflectionProperty(DebugKitMiddleware::class, 'service');
+        $prop->setAccessible(true);
+        $service = $prop->getValue($layer);
+        $this->assertEquals('bar', $service->getConfig('foo'));
+    }
 }