spiral / framework

src/Boot/tests/KernelTest.php

Braces +16 added lines, -8 removed lines

@@ -47,7 +47,8 @@ 
     {
         $kernel = TestCore::create(['root' => __DIR__])->run();
 
-        $d = new class() implements DispatcherInterface {
+        $d = new class() implements DispatcherInterface
+        {
             public static function canServe(EnvironmentInterface $env): bool
             {
                 return true;
@@ -67,7 +68,8 @@ 
     {
         $kernel = TestCore::create(['root' => __DIR__])->run();
 
-        $d = new class() implements DispatcherInterface {
+        $d = new class() implements DispatcherInterface
+        {
             public function canServe(): bool
             {
                 return true;
@@ -90,7 +92,8 @@ 
     {
         $kernel = TestCore::create(['root' => __DIR__])->run();
 
-        $d = new class() implements DispatcherInterface {
+        $d = new class() implements DispatcherInterface
+        {
             public static function canServe(EnvironmentInterface $env): bool
             {
                 return true;
@@ -124,19 +127,23 @@ 
     {
         $kernel = TestCore::create(['root' => __DIR__]);
 
-        $kernel->booting(static function (TestCore $core) {
+        $kernel->booting(static function (TestCore $core)
+        {
             $core->getContainer()->bind('abc', 'foo');
         });
 
-        $kernel->booting(static function (TestCore $core) {
+        $kernel->booting(static function (TestCore $core)
+        {
             $core->getContainer()->bind('bcd', 'foo');
         });
 
-        $kernel->booted( static function (TestCore $core) {
+        $kernel->booted( static function (TestCore $core)
+        {
             $core->getContainer()->bind('cde', 'foo');
         });
 
-        $kernel->booted( static function (TestCore $core) {
+        $kernel->booted( static function (TestCore $core)
+        {
             $core->getContainer()->bind('def', 'foo');
         });
 
@@ -159,7 +166,8 @@ 
 
     public function testEventsShouldBeDispatched(): void
     {
-        $testDispatcher = new class implements DispatcherInterface {
+        $testDispatcher = new class implements DispatcherInterface
+        {
             public static function canServe(EnvironmentInterface $env): bool
             {
                 return true;

src/Boot/src/AbstractKernel.php

Braces +39 added lines, -19 removed lines

@@ -120,29 +120,35 @@ 
     ): static {
         $exceptionHandler ??= ExceptionHandler::class;
 
-        if (\is_string($exceptionHandler)) {
+        if (\is_string($exceptionHandler))
+        {
             $exceptionHandler = $container->make($exceptionHandler);
         }
 
-        if ($handleErrors) {
+        if ($handleErrors)
+        {
             $exceptionHandler->register();
         }
 
-        if (!$container->has(InitializerInterface::class)) {
+        if (!$container->has(InitializerInterface::class))
+        {
             $container->bind(InitializerInterface::class, Initializer::class);
         }
-        if (!$container->has(InvokerStrategyInterface::class)) {
+        if (!$container->has(InvokerStrategyInterface::class))
+        {
             $container->bind(InvokerStrategyInterface::class, DefaultInvokerStrategy::class);
         }
 
-        if ($bootloadManager instanceof Autowire) {
+        if ($bootloadManager instanceof Autowire)
+        {
             $bootloadManager = $bootloadManager->resolve($container);
         }
         $bootloadManager ??= $container->make(StrategyBasedBootloadManager::class);
         \assert($bootloadManager instanceof BootloadManagerInterface);
         $container->bind(BootloadManagerInterface::class, $bootloadManager);
 
-        if (!$container->has(BootloaderRegistryInterface::class)) {
+        if (!$container->has(BootloaderRegistryInterface::class))
+        {
             $container->bindSingleton(BootloaderRegistryInterface::class, [self::class, 'initBootloaderRegistry']);
         }
 
@@ -171,7 +177,8 @@ 
         $environment ??= new Environment();
         $this->container->bindSingleton(EnvironmentInterface::class, $environment);
 
-        try {
+        try
+        {
             // will protect any against env overwrite action
             $this->container->runScope(
                 [EnvironmentInterface::class => $environment],
@@ -188,7 +195,9 @@ 
                     $this->fireCallbacks($this->bootstrappedCallbacks);
                 }
             );
-        } catch (\Throwable $e) {
+        }
+        catch (\Throwable $e)
+        {
             $this->exceptionHandler->handleGlobalException($e);
 
             return null;
@@ -209,7 +218,8 @@ 
      */
     public function running(Closure ...$callbacks): void
     {
-        foreach ($callbacks as $callback) {
+        foreach ($callbacks as $callback)
+        {
             $this->runningCallbacks[] = $callback;
         }
     }
@@ -224,7 +234,8 @@ 
      */
     public function booting(Closure ...$callbacks): void
     {
-        foreach ($callbacks as $callback) {
+        foreach ($callbacks as $callback)
+        {
             $this->bootingCallbacks[] = $callback;
         }
     }
@@ -239,7 +250,8 @@ 
      */
     public function booted(Closure ...$callbacks): void
     {
-        foreach ($callbacks as $callback) {
+        foreach ($callbacks as $callback)
+        {
             $this->bootedCallbacks[] = $callback;
         }
     }
@@ -255,7 +267,8 @@ 
      */
     public function bootstrapped(Closure ...$callbacks): void
     {
-        foreach ($callbacks as $callback) {
+        foreach ($callbacks as $callback)
+        {
             $this->bootstrappedCallbacks[] = $callback;
         }
     }
@@ -269,7 +282,8 @@ 
      */
     public function addDispatcher(string|DispatcherInterface $dispatcher): self
     {
-        if (\is_object($dispatcher)) {
+        if (\is_object($dispatcher))
+        {
             $dispatcher = $dispatcher::class;
         }
 
@@ -291,19 +305,22 @@ 
         $eventDispatcher?->dispatch(new Serving());
 
         $serving = $servingScope = null;
-        foreach ($this->dispatchers as $dispatcher) {
+        foreach ($this->dispatchers as $dispatcher)
+        {
             $reflection = new \ReflectionClass($dispatcher);
 
             $scope = ($reflection->getAttributes(DispatcherScope::class)[0] ?? null)?->newInstance()->scope;
             $this->container->getBinder($scope)->bind($dispatcher, $dispatcher);
 
-            if ($serving === null && $this->canServe($reflection)) {
+            if ($serving === null && $this->canServe($reflection))
+            {
                 $serving = $dispatcher;
                 $servingScope = $scope;
             }
         }
 
-        if ($serving === null) {
+        if ($serving === null)
+        {
             $eventDispatcher?->dispatch(new DispatcherNotFound());
             throw new BootException('Unable to locate active dispatcher.');
         }
@@ -352,11 +369,13 @@ 
      */
     protected function fireCallbacks(array &$callbacks): void
     {
-        if ($callbacks === []) {
+        if ($callbacks === [])
+        {
             return;
         }
 
-        do {
+        do
+        {
             $this->container->invoke(\current($callbacks));
         } while (\next($callbacks));
 
@@ -398,7 +417,8 @@ 
      */
     private function canServe(\ReflectionClass $reflection): bool
     {
-        if (!$reflection->hasMethod('canServe')) {
+        if (!$reflection->hasMethod('canServe'))
+        {
             throw new BootException('Dispatcher must implement static `canServe` method.');
         }
 

src/Core/tests/Scope/UseCaseTest.php

Braces +50 added lines, -25 removed lines

@@ -34,7 +34,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]);
 
@@ -67,7 +68,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);
 
@@ -92,14 +94,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);
 
@@ -128,14 +132,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);
@@ -268,7 +274,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());
         });
@@ -277,7 +284,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());
         });
@@ -288,7 +296,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());
         });
@@ -306,7 +315,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());
@@ -321,7 +331,8 @@ 
 
         $root->runScope(
             new Scope('foo'),
-            function (ContainerInterface $c) {
+            function (ContainerInterface $c)
+            {
                 self::assertTrue($c->get('isFoo'));
                 $c->get('foo');
             }
@@ -334,7 +345,8 @@ 
         $root = new Container();
         $root->getBinder($scope)->bindSingleton('foo', SampleClass::class);
 
-        $root->runScope(new Scope($scope), function (Container $container) {
+        $root->runScope(new Scope($scope), function (Container $container)
+        {
             $this->assertTrue($container->has('foo'));
             $this->assertInstanceOf(SampleClass::class, $container->get('foo'));
         });
@@ -346,20 +358,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'));
             });
@@ -371,33 +388,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/Container.php

Braces +48 added lines, -22 removed lines

@@ -62,7 +62,8 @@ 
         string|\BackedEnum|null $scopeName = self::DEFAULT_ROOT_SCOPE_NAME,
         private Options $options = new Options(),
     ) {
-        if (\is_object($scopeName)) {
+        if (\is_object($scopeName))
+        {
             $scopeName = (string) $scopeName->value;
         }
 
@@ -177,23 +178,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]);
             }
@@ -201,21 +208,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;
             }
         }
@@ -263,7 +276,8 @@ 
      */
     public function bindSingleton(string $alias, string|array|callable|object $resolver, bool $force = true): void
     {
-        if ($force) {
+        if ($force)
+        {
             $this->binder->removeBinding($alias);
         }
 
@@ -334,8 +348,10 @@ 
         ], $this->options);
 
         // 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);
             }
         }
@@ -349,7 +365,8 @@ 
     private function closeScope(): void
     {
         /** @psalm-suppress RedundantPropertyInitializationCheck */
-        if (!isset($this->scope)) {
+        if (!isset($this->scope))
+        {
             $this->destruct();
             return;
         }
@@ -358,10 +375,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;
             }
         }
@@ -370,7 +391,8 @@ 
         $this->destruct();
 
         // Throw collected errors
-        if ($errors !== []) {
+        if ($errors !== [])
+        {
             throw new FinalizersException($scopeName, $errors);
         }
     }
@@ -392,18 +414,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();
                 }
             }