Merge pull request #2 from weierophinney/feature/add-cli-tool-for-config

Refactor of CliTool

Author: GeeH

bin/dump-config.php

@@ -0,0 +1,25 @@
+#!/usr/bin/env php
+<?php
+/**
+ * @link      http://github.com/zendframework/zend-servicemanager for the canonical source repository
+ * @copyright Copyright (c) 2016 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+namespace Zend\ServiceManager;
+
+// Setup/verify autoloading
+if (file_exists($a = getcwd() . '/vendor/autoload.php')) {
+    require $a;
+} elseif (file_exists($a = __DIR__ . '/../../../autoload.php')) {
+    require $a;
+} elseif (file_exists($a = __DIR__ . '/../vendor/autoload.php')) {
+    require $a;
+} else {
+    fwrite(STDERR, 'Cannot locate autoloader; please run "composer install"' . PHP_EOL);
+    exit(1);
+}
+
+$command = new Tool\ConfigDumperCommand($argv[0]);
+$status = $command(array_slice($argv, 1));
+exit($status);

bin/generate-deps-for-config-factory

@@ -43,5 +43,8 @@
     },
     "provide": {
         "container-interop/container-interop-implementation": "^1.1"
-    }
+    },
+    "bin": [
+        "bin/generate-deps-for-config-factory"
+    ]
 }

composer.json

@@ -9,15 +9,21 @@
     <!-- inherit rules from: -->
     <rule ref="PSR2"/>
     <rule ref="Generic.Arrays.DisallowLongArraySyntax"/>
+    <rule ref="Generic.Formatting.SpaceAfterNot"/>
+    <rule ref="Squiz.WhiteSpace.OperatorSpacing">
+        <properties>
+            <property name="ignoreNewlines" value="true"/>
+        </properties>
+    </rule>
     <rule ref="Squiz.WhiteSpace.SuperfluousWhitespace">
         <properties>
             <property name="ignoreBlankLines" value="false"/>
         </properties>
     </rule>
 
     <!-- Paths to check -->
+    <file>bin</file>
     <file>src</file>
     <file>test</file>
-    <file>bin</file>
     <exclude-pattern>*/test/log/*</exclude-pattern>
 </ruleset>

phpcs.xml

@@ -22,7 +22,7 @@ final class ConfigAbstractFactory implements AbstractFactoryInterface
      */
     public function canCreate(\Interop\Container\ContainerInterface $container, $requestedName)
     {
-        if (!$container->has('config') || !array_key_exists(self::class, $container->get('config'))) {
+        if (! $container->has('config') || ! array_key_exists(self::class, $container->get('config'))) {
             return false;
         }
         $config = $container->get('config');
@@ -36,25 +36,25 @@ public function canCreate(\Interop\Container\ContainerInterface $container, $req
      */
     public function __invoke(\Interop\Container\ContainerInterface $container, $requestedName, array $options = null)
     {
-        if (!$container->has('config')) {
+        if (! $container->has('config')) {
             throw new ServiceNotCreatedException('Cannot find a config array in the container');
         }
 
         $config = $container->get('config');
 
-        if (!is_array($config)) {
+        if (! is_array($config)) {
             throw new ServiceNotCreatedException('Config must be an array');
         }
 
-        if (!array_key_exists(self::class, $config)) {
+        if (! array_key_exists(self::class, $config)) {
             throw new ServiceNotCreatedException('Cannot find a `' . self::class . '` key in the config array');
         }
 
         $dependencies = $config[self::class];
 
-        if (!is_array($dependencies)
-            || !array_key_exists($requestedName, $dependencies)
-            || !is_array($dependencies[$requestedName])
+        if (! is_array($dependencies)
+            || ! array_key_exists($requestedName, $dependencies)
+            || ! is_array($dependencies[$requestedName])
         ) {
             throw new ServiceNotCreatedException('Dependencies config must exist and be an array');
         }

src/AbstractFactory/ConfigAbstractFactory.php

@@ -111,7 +111,7 @@ private function merge(array $a, array $b)
                     $a[$key] = $value;
                 }
             } else {
-                if (!$value instanceof MergeRemoveKey) {
+                if (! $value instanceof MergeRemoveKey) {
                     $a[$key] = $value;
                 }
             }

src/Config.php

@@ -520,7 +520,7 @@ private function resolveAbstractFactories(array $abstractFactories)
         foreach ($abstractFactories as $abstractFactory) {
             if (is_string($abstractFactory) && class_exists($abstractFactory)) {
                 //Cached string
-                if (!isset($this->cachedAbstractFactories[$abstractFactory])) {
+                if (! isset($this->cachedAbstractFactories[$abstractFactory])) {
                     $this->cachedAbstractFactories[$abstractFactory] = new $abstractFactory();
                 }
 
@@ -754,7 +754,7 @@ private function createDelegatorFromName($name, array $options = null)
     private function doCreate($resolvedName, array $options = null)
     {
         try {
-            if (!isset($this->delegators[$resolvedName])) {
+            if (! isset($this->delegators[$resolvedName])) {
                 // Let's create the service by fetching the factory
                 $factory = $this->getFactory($resolvedName);
                 $object  = $factory($this->creationContext, $resolvedName, $options);
@@ -889,7 +889,7 @@ private function createFactoriesForInvokables(array $invokables)
      */
     private function validateOverrides(array $config)
     {
-        if ($this->allowOverride || !$this->configured) {
+        if ($this->allowOverride || ! $this->configured) {
             return;
         }