spiral / framework

src/Core/tests/ExceptionsTest.php

Spacing +2 added lines, -2 removed lines

@@ -77,9 +77,9 @@
     {
         $this->expectException(ContainerException::class);
 
-        try {
+        try{
             $container->get(ClassWithUndefinedDependency::class);
-        } catch (ContainerException $e) {
+        }catch (ContainerException $e){
             $this->assertSame(
                 \preg_replace('/\s+/', '', $message),
                 \preg_replace('/\s+/', '', $e->getMessage())

Braces +5 added lines, -2 removed lines

@@ -77,9 +77,12 @@
     {
         $this->expectException(ContainerException::class);
 
-        try {
+        try
+        {
             $container->get(ClassWithUndefinedDependency::class);
-        } catch (ContainerException $e) {
+        }
+        catch (ContainerException $e)
+        {
             $this->assertSame(
                 \preg_replace('/\s+/', '', $message),
                 \preg_replace('/\s+/', '', $e->getMessage())

src/Core/src/Internal/Factory.php

Spacing +27 added lines, -27 removed lines

@@ -54,15 +54,15 @@ 
     {
         $this->trace[] = $alias;
 
-        if (!isset($this->state->bindings[$alias])) {
+        if (!isset($this->state->bindings[$alias])){
             //No direct instructions how to construct class, make is automatically
             return $this->autowire($alias, $parameters, $context);
         }
 
         $binding = $this->state->bindings[$alias];
-        if (\is_object($binding)) {
-            if ($binding::class === WeakReference::class) {
-                if ($binding->get() === null && \class_exists($alias)) {
+        if (\is_object($binding)){
+            if ($binding::class === WeakReference::class){
+                if ($binding->get() === null && \class_exists($alias)){
                     $object = $this->createInstance($alias, $parameters, $context);
                     $binding = $this->state->bindings[$alias] = WeakReference::create($object);
                 }
@@ -72,23 +72,23 @@ 
             return $binding;
         }
 
-        if (\is_string($binding)) {
+        if (\is_string($binding)){
             //Binding is pointing to something else
             return $this->make($binding, $parameters, $context);
         }
 
         unset($this->state->bindings[$alias]);
-        try {
+        try{
             $instance = $binding[0] === $alias
                 ? $this->autowire($alias, $parameters, $context)
                 : $this->evaluateBinding($alias, $binding[0], $parameters, $context);
-        } finally {
+        }finally{
             /** @psalm-var class-string $alias */
             $this->state->bindings[$alias] = $binding;
             $this->trace = [];
         }
 
-        if ($binding[1]) {
+        if ($binding[1]){
             // Indicates singleton
             /** @psalm-var class-string $alias */
             $this->state->bindings[$alias] = $instance;
@@ -107,7 +107,7 @@ 
      */
     private function autowire(string $class, array $parameters, string $context = null): object
     {
-        if (!\class_exists($class) && !isset($this->state->injectors[$class])) {
+        if (!\class_exists($class) && !isset($this->state->injectors[$class])){
             throw new NotFoundException(
                 \sprintf('Undefined class or binding `%s`.', $class),
                 0,
@@ -135,18 +135,18 @@ 
         array $parameters,
         string $context = null
     ): mixed {
-        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);
         }
 
-        try {
+        try{
             return $this->invoker->invoke($target, $parameters);
-        } catch (NotCallableException $e) {
+        }catch (NotCallableException $e){
             throw new ContainerException(
                 \sprintf('Invalid binding for `%s`.', $alias),
                 $e->getCode(),
@@ -171,20 +171,20 @@ 
      */
     private function createInstance(string $class, array $parameters, string $context = null): object
     {
-        try {
+        try{
             $reflection = new \ReflectionClass($class);
-        } catch (\ReflectionException $e) {
+        }catch (\ReflectionException $e){
             throw new ContainerException($e->getMessage(), $e->getCode(), $e, $this->trace);
         }
 
         //We have to construct class using external injector when we know exact context
-        if ($parameters === [] && $this->binder->hasInjector($class)) {
+        if ($parameters === [] && $this->binder->hasInjector($class)){
             $injector = $this->state->injectors[$reflection->getName()];
 
-            try {
+            try{
                 $injectorInstance = $this->container->get($injector);
 
-                if (!$injectorInstance instanceof InjectorInterface) {
+                if (!$injectorInstance instanceof InjectorInterface){
                     throw new InjectionException(
                         \sprintf(
                             "Class '%s' must be an instance of InjectorInterface for '%s'.",
@@ -196,7 +196,7 @@ 
 
                 /** @var InjectorInterface<TObject> $injectorInstance */
                 $instance = $injectorInstance->createInjection($reflection, $context);
-                if (!$reflection->isInstance($instance)) {
+                if (!$reflection->isInstance($instance)){
                     throw new InjectionException(
                         \sprintf(
                             "Invalid injection response for '%s'.",
@@ -206,12 +206,12 @@ 
                 }
 
                 return $instance;
-            } finally {
+            }finally{
                 $this->state->injectors[$reflection->getName()] = $injector;
             }
         }
 
-        if (!$reflection->isInstantiable()) {
+        if (!$reflection->isInstantiable()){
             $itIs = match (true) {
                 $reflection->isEnum() => 'Enum',
                 $reflection->isAbstract() => 'Abstract class',
@@ -227,14 +227,14 @@ 
 
         $constructor = $reflection->getConstructor();
 
-        if ($constructor !== null) {
-            try {
+        if ($constructor !== null){
+            try{
                 // Using constructor with resolved arguments
                 $instance = new $class(...$this->resolver->resolveArguments($constructor, $parameters));
-            } catch (\TypeError $e) {
+            }catch (\TypeError $e){
                 throw new WrongTypeException($constructor, $e);
             }
-        } else {
+        }else{
             // No constructor specified
             $instance = $reflection->newInstance();
         }
@@ -252,9 +252,9 @@ 
     private function registerInstance(object $instance, array $parameters): object
     {
         //Declarative singletons (only when class received via direct get)
-        if ($parameters === [] && $instance instanceof SingletonInterface) {
+        if ($parameters === [] && $instance instanceof SingletonInterface){
             $alias = $instance::class;
-            if (!isset($this->state->bindings[$alias])) {
+            if (!isset($this->state->bindings[$alias])){
                 $this->state->bindings[$alias] = $instance;
             }
         }

Braces +60 added lines, -27 removed lines

@@ -54,15 +54,19 @@ 
     {
         $this->trace[] = $alias;
 
-        if (!isset($this->state->bindings[$alias])) {
+        if (!isset($this->state->bindings[$alias]))
+        {
             //No direct instructions how to construct class, make is automatically
             return $this->autowire($alias, $parameters, $context);
         }
 
         $binding = $this->state->bindings[$alias];
-        if (\is_object($binding)) {
-            if ($binding::class === WeakReference::class) {
-                if ($binding->get() === null && \class_exists($alias)) {
+        if (\is_object($binding))
+        {
+            if ($binding::class === WeakReference::class)
+            {
+                if ($binding->get() === null && \class_exists($alias))
+                {
                     $object = $this->createInstance($alias, $parameters, $context);
                     $binding = $this->state->bindings[$alias] = WeakReference::create($object);
                 }
@@ -72,23 +76,28 @@ 
             return $binding;
         }
 
-        if (\is_string($binding)) {
+        if (\is_string($binding))
+        {
             //Binding is pointing to something else
             return $this->make($binding, $parameters, $context);
         }
 
         unset($this->state->bindings[$alias]);
-        try {
+        try
+        {
             $instance = $binding[0] === $alias
                 ? $this->autowire($alias, $parameters, $context)
                 : $this->evaluateBinding($alias, $binding[0], $parameters, $context);
-        } finally {
+        }
+        finally
+        {
             /** @psalm-var class-string $alias */
             $this->state->bindings[$alias] = $binding;
             $this->trace = [];
         }
 
-        if ($binding[1]) {
+        if ($binding[1])
+        {
             // Indicates singleton
             /** @psalm-var class-string $alias */
             $this->state->bindings[$alias] = $instance;
@@ -107,7 +116,8 @@ 
      */
     private function autowire(string $class, array $parameters, string $context = null): object
     {
-        if (!\class_exists($class) && !isset($this->state->injectors[$class])) {
+        if (!\class_exists($class) && !isset($this->state->injectors[$class]))
+        {
             throw new NotFoundException(
                 \sprintf('Undefined class or binding `%s`.', $class),
                 0,
@@ -135,18 +145,23 @@ 
         array $parameters,
         string $context = null
     ): mixed {
-        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);
         }
 
-        try {
+        try
+        {
             return $this->invoker->invoke($target, $parameters);
-        } catch (NotCallableException $e) {
+        }
+        catch (NotCallableException $e)
+        {
             throw new ContainerException(
                 \sprintf('Invalid binding for `%s`.', $alias),
                 $e->getCode(),
@@ -171,20 +186,26 @@ 
      */
     private function createInstance(string $class, array $parameters, string $context = null): object
     {
-        try {
+        try
+        {
             $reflection = new \ReflectionClass($class);
-        } catch (\ReflectionException $e) {
+        }
+        catch (\ReflectionException $e)
+        {
             throw new ContainerException($e->getMessage(), $e->getCode(), $e, $this->trace);
         }
 
         //We have to construct class using external injector when we know exact context
-        if ($parameters === [] && $this->binder->hasInjector($class)) {
+        if ($parameters === [] && $this->binder->hasInjector($class))
+        {
             $injector = $this->state->injectors[$reflection->getName()];
 
-            try {
+            try
+            {
                 $injectorInstance = $this->container->get($injector);
 
-                if (!$injectorInstance instanceof InjectorInterface) {
+                if (!$injectorInstance instanceof InjectorInterface)
+                {
                     throw new InjectionException(
                         \sprintf(
                             "Class '%s' must be an instance of InjectorInterface for '%s'.",
@@ -196,7 +217,8 @@ 
 
                 /** @var InjectorInterface<TObject> $injectorInstance */
                 $instance = $injectorInstance->createInjection($reflection, $context);
-                if (!$reflection->isInstance($instance)) {
+                if (!$reflection->isInstance($instance))
+                {
                     throw new InjectionException(
                         \sprintf(
                             "Invalid injection response for '%s'.",
@@ -206,12 +228,15 @@ 
                 }
 
                 return $instance;
-            } finally {
+            }
+            finally
+            {
                 $this->state->injectors[$reflection->getName()] = $injector;
             }
         }
 
-        if (!$reflection->isInstantiable()) {
+        if (!$reflection->isInstantiable())
+        {
             $itIs = match (true) {
                 $reflection->isEnum() => 'Enum',
                 $reflection->isAbstract() => 'Abstract class',
@@ -227,14 +252,20 @@ 
 
         $constructor = $reflection->getConstructor();
 
-        if ($constructor !== null) {
-            try {
+        if ($constructor !== null)
+        {
+            try
+            {
                 // Using constructor with resolved arguments
                 $instance = new $class(...$this->resolver->resolveArguments($constructor, $parameters));
-            } catch (\TypeError $e) {
+            }
+            catch (\TypeError $e)
+            {
                 throw new WrongTypeException($constructor, $e);
             }
-        } else {
+        }
+        else
+        {
             // No constructor specified
             $instance = $reflection->newInstance();
         }
@@ -252,9 +283,11 @@ 
     private function registerInstance(object $instance, array $parameters): object
     {
         //Declarative singletons (only when class received via direct get)
-        if ($parameters === [] && $instance instanceof SingletonInterface) {
+        if ($parameters === [] && $instance instanceof SingletonInterface)
+        {
             $alias = $instance::class;
-            if (!isset($this->state->bindings[$alias])) {
+            if (!isset($this->state->bindings[$alias]))
+            {
                 $this->state->bindings[$alias] = $instance;
             }
         }

src/Core/src/Exception/Container/ContainerException.php

Spacing +4 added lines, -4 removed lines

@@ -17,7 +17,7 @@ 
         int $code = 0,
         ?\Throwable $previous = null,
         protected array &$trace = []
-    ) {
+    ){
         parent::__construct($this->generateTrace($message), $code, $previous);
 
         $trace = [];
@@ -28,11 +28,11 @@ 
         $result = [];
         $result[] = $message;
 
-        if ($this->trace !== []) {
+        if ($this->trace !== []){
             $result[] = 'Container stack trace:';
 
-            foreach ($this->trace as $item) {
-                $result[] = '- ' . $item;
+            foreach ($this->trace as $item){
+                $result[] = '- '.$item;
             }
         }
 

Braces +4 added lines, -2 removed lines

@@ -28,10 +28,12 @@
         $result = [];
         $result[] = $message;
 
-        if ($this->trace !== []) {
+        if ($this->trace !== [])
+        {
             $result[] = 'Container stack trace:';
 
-            foreach ($this->trace as $item) {
+            foreach ($this->trace as $item)
+            {
                 $result[] = '- ' . $item;
             }
         }