spiral / framework

src/Core/tests/Fixtures/UnionTypes.php

Spacing +1 added lines, -1 removed lines

@@ -13,7 +13,7 @@
 
 class UnionTypes
 {
-    public static function example(SampleClass|TypedClass $example)
+    public static function example(SampleClass | TypedClass $example)
     {
     }
 }

src/Core/src/Container.php

Spacing +70 added lines, -70 removed lines

@@ -98,7 +98,7 @@ 
     {
         $arguments = [];
 
-        foreach ($reflection->getParameters() as $parameter) {
+        foreach ($reflection->getParameters() as $parameter){
             $type = $parameter->getType();
             $name = $parameter->getName();
             $class = null;
@@ -107,17 +107,17 @@ 
             // Container do not currently support union types. In the future, we
             // can provide the possibility of autowiring based on priorities (TBD).
             //
-            if ($type instanceof \ReflectionUnionType) {
+            if ($type instanceof \ReflectionUnionType){
                 $error = 'Parameter $%s in %s contain union type hint which cannot be inferred unambiguously';
                 $error = \sprintf($error, $reflection->getName(), $this->getLocationString($reflection));
 
                 throw new ContainerException($error);
             }
 
-            if ($type instanceof \ReflectionNamedType && !$type->isBuiltin()) {
-                try {
+            if ($type instanceof \ReflectionNamedType && !$type->isBuiltin()){
+                try{
                     $class = new \ReflectionClass($type->getName());
-                } catch (\ReflectionException $e) {
+                }catch (\ReflectionException $e){
                     $location = $this->getLocationString($reflection);
                     $error = "Unable to resolve `\${$parameter->getName()}` parameter in {$location}: {$e->getMessage()}";
 
@@ -125,11 +125,11 @@ 
                 }
             }
 
-            if (isset($parameters[$name]) && is_object($parameters[$name])) {
-                if ($parameters[$name] instanceof Autowire) {
+            if (isset($parameters[$name]) && is_object($parameters[$name])){
+                if ($parameters[$name] instanceof Autowire){
                     //Supplied by user as late dependency
                     $arguments[] = $parameters[$name]->resolve($this);
-                } else {
+                }else{
                     //Supplied by user as object
                     $arguments[] = $parameters[$name];
                 }
@@ -137,16 +137,16 @@ 
             }
 
             // no declared type or scalar type or array
-            if (!isset($class)) {
+            if (!isset($class)){
                 //Provided from outside
-                if (\array_key_exists($name, $parameters)) {
+                if (\array_key_exists($name, $parameters)){
                     //Make sure it's properly typed
                     $this->assertType($parameter, $reflection, $parameters[$name]);
                     $arguments[] = $parameters[$name];
                     continue;
                 }
 
-                if ($parameter->isDefaultValueAvailable()) {
+                if ($parameter->isDefaultValueAvailable()){
                     //Default value
                     $arguments[] = $parameter->getDefaultValue();
                     continue;
@@ -156,12 +156,12 @@ 
                 throw new ArgumentException($parameter, $reflection);
             }
 
-            try {
+            try{
                 //Requesting for contextual dependency
                 $arguments[] = $this->get($class->getName(), $name);
                 continue;
-            } catch (AutowireException $e) {
-                if ($parameter->isOptional()) {
+            }catch (AutowireException $e){
+                if ($parameter->isOptional()){
                     //This is optional dependency, skip
                     $arguments[] = null;
                     continue;
@@ -191,7 +191,7 @@ 
      */
     public function get($alias, string $context = null)
     {
-        if ($alias instanceof Autowire) {
+        if ($alias instanceof Autowire){
             return $alias->resolve($this);
         }
 
@@ -207,34 +207,34 @@ 
      */
     public function make(string $alias, array $parameters = [], string $context = null)
     {
-        if (!isset($this->bindings[$alias])) {
+        if (!isset($this->bindings[$alias])){
             //No direct instructions how to construct class, make is automatically
             return $this->autowire($alias, $parameters, $context);
         }
 
         $binding = $this->bindings[$alias];
-        if (\is_object($binding)) {
+        if (\is_object($binding)){
             //When binding is instance, assuming singleton
             return $binding;
         }
 
-        if (\is_string($binding)) {
+        if (\is_string($binding)){
             //Binding is pointing to something else
             return $this->make($binding, $parameters, $context);
         }
 
         unset($this->bindings[$alias]);
-        try {
-            if ($binding[0] === $alias) {
+        try{
+            if ($binding[0] === $alias){
                 $instance = $this->autowire($alias, $parameters, $context);
-            } else {
+            }else{
                 $instance = $this->evaluateBinding($alias, $binding[0], $parameters, $context);
             }
-        } finally {
+        }finally{
             $this->bindings[$alias] = $binding;
         }
 
-        if ($binding[1]) {
+        if ($binding[1]){
             //Indicates singleton
             $this->bindings[$alias] = $instance;
         }
@@ -248,28 +248,28 @@ 
     public function runScope(array $bindings, callable $scope)
     {
         $cleanup = $previous = [];
-        foreach ($bindings as $alias => $resolver) {
-            if (isset($this->bindings[$alias])) {
+        foreach ($bindings as $alias => $resolver){
+            if (isset($this->bindings[$alias])){
                 $previous[$alias] = $this->bindings[$alias];
-            } else {
+            }else{
                 $cleanup[] = $alias;
             }
 
             $this->bind($alias, $resolver);
         }
 
-        try {
-            if (ContainerScope::getContainer() !== $this) {
+        try{
+            if (ContainerScope::getContainer() !== $this){
                 return ContainerScope::runScope($this, $scope);
             }
 
             return $scope();
-        } finally {
-            foreach (\array_reverse($previous) as $alias => $resolver) {
+        }finally{
+            foreach (\array_reverse($previous) as $alias => $resolver){
                 $this->bindings[$alias] = $resolver;
             }
 
-            foreach ($cleanup as $alias) {
+            foreach ($cleanup as $alias){
                 unset($this->bindings[$alias]);
             }
         }
@@ -285,7 +285,7 @@ 
      */
     public function bind(string $alias, $resolver): void
     {
-        if (\is_array($resolver) || $resolver instanceof \Closure || $resolver instanceof Autowire) {
+        if (\is_array($resolver) || $resolver instanceof \Closure || $resolver instanceof Autowire){
             // array means = execute me, false = not singleton
             $this->bindings[$alias] = [$resolver, false];
 
@@ -304,7 +304,7 @@ 
      */
     public function bindSingleton(string $alias, $resolver): void
     {
-        if (\is_object($resolver) && !$resolver instanceof \Closure && !$resolver instanceof Autowire) {
+        if (\is_object($resolver) && !$resolver instanceof \Closure && !$resolver instanceof Autowire){
             // direct binding to an instance
             $this->bindings[$alias] = $resolver;
 
@@ -322,11 +322,11 @@ 
      */
     public function hasInstance(string $alias): bool
     {
-        if (!$this->has($alias)) {
+        if (!$this->has($alias)){
             return false;
         }
 
-        while (isset($this->bindings[$alias]) && \is_string($this->bindings[$alias])) {
+        while (isset($this->bindings[$alias]) && \is_string($this->bindings[$alias])){
             //Checking alias tree
             $alias = $this->bindings[$alias];
         }
@@ -408,7 +408,7 @@ 
      */
     protected function autowire(string $class, array $parameters, string $context = null)
     {
-        if (!\class_exists($class)) {
+        if (!\class_exists($class)){
             throw new NotFoundException(\sprintf("Undefined class or binding '%s'", $class));
         }
 
@@ -427,7 +427,7 @@ 
     {
         $location = $reflection->getName();
 
-        if ($reflection instanceof \ReflectionMethod) {
+        if ($reflection instanceof \ReflectionMethod){
             return "{$reflection->getDeclaringClass()->getName()}::{$location}()";
         }
 
@@ -446,11 +446,11 @@ 
      */
     private function assertType(\ReflectionParameter $parameter, ContextFunction $context, $value): void
     {
-        if ($value === null) {
+        if ($value === null){
             if (
                 !$parameter->isOptional() &&
                 !($parameter->isDefaultValueAvailable() && $parameter->getDefaultValue() === null)
-            ) {
+            ){
                 throw new ArgumentException($parameter, $context);
             }
 
@@ -458,20 +458,20 @@ 
         }
 
         $type = $parameter->getType();
-        if ($type === null) {
+        if ($type === null){
             return;
         }
 
         $typeName = $type->getName();
-        if ($typeName === 'array' && !\is_array($value)) {
+        if ($typeName === 'array' && !\is_array($value)){
             throw new ArgumentException($parameter, $context);
         }
 
-        if (($typeName === 'int' || $typeName === 'float') && !\is_numeric($value)) {
+        if (($typeName === 'int' || $typeName === 'float') && !\is_numeric($value)){
             throw new ArgumentException($parameter, $context);
         }
 
-        if ($typeName === 'bool' && !\is_bool($value) && !\is_numeric($value)) {
+        if ($typeName === 'bool' && !\is_bool($value) && !\is_numeric($value)){
             throw new ArgumentException($parameter, $context);
         }
     }
@@ -489,22 +489,22 @@ 
      */
     private function createInstance(string $class, array $parameters, string $context = null)
     {
-        try {
+        try{
             $reflection = new \ReflectionClass($class);
-        } catch (\ReflectionException $e) {
+        }catch (\ReflectionException $e){
             throw new ContainerException($e->getMessage(), $e->getCode(), $e);
         }
 
         //We have to construct class using external injector when we know exact context
-        if ($parameters === [] && $this->checkInjector($reflection)) {
+        if ($parameters === [] && $this->checkInjector($reflection)){
             $injector = $this->injectors[$reflection->getName()];
 
             $instance = null;
-            try {
+            try{
                 /** @var InjectorInterface $injectorInstance */
                 $injectorInstance = $this->get($injector);
 
-                if (!$injectorInstance instanceof InjectorInterface) {
+                if (!$injectorInstance instanceof InjectorInterface){
                     throw new InjectionException(
                         \sprintf(
                             "Class '%s' must be an instance of InjectorInterface for '%s'",
@@ -515,7 +515,7 @@ 
                 }
 
                 $instance = $injectorInstance->createInjection($reflection, $context);
-                if (!$reflection->isInstance($instance)) {
+                if (!$reflection->isInstance($instance)){
                     throw new InjectionException(
                         \sprintf(
                             "Invalid injection response for '%s'",
@@ -523,23 +523,23 @@ 
                         )
                     );
                 }
-            } finally {
+            }finally{
                 $this->injectors[$reflection->getName()] = $injector;
             }
 
             return $instance;
         }
 
-        if (!$reflection->isInstantiable()) {
+        if (!$reflection->isInstantiable()){
             throw new ContainerException(\sprintf("Class '%s' can not be constructed", $class));
         }
 
         $constructor = $reflection->getConstructor();
 
-        if ($constructor !== null) {
+        if ($constructor !== null){
             // Using constructor with resolved arguments
             $instance = $reflection->newInstanceArgs($this->resolveArguments($constructor, $parameters));
-        } else {
+        }else{
             // No constructor specified
             $instance = $reflection->newInstance();
         }
@@ -556,28 +556,28 @@ 
     private function checkInjector(\ReflectionClass $reflection): bool
     {
         $class = $reflection->getName();
-        if (\array_key_exists($class, $this->injectors)) {
+        if (\array_key_exists($class, $this->injectors)){
             return $this->injectors[$class] !== null;
         }
 
         if (
             $reflection->implementsInterface(InjectableInterface::class)
             && $reflection->hasConstant('INJECTOR')
-        ) {
+        ){
             $this->injectors[$class] = $reflection->getConstant('INJECTOR');
 
             return true;
         }
 
-        if (!isset($this->injectorsCache[$class])) {
+        if (!isset($this->injectorsCache[$class])){
             $this->injectorsCache[$class] = null;
 
             // check interfaces
-            foreach ($this->injectors as $target => $injector) {
+            foreach ($this->injectors as $target => $injector){
                 if (
                     \class_exists($target, true)
                     && $reflection->isSubclassOf($target)
-                ) {
+                ){
                     $this->injectors[$class] = $injector;
 
                     return true;
@@ -586,7 +586,7 @@ 
                 if (
                     \interface_exists($target, true)
                     && $reflection->implementsInterface($target)
-                ) {
+                ){
                     $this->injectors[$class] = $injector;
 
                     return true;
@@ -608,9 +608,9 @@ 
     private function registerInstance($instance, array $parameters)
     {
         //Declarative singletons (only when class received via direct get)
-        if ($parameters === [] && $instance instanceof SingletonInterface) {
+        if ($parameters === [] && $instance instanceof SingletonInterface){
             $alias = \get_class($instance);
-            if (!isset($this->bindings[$alias])) {
+            if (!isset($this->bindings[$alias])){
                 $this->bindings[$alias] = $instance;
             }
         }
@@ -634,20 +634,20 @@ 
         $target,
         array $parameters,
         string $context = null
-    ) {
-        if (\is_string($target)) {
+    ){
+        if (\is_string($target)){
             //Reference
             return $this->make($target, $parameters, $context);
         }
 
-        if ($target instanceof Autowire) {
+        if ($target instanceof Autowire){
             return $target->resolve($this, $parameters);
         }
 
-        if ($target instanceof \Closure) {
-            try {
+        if ($target instanceof \Closure){
+            try{
                 $reflection = new \ReflectionFunction($target);
-            } catch (\ReflectionException $e) {
+            }catch (\ReflectionException $e){
                 throw new ContainerException($e->getMessage(), $e->getCode(), $e);
             }
 
@@ -657,16 +657,16 @@ 
             );
         }
 
-        if (is_array($target) && isset($target[1])) {
+        if (is_array($target) && isset($target[1])){
             //In a form of resolver and method
             [$resolver, $method] = $target;
 
             //Resolver instance (i.e. [ClassName::class, 'method'])
             $resolver = $this->get($resolver);
 
-            try {
+            try{
                 $method = new \ReflectionMethod($resolver, $method);
-            } catch (\ReflectionException $e) {
+            }catch (\ReflectionException $e){
                 throw new ContainerException($e->getMessage(), $e->getCode(), $e);
             }
 

Braces +142 added lines, -65 removed lines

@@ -98,7 +98,8 @@ 
     {
         $arguments = [];
 
-        foreach ($reflection->getParameters() as $parameter) {
+        foreach ($reflection->getParameters() as $parameter)
+        {
             $type = $parameter->getType();
             $name = $parameter->getName();
             $class = null;
@@ -107,17 +108,22 @@ 
             // Container do not currently support union types. In the future, we
             // can provide the possibility of autowiring based on priorities (TBD).
             //
-            if ($type instanceof \ReflectionUnionType) {
+            if ($type instanceof \ReflectionUnionType)
+            {
                 $error = 'Parameter $%s in %s contain union type hint which cannot be inferred unambiguously';
                 $error = \sprintf($error, $reflection->getName(), $this->getLocationString($reflection));
 
                 throw new ContainerException($error);
             }
 
-            if ($type instanceof \ReflectionNamedType && !$type->isBuiltin()) {
-                try {
+            if ($type instanceof \ReflectionNamedType && !$type->isBuiltin())
+            {
+                try
+                {
                     $class = new \ReflectionClass($type->getName());
-                } catch (\ReflectionException $e) {
+                }
+                catch (\ReflectionException $e)
+                {
                     $location = $this->getLocationString($reflection);
                     $error = "Unable to resolve `\${$parameter->getName()}` parameter in {$location}: {$e->getMessage()}";
 
@@ -125,11 +131,15 @@ 
                 }
             }
 
-            if (isset($parameters[$name]) && is_object($parameters[$name])) {
-                if ($parameters[$name] instanceof Autowire) {
+            if (isset($parameters[$name]) && is_object($parameters[$name]))
+            {
+                if ($parameters[$name] instanceof Autowire)
+                {
                     //Supplied by user as late dependency
                     $arguments[] = $parameters[$name]->resolve($this);
-                } else {
+                }
+                else
+                {
                     //Supplied by user as object
                     $arguments[] = $parameters[$name];
                 }
@@ -137,16 +147,19 @@ 
             }
 
             // no declared type or scalar type or array
-            if (!isset($class)) {
+            if (!isset($class))
+            {
                 //Provided from outside
-                if (\array_key_exists($name, $parameters)) {
+                if (\array_key_exists($name, $parameters))
+                {
                     //Make sure it's properly typed
                     $this->assertType($parameter, $reflection, $parameters[$name]);
                     $arguments[] = $parameters[$name];
                     continue;
                 }
 
-                if ($parameter->isDefaultValueAvailable()) {
+                if ($parameter->isDefaultValueAvailable())
+                {
                     //Default value
                     $arguments[] = $parameter->getDefaultValue();
                     continue;
@@ -156,12 +169,16 @@ 
                 throw new ArgumentException($parameter, $reflection);
             }
 
-            try {
+            try
+            {
                 //Requesting for contextual dependency
                 $arguments[] = $this->get($class->getName(), $name);
                 continue;
-            } catch (AutowireException $e) {
-                if ($parameter->isOptional()) {
+            }
+            catch (AutowireException $e)
+            {
+                if ($parameter->isOptional())
+                {
                     //This is optional dependency, skip
                     $arguments[] = null;
                     continue;
@@ -191,7 +208,8 @@ 
      */
     public function get($alias, string $context = null)
     {
-        if ($alias instanceof Autowire) {
+        if ($alias instanceof Autowire)
+        {
             return $alias->resolve($this);
         }
 
@@ -207,34 +225,44 @@ 
      */
     public function make(string $alias, array $parameters = [], string $context = null)
     {
-        if (!isset($this->bindings[$alias])) {
+        if (!isset($this->bindings[$alias]))
+        {
             //No direct instructions how to construct class, make is automatically
             return $this->autowire($alias, $parameters, $context);
         }
 
         $binding = $this->bindings[$alias];
-        if (\is_object($binding)) {
+        if (\is_object($binding))
+        {
             //When binding is instance, assuming singleton
             return $binding;
         }
 
-        if (\is_string($binding)) {
+        if (\is_string($binding))
+        {
             //Binding is pointing to something else
             return $this->make($binding, $parameters, $context);
         }
 
         unset($this->bindings[$alias]);
-        try {
-            if ($binding[0] === $alias) {
+        try
+        {
+            if ($binding[0] === $alias)
+            {
                 $instance = $this->autowire($alias, $parameters, $context);
-            } else {
+            }
+            else
+            {
                 $instance = $this->evaluateBinding($alias, $binding[0], $parameters, $context);
             }
-        } finally {
+        }
+        finally
+        {
             $this->bindings[$alias] = $binding;
         }
 
-        if ($binding[1]) {
+        if ($binding[1])
+        {
             //Indicates singleton
             $this->bindings[$alias] = $instance;
         }
@@ -248,28 +276,38 @@ 
     public function runScope(array $bindings, callable $scope)
     {
         $cleanup = $previous = [];
-        foreach ($bindings as $alias => $resolver) {
-            if (isset($this->bindings[$alias])) {
+        foreach ($bindings as $alias => $resolver)
+        {
+            if (isset($this->bindings[$alias]))
+            {
                 $previous[$alias] = $this->bindings[$alias];
-            } else {
+            }
+            else
+            {
                 $cleanup[] = $alias;
             }
 
             $this->bind($alias, $resolver);
         }
 
-        try {
-            if (ContainerScope::getContainer() !== $this) {
+        try
+        {
+            if (ContainerScope::getContainer() !== $this)
+            {
                 return ContainerScope::runScope($this, $scope);
             }
 
             return $scope();
-        } finally {
-            foreach (\array_reverse($previous) as $alias => $resolver) {
+        }
+        finally
+        {
+            foreach (\array_reverse($previous) as $alias => $resolver)
+            {
                 $this->bindings[$alias] = $resolver;
             }
 
-            foreach ($cleanup as $alias) {
+            foreach ($cleanup as $alias)
+            {
                 unset($this->bindings[$alias]);
             }
         }
@@ -285,7 +323,8 @@ 
      */
     public function bind(string $alias, $resolver): void
     {
-        if (\is_array($resolver) || $resolver instanceof \Closure || $resolver instanceof Autowire) {
+        if (\is_array($resolver) || $resolver instanceof \Closure || $resolver instanceof Autowire)
+        {
             // array means = execute me, false = not singleton
             $this->bindings[$alias] = [$resolver, false];
 
@@ -304,7 +343,8 @@ 
      */
     public function bindSingleton(string $alias, $resolver): void
     {
-        if (\is_object($resolver) && !$resolver instanceof \Closure && !$resolver instanceof Autowire) {
+        if (\is_object($resolver) && !$resolver instanceof \Closure && !$resolver instanceof Autowire)
+        {
             // direct binding to an instance
             $this->bindings[$alias] = $resolver;
 
@@ -322,11 +362,13 @@ 
      */
     public function hasInstance(string $alias): bool
     {
-        if (!$this->has($alias)) {
+        if (!$this->has($alias))
+        {
             return false;
         }
 
-        while (isset($this->bindings[$alias]) && \is_string($this->bindings[$alias])) {
+        while (isset($this->bindings[$alias]) && \is_string($this->bindings[$alias]))
+        {
             //Checking alias tree
             $alias = $this->bindings[$alias];
         }
@@ -408,7 +450,8 @@ 
      */
     protected function autowire(string $class, array $parameters, string $context = null)
     {
-        if (!\class_exists($class)) {
+        if (!\class_exists($class))
+        {
             throw new NotFoundException(\sprintf("Undefined class or binding '%s'", $class));
         }
 
@@ -427,7 +470,8 @@ 
     {
         $location = $reflection->getName();
 
-        if ($reflection instanceof \ReflectionMethod) {
+        if ($reflection instanceof \ReflectionMethod)
+        {
             return "{$reflection->getDeclaringClass()->getName()}::{$location}()";
         }
 
@@ -446,7 +490,8 @@ 
      */
     private function assertType(\ReflectionParameter $parameter, ContextFunction $context, $value): void
     {
-        if ($value === null) {
+        if ($value === null)
+        {
             if (
                 !$parameter->isOptional() &&
                 !($parameter->isDefaultValueAvailable() && $parameter->getDefaultValue() === null)
@@ -458,20 +503,24 @@ 
         }
 
         $type = $parameter->getType();
-        if ($type === null) {
+        if ($type === null)
+        {
             return;
         }
 
         $typeName = $type->getName();
-        if ($typeName === 'array' && !\is_array($value)) {
+        if ($typeName === 'array' && !\is_array($value))
+        {
             throw new ArgumentException($parameter, $context);
         }
 
-        if (($typeName === 'int' || $typeName === 'float') && !\is_numeric($value)) {
+        if (($typeName === 'int' || $typeName === 'float') && !\is_numeric($value))
+        {
             throw new ArgumentException($parameter, $context);
         }
 
-        if ($typeName === 'bool' && !\is_bool($value) && !\is_numeric($value)) {
+        if ($typeName === 'bool' && !\is_bool($value) && !\is_numeric($value))
+        {
             throw new ArgumentException($parameter, $context);
         }
     }
@@ -489,22 +538,28 @@ 
      */
     private function createInstance(string $class, array $parameters, string $context = null)
     {
-        try {
+        try
+        {
             $reflection = new \ReflectionClass($class);
-        } catch (\ReflectionException $e) {
+        }
+        catch (\ReflectionException $e)
+        {
             throw new ContainerException($e->getMessage(), $e->getCode(), $e);
         }
 
         //We have to construct class using external injector when we know exact context
-        if ($parameters === [] && $this->checkInjector($reflection)) {
+        if ($parameters === [] && $this->checkInjector($reflection))
+        {
             $injector = $this->injectors[$reflection->getName()];
 
             $instance = null;
-            try {
+            try
+            {
                 /** @var InjectorInterface $injectorInstance */
                 $injectorInstance = $this->get($injector);
 
-                if (!$injectorInstance instanceof InjectorInterface) {
+                if (!$injectorInstance instanceof InjectorInterface)
+                {
                     throw new InjectionException(
                         \sprintf(
                             "Class '%s' must be an instance of InjectorInterface for '%s'",
@@ -515,7 +570,8 @@ 
                 }
 
                 $instance = $injectorInstance->createInjection($reflection, $context);
-                if (!$reflection->isInstance($instance)) {
+                if (!$reflection->isInstance($instance))
+                {
                     throw new InjectionException(
                         \sprintf(
                             "Invalid injection response for '%s'",
@@ -523,23 +579,29 @@ 
                         )
                     );
                 }
-            } finally {
+            }
+            finally
+            {
                 $this->injectors[$reflection->getName()] = $injector;
             }
 
             return $instance;
         }
 
-        if (!$reflection->isInstantiable()) {
+        if (!$reflection->isInstantiable())
+        {
             throw new ContainerException(\sprintf("Class '%s' can not be constructed", $class));
         }
 
         $constructor = $reflection->getConstructor();
 
-        if ($constructor !== null) {
+        if ($constructor !== null)
+        {
             // Using constructor with resolved arguments
             $instance = $reflection->newInstanceArgs($this->resolveArguments($constructor, $parameters));
-        } else {
+        }
+        else
+        {
             // No constructor specified
             $instance = $reflection->newInstance();
         }
@@ -556,7 +618,8 @@ 
     private function checkInjector(\ReflectionClass $reflection): bool
     {
         $class = $reflection->getName();
-        if (\array_key_exists($class, $this->injectors)) {
+        if (\array_key_exists($class, $this->injectors))
+        {
             return $this->injectors[$class] !== null;
         }
 
@@ -569,11 +632,13 @@ 
             return true;
         }
 
-        if (!isset($this->injectorsCache[$class])) {
+        if (!isset($this->injectorsCache[$class]))
+        {
             $this->injectorsCache[$class] = null;
 
             // check interfaces
-            foreach ($this->injectors as $target => $injector) {
+            foreach ($this->injectors as $target => $injector)
+            {
                 if (
                     \class_exists($target, true)
                     && $reflection->isSubclassOf($target)
@@ -608,9 +673,11 @@ 
     private function registerInstance($instance, array $parameters)
     {
         //Declarative singletons (only when class received via direct get)
-        if ($parameters === [] && $instance instanceof SingletonInterface) {
+        if ($parameters === [] && $instance instanceof SingletonInterface)
+        {
             $alias = \get_class($instance);
-            if (!isset($this->bindings[$alias])) {
+            if (!isset($this->bindings[$alias]))
+            {
                 $this->bindings[$alias] = $instance;
             }
         }
@@ -635,19 +702,25 @@ 
         array $parameters,
         string $context = null
     ) {
-        if (\is_string($target)) {
+        if (\is_string($target))
+        {
             //Reference
             return $this->make($target, $parameters, $context);
         }
 
-        if ($target instanceof Autowire) {
+        if ($target instanceof Autowire)
+        {
             return $target->resolve($this, $parameters);
         }
 
-        if ($target instanceof \Closure) {
-            try {
+        if ($target instanceof \Closure)
+        {
+            try
+            {
                 $reflection = new \ReflectionFunction($target);
-            } catch (\ReflectionException $e) {
+            }
+            catch (\ReflectionException $e)
+            {
                 throw new ContainerException($e->getMessage(), $e->getCode(), $e);
             }
 
@@ -657,16 +730,20 @@ 
             );
         }
 
-        if (is_array($target) && isset($target[1])) {
+        if (is_array($target) && isset($target[1]))
+        {
             //In a form of resolver and method
             [$resolver, $method] = $target;
 
             //Resolver instance (i.e. [ClassName::class, 'method'])
             $resolver = $this->get($resolver);
 
-            try {
+            try
+            {
                 $method = new \ReflectionMethod($resolver, $method);
-            } catch (\ReflectionException $e) {
+            }
+            catch (\ReflectionException $e)
+            {
                 throw new ContainerException($e->getMessage(), $e->getCode(), $e);
             }