biurad / php-dependency-injection

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.");
+        }
+    }
 }

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;
-    }
-}