CS fixes per new phpcs rules

Author: weierophinney

phpcs.xml

@@ -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>

src/AbstractFactory/ConfigAbstractFactory.php

@@ -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/Config.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/ServiceManager.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;
         }
 

src/Tool/CliTool.php

@@ -25,15 +25,15 @@ public static function createDependencyConfig(array $config, $className)
         self::validateClassName($className);
 
         $reflectionClass = new \ReflectionClass($className);
-        if (!$reflectionClass->getConstructor()) {
+        if (! $reflectionClass->getConstructor()) {
             return $config;
         }
 
         $constructorArguments = $reflectionClass->getConstructor()->getParameters();
         $constructorArguments = array_filter(
             $constructorArguments,
             function (\ReflectionParameter $argument) {
-                return !$argument->isOptional();
+                return ! $argument->isOptional();
             }
         );
 
@@ -64,22 +64,22 @@ function (\ReflectionParameter $argument) {
      */
     private static function validateClassName($className)
     {
-        if (!is_string($className)) {
+        if (! is_string($className)) {
             throw new InvalidArgumentException('Class name must be a string, ' . gettype($className) . ' given');
         }
 
-        if (!class_exists($className)) {
+        if (! class_exists($className)) {
             throw new InvalidArgumentException('Cannot find class with name ' . $className);
         }
     }
 
     public static function createFactoryMappingsFromConfig(array $config)
     {
-        if (!array_key_exists(ConfigAbstractFactory::class, $config)) {
+        if (! array_key_exists(ConfigAbstractFactory::class, $config)) {
             return $config;
         }
 
-        if (!is_array($config[ConfigAbstractFactory::class])) {
+        if (! is_array($config[ConfigAbstractFactory::class])) {
             throw new InvalidArgumentException(
                 'Config key for ' . ConfigAbstractFactory::class . ' should be an array, ' . gettype(
                     $config[ConfigAbstractFactory::class]