Add unit tests and fix error if Zend\Db\Adapter\Adapter is defined in…

… service manager but not configured

.gitignore

@@ -0,0 +1,4 @@
+/nbproject/
+*.phar
+vendor/
+composer.lock

composer.json

@@ -23,12 +23,20 @@
         "maximebf/debugbar": "1.*",
         "zendframework/zendframework": "2.*"
     },
+    "require-dev": {
+        "phpunit/phpunit": "~4.0"
+    },
     "autoload": {
         "psr-0": {
             "ZfSnapPhpDebugBar": "src/"
         },
         "classmap": [
             "./Module.php"
         ]
+    },
+    "autoload-dev": {
+        "psr-4": {
+            "ZfSnapPhpDebugBar\\Tests\\": "tests/"
+        }
     }
 }

config/zfsnapphpdebugbar.config.php

@@ -6,6 +6,8 @@
         // Enables/disables PHP Debug Bar
         'enabled' => true,
 
+        'auto-append-assets' => true,
+
         // ServiceManager keys to inject collectors
         // http://phpdebugbar.com/docs/data-collectors.html
         'collectors' => array(),

src/ZfSnapPhpDebugBar/Module.php

@@ -85,8 +85,10 @@ public function onBootstrap(EventInterface $e)
         $application = $e->getApplication();
         $serviceManager = $application->getServiceManager();
         $config = $serviceManager->get('config');
+        $request = $application->getRequest();
+        $debugbarConfig = $config['php-debug-bar'];
 
-        if ($config['php-debug-bar']['enabled'] !== true) {
+        if ($debugbarConfig['enabled'] !== true || !($request instanceof \Zend\Http\PhpEnvironment\Request)) {
             return;
         }
         $applicationEventManager = $application->getEventManager();
@@ -102,7 +104,9 @@ public function onBootstrap(EventInterface $e)
         require __DIR__ . '/Functions.php';
 
         // Auto enable assets
-        $viewRenderer->plugin('DebugBar')->appendAssets();
+        if ($debugbarConfig['auto-append-assets']) {
+            $viewRenderer->plugin('DebugBar')->appendAssets();
+        }
 
         // Timeline
         $measureListener = function(EventInterface $e) use ($timeCollector, &$lastMeasure) {

src/ZfSnapPhpDebugBar/Service/PhpDebugBarFactory.php

@@ -37,7 +37,7 @@ public function createService(Locator $serviceLocator)
         $debugbar->addCollector(new ConfigCollector($appConfig, 'ApplicationConfig'));
 
         // Db profiler
-        if ($serviceLocator->has('Zend\Db\Adapter\Adapter')) {
+        if ($serviceLocator->has('Zend\Db\Adapter\Adapter') && isset($config['db']['driver'])) {
             $adapter = $serviceLocator->get('Zend\Db\Adapter\Adapter');
             $this->prepareDbAdapter($adapter, $debugbar);
         }

tests/Functional/DbCollectorTest.php

@@ -0,0 +1,23 @@
+<?php
+
+namespace ZfSnapPhpDebugBar\Tests\Functional;
+
+/**
+ * DbCollectorTest
+ *
+ * @author Witold Wasiczko <witold@wasiczko.pl>
+ */
+class DbCollectorTest extends \Zend\Test\PHPUnit\Controller\AbstractHttpControllerTestCase
+{
+    protected function setUp()
+    {
+        $this->setApplicationConfig(include __DIR__.'/../assets/application.config.php');
+    }
+
+    public function testDbIsNotConfigured()
+    {
+        $this->dispatch('/');
+
+        $this->assertResponseStatusCode(200);
+    }
+}

tests/Functional/DummyController.php

@@ -0,0 +1,18 @@
+<?php
+
+namespace ZfSnapPhpDebugBar\Tests\Functional;
+
+use Zend\Mvc\Controller\AbstractActionController;
+
+/**
+ * DummyController
+ *
+ * @author Witold Wasiczko <witold@wasiczko.pl>
+ */
+class DummyController extends AbstractActionController
+{
+    public function indexAction()
+    {
+        return $this->getResponse();
+    }
+}

tests/assets/application.config.php

@@ -0,0 +1,12 @@
+<?php
+
+return array(
+    'modules' => array(
+        'ZfSnapPhpDebugBar',
+    ),
+    'module_listener_options' => array(
+        'config_glob_paths' => array(
+            __DIR__.'/local.config.php',
+        ),
+    ),
+);

tests/assets/local.config.php

@@ -0,0 +1,31 @@
+<?php
+
+return array(
+    'controllers' => array(
+        'invokables' => array(
+            'ZfSnapPhpDebugBar\Tests\Functional\DummyController' => 'ZfSnapPhpDebugBar\Tests\Functional\DummyController',
+        ),
+    ),
+    'php-debug-bar' => array(
+        'auto-append-assets' => false,
+    ),
+    'router' => [
+        'routes' => [
+            'home' => [
+                'type' => 'Zend\Mvc\Router\Http\Literal',
+                'options' => [
+                    'route' => '/',
+                    'defaults' => [
+                        'controller' => 'ZfSnapPhpDebugBar\Tests\Functional\DummyController',
+                        'action' => 'index',
+                    ],
+                ],
+            ],
+        ],
+    ],
+    'service_manager' => array(
+        'factories' => array(
+            'Zend\Db\Adapter\Adapter' => 'Zend\Db\Adapter\AdapterServiceFactory',
+        ),
+    ),
+);

tests/bootstrap.php

@@ -0,0 +1,3 @@
+<?php
+
+require_once '../vendor/autoload.php';

tests/phpunit.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<phpunit bootstrap="bootstrap.php" colors="true">
+    <testsuite name="ZfSnapPhpDebugBar">
+        <directory>./</directory>
+    </testsuite>
+</phpunit>