Merge branch 'feature/cli'

Conflicts: composer.json
detailnet · Aug 11, 2015 · d94d9c5 · d94d9c5
2 parents 4a342cb + 89ff2b5
commit d94d9c5
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/composer.json b/composer.json
@@ -30,16 +30,14 @@
         "zendframework/zend-mvc": "2.*",
         "zendframework/zend-servicemanager": "2.*",
         "zendframework/zend-view": "2.*",
-        "detailnet/dfw-core": "~0.1.1",
-        "detailnet/dfw-log": "~0.2.0",
+        "detailnet/dfw-core": "~0.2",
         "detailnet/dfw-varcrypt": "~0.1.1"
     },
     "require-dev": {
         "phpunit/phpunit": "~4.4.5",
         "squizlabs/php_codesniffer" : "~2.2.0",
         "phpmd/phpmd": "~2.1.3",
-        "satooshi/php-coveralls": "dev-master",
-        "detailnet/blitline": "~0.3.3"
+        "satooshi/php-coveralls": "dev-master"
     },
     "autoload": {
         "psr-0": {

diff --git a/src/Detail/VarCrypt/Factory/Options/ModuleOptionsFactory.php b/src/Detail/VarCrypt/Factory/Options/ModuleOptionsFactory.php
@@ -6,7 +6,6 @@
 
 use Zend\Config\Factory as ConfigFactory;
 use Zend\ModuleManager\Listener\ConfigListener;
-use Zend\ModuleManager\Listener\DefaultListenerAggregate;
 use Zend\ModuleManager\Listener\ListenerOptions;
 use Zend\ServiceManager\FactoryInterface;
 use Zend\ServiceManager\ServiceLocatorInterface;