biurad / php-dependency-injection

src/Definitions/InterfaceDefinition.php

Spacing +4 added lines, -4 removed lines

@@ -106,7 +106,7 @@ 
 
         if ($resultDef instanceof Definitions\ServiceDefinition) {
             if ($resultDef->getEntity() instanceof Definitions\Reference && !$resultDef->getFactory()->arguments) {
-                $resultDef->setFactory([ // render as $container->createMethod()
+                $resultDef->setFactory([// render as $container->createMethod()
                     new Definitions\Reference(Nette\DI\ContainerBuilder::THIS_CONTAINER),
                     Nette\DI\Container::getMethodName($resultDef->getEntity()->getValue()),
                 ]);
@@ -130,16 +130,16 @@ 
         $code = new Definitions\Statement('class', $this->resultDefinition->getFactory()->arguments);
         $code = $generator->formatStatement($code);
 
-        $method->setBody('$service = ' . "{$code} " . $class->addExtend($entity) . ';');
+        $method->setBody('$service = '."{$code} ".$class->addExtend($entity).';');
 
         if (!empty($this->resultDefinition->getSetup())) {
             $setups = '';
 
             foreach ($this->resultDefinition->getSetup() as $setup) {
-                $setups .= $generator->formatStatement($setup) . ";\n";
+                $setups .= $generator->formatStatement($setup).";\n";
             }
 
-            $method->addBody("\n" . $setups);
+            $method->addBody("\n".$setups);
         }
 
         $method->addBody('return $service;');

src/Container.php

Spacing +6 added lines, -6 removed lines

@@ -250,8 +250,8 @@ 
 
         if (!\is_object($service)) {
             throw new UnexpectedValueException(
-                "Unable to create service '$name', value returned by " .
-                ($cb instanceof Closure ? 'closure' : "method $method()") . ' is not object.'
+                "Unable to create service '$name', value returned by ".
+                ($cb instanceof Closure ? 'closure' : "method $method()").' is not object.'
             );
         }
 
@@ -272,7 +272,7 @@ 
             \natsort($names);
 
             throw new MissingServiceException(
-                "Multiple services of type $type found: " . \implode(', ', $names) . '.'
+                "Multiple services of type $type found: ".\implode(', ', $names).'.'
             );
         }
 
@@ -437,7 +437,7 @@ 
 
         if (($expectedType = $this->getServiceType($abstract)) && !\is_a($type, $expectedType, true)) {
             throw new ContainerResolutionException(
-                "Service '$abstract' must be instance of $expectedType, " .
+                "Service '$abstract' must be instance of $expectedType, ".
                 ($type ? "$type given." : 'add typehint to closure.')
             );
         }
@@ -478,7 +478,7 @@ 
 
     private function autowireArguments(ReflectionFunctionAbstract $function, array $args = []): array
     {
-        return Resolver::autowireArguments($function, $args, function (string $type, bool $single) {
+        return Resolver::autowireArguments($function, $args, function(string $type, bool $single) {
             return $single
                 ? $this->getByType($type)
                 : \array_map([$this, 'get'], $this->findAutowired($type));
@@ -510,7 +510,7 @@ 
     {
         return \array_flip(\array_filter(
             $methods,
-            function ($s) {
+            function($s) {
                 return \preg_match('#^createService.#', $s);
             }
         ));

src/ContainerPanel.php

Spacing +4 added lines, -4 removed lines

@@ -53,10 +53,10 @@ 
      */
     public function getTab(): string
     {
-        return Nette\Utils\Helpers::capture(function (): void {
+        return Nette\Utils\Helpers::capture(function(): void {
             $elapsedTime = $this->elapsedTime;
 
-            require  $this->diPath . '/templates/ContainerPanel.tab.phtml';
+            require  $this->diPath.'/templates/ContainerPanel.tab.phtml';
         });
     }
 
@@ -83,13 +83,13 @@ 
             }
         }
 
-        return Nette\Utils\Helpers::capture(function () use ($tags, $types, $rc): void {
+        return Nette\Utils\Helpers::capture(function() use ($tags, $types, $rc): void {
             $container = $this->container;
             $file = $rc->getFileName();
             $instances = $this->getContainerProperty('instances');
             $wiring = $this->getContainerProperty('wiring');
 
-            require $this->diPath . '/templates/ContainerPanel.panel.phtml';
+            require $this->diPath.'/templates/ContainerPanel.panel.phtml';
         });
     }
 

src/Exceptions/ParameterNotFoundException.php

Spacing +3 added lines, -3 removed lines

@@ -69,10 +69,10 @@
             } else {
                 $this->message .= ' Did you mean one of these: "';
             }
-            $this->message .= \implode('", "', $this->alternatives) . '"?';
+            $this->message .= \implode('", "', $this->alternatives).'"?';
         } elseif (null !== $this->nonNestedAlternative) {
-            $this->message .= ' You cannot access nested array items, do you want to inject "' .
-            $this->nonNestedAlternative . '" instead?';
+            $this->message .= ' You cannot access nested array items, do you want to inject "'.
+            $this->nonNestedAlternative.'" instead?';
         }
     }
 

src/Resolver.php

Indentation +47 added lines, -47 removed lines

@@ -81,59 +81,59 @@
     }
 
     /**
-	 * Resolves missing argument using autowiring.
+     * Resolves missing argument using autowiring.
      * @param ReflectionParameter $parameter
-	 * @param (callable(string $type, bool $single): object|object[]|null)  $getter
+     * @param (callable(string $type, bool $single): object|object[]|null)  $getter
      *
-	 * @throws ServiceCreationException
+     * @throws ServiceCreationException
      *
-	 * @return mixed
-	 */
-	private static function autowireArgument(ReflectionParameter $parameter, callable $getter)
-	{
-		$type = Reflection::getParameterType($parameter);
-		$method = $parameter->getDeclaringFunction();
-		$desc = Reflection::toString($parameter);
+     * @return mixed
+     */
+    private static function autowireArgument(ReflectionParameter $parameter, callable $getter)
+    {
+        $type = Reflection::getParameterType($parameter);
+        $method = $parameter->getDeclaringFunction();
+        $desc = Reflection::toString($parameter);
 
-		if ($type && !Reflection::isBuiltinType($type)) {
-			try {
-				$res = $getter($type, true);
-			} catch (MissingServiceException $e) {
-				$res = null;
-			} catch (ServiceCreationException $e) {
-				throw new ServiceCreationException("{$e->getMessage()} (needed by $desc)", 0, $e);
-			}
+        if ($type && !Reflection::isBuiltinType($type)) {
+            try {
+                $res = $getter($type, true);
+            } catch (MissingServiceException $e) {
+                $res = null;
+            } catch (ServiceCreationException $e) {
+                throw new ServiceCreationException("{$e->getMessage()} (needed by $desc)", 0, $e);
+            }
             
-			if ($res !== null || $parameter->allowsNull()) {
-				return $res;
-			} elseif (class_exists($type) || interface_exists($type)) {
-				throw new ServiceCreationException("Service of type $type needed by $desc not found. Did you add it to configuration file?");
-			} else {
-				throw new ServiceCreationException("Class $type needed by $desc not found. Check type hint and 'use' statements.");
-			}
+            if ($res !== null || $parameter->allowsNull()) {
+                return $res;
+            } elseif (class_exists($type) || interface_exists($type)) {
+                throw new ServiceCreationException("Service of type $type needed by $desc not found. Did you add it to configuration file?");
+            } else {
+                throw new ServiceCreationException("Class $type needed by $desc not found. Check type hint and 'use' statements.");
+            }
 
-		} elseif (
-			$method instanceof \ReflectionMethod
-			&& $type === 'array'
-			&& preg_match('#@param[ \t]+([\w\\\\]+)\[\][ \t]+\$' . $parameter->name . '#', (string) $method->getDocComment(), $m)
-			&& ($itemType = Reflection::expandClassName($m[1], $method->getDeclaringClass()))
-			&& (class_exists($itemType) || interface_exists($itemType))
-		) {
-			return $getter($itemType, false);
+        } elseif (
+            $method instanceof \ReflectionMethod
+            && $type === 'array'
+            && preg_match('#@param[ \t]+([\w\\\\]+)\[\][ \t]+\$' . $parameter->name . '#', (string) $method->getDocComment(), $m)
+            && ($itemType = Reflection::expandClassName($m[1], $method->getDeclaringClass()))
+            && (class_exists($itemType) || interface_exists($itemType))
+        ) {
+            return $getter($itemType, false);
 
-		} elseif (
-			($type && $parameter->allowsNull())
-			|| $parameter->isOptional()
-			|| $parameter->isDefaultValueAvailable()
-		) {
-			// !optional + defaultAvailable = func($a = null, $b) since 5.4.7
-			// optional + !defaultAvailable = i.e. Exception::__construct, mysqli::mysqli, ...
-			return $parameter->isDefaultValueAvailable()
-				? Reflection::getParameterDefaultValue($parameter)
-				: null;
+        } elseif (
+            ($type && $parameter->allowsNull())
+            || $parameter->isOptional()
+            || $parameter->isDefaultValueAvailable()
+        ) {
+            // !optional + defaultAvailable = func($a = null, $b) since 5.4.7
+            // optional + !defaultAvailable = i.e. Exception::__construct, mysqli::mysqli, ...
+            return $parameter->isDefaultValueAvailable()
+                ? Reflection::getParameterDefaultValue($parameter)
+                : null;
 
-		} else {
-			throw new ServiceCreationException("Parameter $desc has no class type hint or default value, so its value must be specified.");
-		}
-	}
+        } else {
+            throw new ServiceCreationException("Parameter $desc has no class type hint or default value, so its value must be specified.");
+        }
+    }
 }

Spacing +1 added lines, -1 removed lines

@@ -115,7 +115,7 @@
 		} elseif (
 			$method instanceof \ReflectionMethod
 			&& $type === 'array'
-			&& preg_match('#@param[ \t]+([\w\\\\]+)\[\][ \t]+\$' . $parameter->name . '#', (string) $method->getDocComment(), $m)
+			&& preg_match('#@param[ \t]+([\w\\\\]+)\[\][ \t]+\$'.$parameter->name.'#', (string) $method->getDocComment(), $m)
 			&& ($itemType = Reflection::expandClassName($m[1], $method->getDeclaringClass()))
 			&& (class_exists($itemType) || interface_exists($itemType))
 		) {

src/Adapters/XmlAdapter.php

Spacing +6 added lines, -6 removed lines

@@ -60,7 +60,7 @@ 
      */
     public function parse(string $content, $schemaOrCallable = null): DOMDocument
     {
-        $internalErrors  = \libxml_use_internal_errors(true);
+        $internalErrors = \libxml_use_internal_errors(true);
         \libxml_clear_errors();
 
         $dom                  = new DOMDocument();
@@ -225,7 +225,7 @@ 
             $writer->startElement('container');
         }
 
-        $data = \array_map(function ($value) {
+        $data = \array_map(function($value) {
             $value = $this->resolveClassObject($value);
 
             if (\is_array($value)) {
@@ -287,7 +287,7 @@ 
                         unset($value['value']);
 
                         $writer->startElement($key);
-                        \array_walk_recursive($value, function ($item, $id) use (&$writer): void {
+                        \array_walk_recursive($value, function($item, $id) use (&$writer): void {
                             $writer->writeAttribute($id, $item);
                         });
 
@@ -337,10 +337,10 @@ 
                 return true;
             case 'false' === $lowercaseValue:
                 return false;
-            case isset($value[1]) && '0b' == $value[0] . $value[1] && \preg_match('/^0b[01]*$/', $value):
+            case isset($value[1]) && '0b' == $value[0].$value[1] && \preg_match('/^0b[01]*$/', $value):
                 return \bindec($value);
             case \is_numeric($value):
-                return '0x' === $value[0] . $value[1] ? \hexdec($value) : (float) $value;
+                return '0x' === $value[0].$value[1] ? \hexdec($value) : (float) $value;
             case \preg_match('/^0x[0-9a-f]++$/i', $value):
                 return \hexdec($value);
             case \preg_match('/^[+-]?[0-9]+(\.[0-9]+)?$/', $value):
@@ -371,7 +371,7 @@ 
                 return 'true';
             case false === $value:
                 return 'false';
-            case isset($value[1]) && '0b' == $value[0] . $value[1] && \preg_match('/^0b[01]*$/', (string) $value):
+            case isset($value[1]) && '0b' == $value[0].$value[1] && \preg_match('/^0b[01]*$/', (string) $value):
                 return (string) \bindec($value);
             case \preg_match('/^0x[0-9a-f]++$/i', (string) $value):
                 return \hexdec($value);

src/PhpGenerator.php

Indentation -24 removed lines

@@ -58,27 +58,3 @@
     {
         $class->setExtends(Container::class);
         $class->setComment(<<<'COMMENT'
-
-Main DependencyInjection Container. This class has been auto-generated
-by the Nette Dependency Injection Component.
-
-Automatically detects if "container" property are presented in class or uses
-global container as fallback.
-COMMENT);
-
-        return parent::toString($class);
-    }
-
-    public function generateMethod(Definitions\Definition $def): Nette\PhpGenerator\Method
-    {
-        $method   = parent::generateMethod($def);
-        $name     = $def->getName();
-        $comment  = 'This service can be accessed by it\'s name in lower case,';
-        $comment2 = "thus `%s`, using container get or make methods.\n\n@return %s";
-
-        $method->setProtected();
-        $method->setComment(\sprintf($comment . "\n" . $comment2, $name, $def->getType()));
-
-        return $method;
-    }
-}

Switch Indentation -24 removed lines

@@ -58,27 +58,3 @@
     {
         $class->setExtends(Container::class);
         $class->setComment(<<<'COMMENT'
-
-Main DependencyInjection Container. This class has been auto-generated
-by the Nette Dependency Injection Component.
-
-Automatically detects if "container" property are presented in class or uses
-global container as fallback.
-COMMENT);
-
-        return parent::toString($class);
-    }
-
-    public function generateMethod(Definitions\Definition $def): Nette\PhpGenerator\Method
-    {
-        $method   = parent::generateMethod($def);
-        $name     = $def->getName();
-        $comment  = 'This service can be accessed by it\'s name in lower case,';
-        $comment2 = "thus `%s`, using container get or make methods.\n\n@return %s";
-
-        $method->setProtected();
-        $method->setComment(\sprintf($comment . "\n" . $comment2, $name, $def->getType()));
-
-        return $method;
-    }
-}

Spacing -24 removed lines

@@ -58,27 +58,3 @@
     {
         $class->setExtends(Container::class);
         $class->setComment(<<<'COMMENT'
-
-Main DependencyInjection Container. This class has been auto-generated
-by the Nette Dependency Injection Component.
-
-Automatically detects if "container" property are presented in class or uses
-global container as fallback.
-COMMENT);
-
-        return parent::toString($class);
-    }
-
-    public function generateMethod(Definitions\Definition $def): Nette\PhpGenerator\Method
-    {
-        $method   = parent::generateMethod($def);
-        $name     = $def->getName();
-        $comment  = 'This service can be accessed by it\'s name in lower case,';
-        $comment2 = "thus `%s`, using container get or make methods.\n\n@return %s";
-
-        $method->setProtected();
-        $method->setComment(\sprintf($comment . "\n" . $comment2, $name, $def->getType()));
-
-        return $method;
-    }
-}

Braces -24 removed lines

@@ -58,27 +58,3 @@
     {
         $class->setExtends(Container::class);
         $class->setComment(<<<'COMMENT'
-
-Main DependencyInjection Container. This class has been auto-generated
-by the Nette Dependency Injection Component.
-
-Automatically detects if "container" property are presented in class or uses
-global container as fallback.
-COMMENT);
-
-        return parent::toString($class);
-    }
-
-    public function generateMethod(Definitions\Definition $def): Nette\PhpGenerator\Method
-    {
-        $method   = parent::generateMethod($def);
-        $name     = $def->getName();
-        $comment  = 'This service can be accessed by it\'s name in lower case,';
-        $comment2 = "thus `%s`, using container get or make methods.\n\n@return %s";
-
-        $method->setProtected();
-        $method->setComment(\sprintf($comment . "\n" . $comment2, $name, $def->getType()));
-
-        return $method;
-    }
-}

Upper-Lower-Casing -24 removed lines

@@ -58,27 +58,3 @@
     {
         $class->setExtends(Container::class);
         $class->setComment(<<<'COMMENT'
-
-Main DependencyInjection Container. This class has been auto-generated
-by the Nette Dependency Injection Component.
-
-Automatically detects if "container" property are presented in class or uses
-global container as fallback.
-COMMENT);
-
-        return parent::toString($class);
-    }
-
-    public function generateMethod(Definitions\Definition $def): Nette\PhpGenerator\Method
-    {
-        $method   = parent::generateMethod($def);
-        $name     = $def->getName();
-        $comment  = 'This service can be accessed by it\'s name in lower case,';
-        $comment2 = "thus `%s`, using container get or make methods.\n\n@return %s";
-
-        $method->setProtected();
-        $method->setComment(\sprintf($comment . "\n" . $comment2, $name, $def->getType()));
-
-        return $method;
-    }
-}