spiral / framework

src/Core/tests/Scope/UseCaseTest.php

Braces +48 added lines, -24 removed lines

@@ -32,7 +32,8 @@ 
         $root = new Container();
         $root->bind('foo', SampleClass::class);
 
-        $root->runScoped(function (ContainerInterface $c1) {
+        $root->runScoped(function (ContainerInterface $c1)
+        {
             $c1->get('foo');
         }, bindings: ['foo' => SampleClass::class]);
 
@@ -65,7 +66,8 @@ 
     {
         $root = new Container();
 
-        $root->runScoped(function (ContainerInterface $c1) use ($theSame, $alias) {
+        $root->runScoped(function (ContainerInterface $c1) use ($theSame, $alias)
+        {
             $obj1 = $c1->get($alias);
             $obj2 = $c1->get($alias);
 
@@ -90,14 +92,16 @@ 
     {
         $root = new Container();
 
-        $root->runScoped(function (ContainerInterface $c1) use ($root) {
+        $root->runScoped(function (ContainerInterface $c1) use ($root)
+        {
             $obj1 = $c1->get('foo');
             $this->weakMap->offsetSet($obj1, true);
 
             self::assertNotSame($root, $c1);
             self::assertInstanceOf(stdClass::class, $obj1);
 
-            $c1->runScoped(function (ContainerInterface $c2) use ($root, $c1, $obj1) {
+            $c1->runScoped(function (ContainerInterface $c2) use ($root, $c1, $obj1)
+            {
                 $obj2 = $c2->get('foo');
                 $this->weakMap->offsetSet($obj2, true);
 
@@ -126,14 +130,16 @@ 
         $root->bindSingleton('bar', [Factory::class, 'makeStdClass']);
         $root->bind(stdClass::class, new stdClass());
 
-        $root->runScoped(function (ContainerInterface $c1) use ($root) {
+        $root->runScoped(function (ContainerInterface $c1) use ($root)
+        {
             $obj1 = $c1->get('foo');
             $this->weakMap->offsetSet($obj1, true);
 
             self::assertInstanceOf(stdClass::class, $obj1);
             // Singleton must be the same
             self::assertSame($c1->get('bar'), $root->get('bar'));
-            $c1->runScoped(function (ContainerInterface $c2) use ($root, $obj1) {
+            $c1->runScoped(function (ContainerInterface $c2) use ($root, $obj1)
+            {
                 $obj2 = $c2->get('foo');
 
                 self::assertInstanceOf(stdClass::class, $obj2);
@@ -266,7 +272,8 @@ 
     {
         $root = new Container();
 
-        $root->invoke(static function () use ($root) {
+        $root->invoke(static function () use ($root)
+        {
             self::assertNotNull(\Spiral\Core\ContainerScope::getContainer());
             self::assertSame($root, \Spiral\Core\ContainerScope::getContainer());
         });
@@ -275,7 +282,8 @@ 
     public function testRegisterContainerOnGet(): void
     {
         $root = new Container();
-        $root->bind('foo', function () use ($root) {
+        $root->bind('foo', function () use ($root)
+        {
             self::assertNotNull(\Spiral\Core\ContainerScope::getContainer());
             self::assertSame($root, \Spiral\Core\ContainerScope::getContainer());
         });
@@ -286,7 +294,8 @@ 
     public function testRegisterContainerOnMake(): void
     {
         $root = new Container();
-        $root->bind('foo', function () use ($root) {
+        $root->bind('foo', function () use ($root)
+        {
             self::assertNotNull(\Spiral\Core\ContainerScope::getContainer());
             self::assertSame($root, \Spiral\Core\ContainerScope::getContainer());
         });
@@ -304,7 +313,8 @@ 
         $root->bind('isFoo', new Scalar(false));
         $root->getBinder('foo')->bind('isFoo', new Scalar(true));
 
-        $root->bind('foo', function (#[Proxy] ContainerInterface $c, ContainerInterface $r) use ($root) {
+        $root->bind('foo', function (#[Proxy] ContainerInterface $c, ContainerInterface $r) use ($root)
+        {
             // Direct
             self::assertNotNull(\Spiral\Core\ContainerScope::getContainer());
             self::assertNotSame($root, \Spiral\Core\ContainerScope::getContainer());
@@ -319,7 +329,8 @@ 
 
         $root->runScope(
             new Scope('foo'),
-            function (ContainerInterface $c) {
+            function (ContainerInterface $c)
+            {
                 self::assertTrue($c->get('isFoo'));
                 $c->get('foo');
             }
@@ -331,20 +342,25 @@ 
         $root = new Container();
         $root->bindSingleton('sampleClass', SampleClass::class);
 
-        $root->runScope(new Scope('foo'), function (Container $container) {
+        $root->runScope(new Scope('foo'), function (Container $container)
+        {
             $this->assertTrue($container->has('sampleClass'));
         });
 
-        $root->runScope(new Scope('foo'), function (Container $container) {
-            $container->runScope(new Scope('bar'), function (Container $container) {
+        $root->runScope(new Scope('foo'), function (Container $container)
+        {
+            $container->runScope(new Scope('bar'), function (Container $container)
+            {
                 $this->assertTrue($container->has('sampleClass'));
             });
         });
 
-        $root->runScope(new Scope('foo'), function (Container $container) {
+        $root->runScope(new Scope('foo'), function (Container $container)
+        {
             $container->bindSingleton('otherClass', SampleClass::class);
 
-            $container->runScope(new Scope('bar'), function (Container $container) {
+            $container->runScope(new Scope('bar'), function (Container $container)
+            {
                 $this->assertTrue($container->has('sampleClass'));
                 $this->assertTrue($container->has('otherClass'));
             });
@@ -356,33 +372,41 @@ 
         $root = new Container();
         $root->getBinder('foo')->bindSingleton('sampleClass', AttrScopeFoo::class);
 
-        $root->runScope(new Scope('foo'), function (Container $container) {
+        $root->runScope(new Scope('foo'), function (Container $container)
+        {
             $this->assertTrue($container->has('sampleClass'));
         });
 
-        $root->runScope(new Scope('bar'), function (Container $container) {
+        $root->runScope(new Scope('bar'), function (Container $container)
+        {
             $this->assertFalse($container->has('sampleClass'));
         });
 
-        $root->runScope(new Scope('foo'), function (Container $container) {
-            $container->runScope(new Scope('bar'), function (Container $container) {
+        $root->runScope(new Scope('foo'), function (Container $container)
+        {
+            $container->runScope(new Scope('bar'), function (Container $container)
+            {
                 $this->assertTrue($container->has('sampleClass'));
             });
         });
 
-        $root->runScope(new Scope('foo'), function (Container $container) {
+        $root->runScope(new Scope('foo'), function (Container $container)
+        {
             $container->bindSingleton('otherClass', AttrScopeFoo::class);
 
-            $container->runScope(new Scope('bar'), function (Container $container) {
+            $container->runScope(new Scope('bar'), function (Container $container)
+            {
                 $this->assertTrue($container->has('sampleClass'));
                 $this->assertTrue($container->has('otherClass'));
             });
         });
 
-        $root->runScope(new Scope('baz'), function (Container $container) {
+        $root->runScope(new Scope('baz'), function (Container $container)
+        {
             $container->getBinder('foo')->bindSingleton('otherClass', AttrScopeFoo::class);
 
-            $container->runScope(new Scope('bar'), function (Container $container) {
+            $container->runScope(new Scope('bar'), function (Container $container)
+            {
                 $this->assertFalse($container->has('sampleClass'));
                 $this->assertFalse($container->has('otherClass'));
             });

src/Core/src/Internal/Scope.php

Braces +6 added lines, -3 removed lines

@@ -38,9 +38,11 @@ 
         $this->parentFactory = $factory;
 
         // Check a scope with the same name is not already registered
-        if ($this->scopeName !== null) {
+        if ($this->scopeName !== null)
+        {
             $tmp = $this;
-            while ($tmp->parentScope !== null) {
+            while ($tmp->parentScope !== null)
+            {
                 $tmp = $tmp->parentScope;
                 $tmp->scopeName !== $this->scopeName ?: throw new NamedScopeDuplicationException($this->scopeName);
             }
@@ -68,7 +70,8 @@ 
         $result = [$this->scopeName];
 
         $parent = $this;
-        while ($parent->parentScope !== null) {
+        while ($parent->parentScope !== null)
+        {
             $parent = $parent->parentScope;
             $result[] = $parent->scopeName;
         }

src/Core/src/Internal/Factory.php

Braces +119 added lines, -51 removed lines

@@ -68,17 +68,20 @@ 
      */
     public function make(string $alias, array $parameters = [], Stringable|string|null $context = null): mixed
     {
-        if ($parameters === [] && \array_key_exists($alias, $this->state->singletons)) {
+        if ($parameters === [] && \array_key_exists($alias, $this->state->singletons))
+        {
             return $this->state->singletons[$alias];
         }
 
         $binding = $this->state->bindings[$alias] ?? null;
 
-        if ($binding === null) {
+        if ($binding === null)
+        {
             return $this->resolveWithoutBinding($alias, $parameters, $context);
         }
 
-        try {
+        try
+        {
             $this->tracer->push(
                 false,
                 action: 'resolve from binding',
@@ -106,7 +109,9 @@ 
                     ->resolveWeakReference($binding, $alias, $context, $parameters),
                 default => $binding,
             };
-        } finally {
+        }
+        finally
+        {
             $this->state->bindings[$alias] ??= $binding;
             $this->tracer->pop(true);
             $this->tracer->pop(false);
@@ -120,18 +125,23 @@ 
     private function resolveInjector(Injectable $binding, Ctx $ctx, array $arguments)
     {
         $context = $ctx->context;
-        try {
+        try
+        {
             $reflection = $ctx->reflection ??= new \ReflectionClass($ctx->class);
-        } catch (\ReflectionException $e) {
+        }
+        catch (\ReflectionException $e)
+        {
             throw new ContainerException($e->getMessage(), $e->getCode(), $e);
         }
 
         $injector = $binding->injector;
 
-        try {
+        try
+        {
             $injectorInstance = \is_object($injector) ? $injector : $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'.",
@@ -158,7 +168,8 @@ 
                 default => (string)$context,
             });
 
-            if (!$reflection->isInstance($instance)) {
+            if (!$reflection->isInstance($instance))
+            {
                 throw new InjectionException(
                     \sprintf(
                         "Invalid injection response for '%s'.",
@@ -168,7 +179,9 @@ 
             }
 
             return $instance;
-        } finally {
+        }
+        finally
+        {
             $this->state->bindings[$ctx->class] ??= $binding;
         }
     }
@@ -187,7 +200,8 @@ 
             //Binding is pointing to something else
             : $this->make($binding->alias, $arguments, $context);
 
-        if ($binding->singleton && $arguments === []) {
+        if ($binding->singleton && $arguments === [])
+        {
             $this->state->singletons[$alias] = $result;
         }
 
@@ -228,11 +242,14 @@ 
         array $arguments,
     ): mixed {
         $ctx = new Ctx(alias: $alias, class: $alias, context: $context, singleton: $binding->singleton);
-        try {
+        try
+        {
             $instance = $binding::class === \Spiral\Core\Config\Factory::class && $binding->getParametersCount() === 0
                 ? ($binding->factory)()
                 : $this->invoker->invoke($binding->factory, $arguments);
-        } catch (NotCallableException $e) {
+        }
+        catch (NotCallableException $e)
+        {
             throw new ContainerException(
                 $this->tracer->combineTraceMessage(\sprintf('Invalid binding for `%s`.', $ctx->alias)),
                 $e->getCode(),
@@ -251,19 +268,24 @@ 
     ): ?object {
         $avoidCache = $arguments !== [];
 
-        if (($avoidCache || $binding->reference->get() === null) && \class_exists($alias)) {
-            try {
+        if (($avoidCache || $binding->reference->get() === null) && \class_exists($alias))
+        {
+            try
+            {
                 $this->tracer->push(false, alias: $alias, source: WeakReference::class, context: $context);
 
                 $object = $this->createInstance(
                     new Ctx(alias: $alias, class: $alias, context: $context),
                     $arguments,
                 );
-                if ($avoidCache) {
+                if ($avoidCache)
+                {
                     return $object;
                 }
                 $binding->reference = WeakReference::create($object);
-            } catch (\Throwable) {
+            }
+            catch (\Throwable)
+            {
                 throw new ContainerException(
                     $this->tracer->combineTraceMessage(
                         \sprintf(
@@ -273,7 +295,9 @@ 
                         )
                     )
                 );
-            } finally {
+            }
+            finally
+            {
                 $this->tracer->pop();
             }
         }
@@ -288,18 +312,25 @@ 
     ): mixed {
         $parent = $this->scope->getParentFactory();
 
-        if ($parent !== null) {
-            try {
+        if ($parent !== null)
+        {
+            try
+            {
                 $this->tracer->push(false, ...[
                     'current scope' => $this->scope->getScopeName(),
                     'jump to parent scope' => $this->scope->getParentScope()->getScopeName(),
                 ]);
                 return $parent->make($alias, $parameters, $context);
-            } catch (BadScopeException $e) {
-                if ($this->scope->getScopeName() !== $e->getScope()) {
+            }
+            catch (BadScopeException $e)
+            {
+                if ($this->scope->getScopeName() !== $e->getScope())
+                {
                     throw $e;
                 }
-            } catch (ContainerExceptionInterface $e) {
+            }
+            catch (ContainerExceptionInterface $e)
+            {
                 $className = match (true) {
                     $e instanceof NotFoundException => NotFoundException::class,
                     default => ContainerException::class,
@@ -308,19 +339,24 @@ 
                     'Can\'t resolve `%s`.',
                     $alias,
                 )), previous: $e);
-            } finally {
+            }
+            finally
+            {
                 $this->tracer->pop(false);
             }
         }
 
         $this->tracer->push(false, action: 'autowire', alias: $alias, context: $context);
-        try {
+        try
+        {
             //No direct instructions how to construct class, make is automatically
             return $this->autowire(
                 new Ctx(alias: $alias, class: $alias, context: $context),
                 $parameters,
             );
-        } finally {
+        }
+        finally
+        {
             $this->tracer->pop(false);
         }
     }
@@ -370,7 +406,8 @@ 
         // Check scope name
         $ctx->reflection = new \ReflectionClass($instance);
         $scopeName = ($ctx->reflection->getAttributes(ScopeAttribute::class)[0] ?? null)?->newInstance()->name;
-        if ($scopeName !== null && $scopeName !== $this->scope->getScopeName()) {
+        if ($scopeName !== null && $scopeName !== $this->scope->getScopeName())
+        {
             throw new BadScopeException($scopeName, $instance::class);
         }
 
@@ -397,24 +434,30 @@ 
         array $arguments,
     ): object {
         $class = $ctx->class;
-        try {
+        try
+        {
             $ctx->reflection = $reflection = new \ReflectionClass($class);
-        } catch (\ReflectionException $e) {
+        }
+        catch (\ReflectionException $e)
+        {
             throw new ContainerException($e->getMessage(), $e->getCode(), $e);
         }
 
         // Check scope name
         $scope = ($reflection->getAttributes(ScopeAttribute::class)[0] ?? null)?->newInstance()->name;
-        if ($scope !== null && $scope !== $this->scope->getScopeName()) {
+        if ($scope !== null && $scope !== $this->scope->getScopeName())
+        {
             throw new BadScopeException($scope, $class);
         }
 
         // We have to construct class using external injector when we know the exact context
-        if ($arguments === [] && $this->binder->hasInjector($class)) {
+        if ($arguments === [] && $this->binder->hasInjector($class))
+        {
             return $this->resolveInjector($this->state->bindings[$ctx->class], $ctx, $arguments);
         }
 
-        if (!$reflection->isInstantiable()) {
+        if (!$reflection->isInstantiable())
+        {
             $itIs = match (true) {
                 $reflection->isEnum() => 'Enum',
                 $reflection->isAbstract() => 'Abstract class',
@@ -427,12 +470,16 @@ 
 
         $constructor = $reflection->getConstructor();
 
-        if ($constructor !== null) {
-            try {
+        if ($constructor !== null)
+        {
+            try
+            {
                 $this->tracer->push(false, action: 'resolve arguments', signature: $constructor);
                 $this->tracer->push(true);
                 $args = $this->resolver->resolveArguments($constructor, $arguments);
-            } catch (ValidationException $e) {
+            }
+            catch (ValidationException $e)
+            {
                 throw new ContainerException(
                     $this->tracer->combineTraceMessage(
                         \sprintf(
@@ -442,22 +489,31 @@ 
                         )
                     ),
                 );
-            } finally {
+            }
+            finally
+            {
                 $this->tracer->pop(true);
                 $this->tracer->pop(false);
             }
-            try {
+            try
+            {
                 // Using constructor with resolved arguments
                 $this->tracer->push(false, call: "$class::__construct", arguments: $args);
                 $this->tracer->push(true);
                 $instance = new $class(...$args);
-            } catch (\TypeError $e) {
+            }
+            catch (\TypeError $e)
+            {
                 throw new WrongTypeException($constructor, $e);
-            } finally {
+            }
+            finally
+            {
                 $this->tracer->pop(true);
                 $this->tracer->pop(false);
             }
-        } else {
+        }
+        else
+        {
             // No constructor specified
             $instance = $reflection->newInstance();
         }
@@ -475,13 +531,15 @@ 
         $instance = $this->runInflector($instance);
 
         //Declarative singletons
-        if ($this->isSingleton($ctx)) {
+        if ($this->isSingleton($ctx))
+        {
             $this->state->singletons[$ctx->alias] = $instance;
         }
 
         // Register finalizer
         $finalizer = $this->getFinalizer($ctx, $instance);
-        if ($finalizer !== null) {
+        if ($finalizer !== null)
+        {
             $this->state->finalizers[] = $finalizer;
         }
 
@@ -493,12 +551,14 @@ 
      */
     private function isSingleton(Ctx $ctx): bool
     {
-        if ($ctx->singleton === true) {
+        if ($ctx->singleton === true)
+        {
             return true;
         }
 
         /** @psalm-suppress RedundantCondition https://github.com/vimeo/psalm/issues/9489 */
-        if ($ctx->reflection->implementsInterface(SingletonInterface::class)) {
+        if ($ctx->reflection->implementsInterface(SingletonInterface::class))
+        {
             return true;
         }
 
@@ -512,7 +572,8 @@ 
          * @var Finalize|null $attribute
          */
         $attribute = ($ctx->reflection->getAttributes(Finalize::class)[0] ?? null)?->newInstance();
-        if ($attribute === null) {
+        if ($attribute === null)
+        {
             return null;
         }
 
@@ -526,10 +587,14 @@ 
     {
         $scope = $this->scope;
 
-        while ($scope !== null) {
-            foreach ($this->state->inflectors as $class => $inflectors) {
-                if ($instance instanceof $class) {
-                    foreach ($inflectors as $inflector) {
+        while ($scope !== null)
+        {
+            foreach ($this->state->inflectors as $class => $inflectors)
+            {
+                if ($instance instanceof $class)
+                {
+                    foreach ($inflectors as $inflector)
+                    {
                         $instance = $inflector->getParametersCount() > 1
                             ? $this->invoker->invoke($inflector->inflector, [$instance])
                             : ($inflector->inflector)($instance);
@@ -545,9 +610,12 @@ 
 
     private function validateArguments(ContextFunction $reflection, array $arguments = []): bool
     {
-        try {
+        try
+        {
             $this->resolver->validateArguments($reflection, $arguments);
-        } catch (\Throwable) {
+        }
+        catch (\Throwable)
+        {
             return false;
         }
 

src/Core/src/Container.php

Braces +46 added lines, -21 removed lines

@@ -170,23 +170,29 @@ 
      */
     public function runScope(Scope|array $bindings, callable $scope): mixed
     {
-        if (!\is_array($bindings)) {
+        if (!\is_array($bindings))
+        {
             return $this->runIsolatedScope($bindings, $scope);
         }
 
         $binds = &$this->state->bindings;
         $singletons = &$this->state->singletons;
         $cleanup = $previous = $prevSin = [];
-        foreach ($bindings as $alias => $resolver) {
+        foreach ($bindings as $alias => $resolver)
+        {
             // Store previous bindings
-            if (isset($binds[$alias])) {
+            if (isset($binds[$alias]))
+            {
                 $previous[$alias] = $binds[$alias];
-            } else {
+            }
+            else
+            {
                 // Store bindings to be removed
                 $cleanup[] = $alias;
             }
             // Store previous singletons
-            if (isset($singletons[$alias])) {
+            if (isset($singletons[$alias]))
+            {
                 $prevSin[$alias] = $singletons[$alias];
                 unset($singletons[$alias]);
             }
@@ -194,21 +200,27 @@ 
             $this->binder->bind($alias, $resolver);
         }
 
-        try {
+        try
+        {
             return ContainerScope::getContainer() !== $this
                 ? ContainerScope::runScope($this, $scope)
                 : $scope($this);
-        } finally {
+        }
+        finally
+        {
             // Remove new bindings
-            foreach ($cleanup as $alias) {
+            foreach ($cleanup as $alias)
+            {
                 unset($binds[$alias], $singletons[$alias]);
             }
             // Restore previous bindings
-            foreach ($previous as $alias => $resolver) {
+            foreach ($previous as $alias => $resolver)
+            {
                 $binds[$alias] = $resolver;
             }
             // Restore singletons
-            foreach ($prevSin as $alias => $instance) {
+            foreach ($prevSin as $alias => $instance)
+            {
                 $singletons[$alias] = $instance;
             }
         }
@@ -256,7 +268,8 @@ 
      */
     public function bindSingleton(string $alias, string|array|callable|object $resolver, bool $force = true): void
     {
-        if ($force) {
+        if ($force)
+        {
             $this->binder->removeBinding($alias);
         }
 
@@ -327,8 +340,10 @@ 
         ]);
 
         // Create container services
-        foreach ($container->config as $property => $class) {
-            if (\property_exists($container, $property)) {
+        foreach ($container->config as $property => $class)
+        {
+            if (\property_exists($container, $property))
+            {
                 $container->$property = $constructor->get($property, $class);
             }
         }
@@ -342,7 +357,8 @@ 
     private function closeScope(): void
     {
         /** @psalm-suppress RedundantPropertyInitializationCheck */
-        if (!isset($this->scope)) {
+        if (!isset($this->scope))
+        {
             $this->destruct();
             return;
         }
@@ -351,10 +367,14 @@ 
 
         // Run finalizers
         $errors = [];
-        foreach ($this->state->finalizers as $finalizer) {
-            try {
+        foreach ($this->state->finalizers as $finalizer)
+        {
+            try
+            {
                 $this->invoker->invoke($finalizer);
-            } catch (\Throwable $e) {
+            }
+            catch (\Throwable $e)
+            {
                 $errors[] = $e;
             }
         }
@@ -363,7 +383,8 @@ 
         $this->destruct();
 
         // Throw collected errors
-        if ($errors !== []) {
+        if ($errors !== [])
+        {
             throw new FinalizersException($scopeName, $errors);
         }
     }
@@ -385,18 +406,22 @@ 
         $container->scope->setParent($this, $this->scope, $this->factory);
 
         // Add specific bindings
-        foreach ($config->bindings as $alias => $resolver) {
+        foreach ($config->bindings as $alias => $resolver)
+        {
             $container->binder->bind($alias, $resolver);
         }
 
         return ContainerScope::runScope(
             $container,
             static function (self $container) use ($config, $closure): mixed {
-                try {
+                try
+                {
                     return $config->autowire
                         ? $container->invoke($closure)
                         : $closure($container);
-                } finally {
+                }
+                finally
+                {
                     $container->closeScope();
                 }
             }