spiral / framework

src/Core/tests/Scope/ProxyTest.php

Spacing +9 added lines, -9 removed lines

@@ -49,7 +49,7 @@ 
                     // from the current `foo` scope
                     self::assertInstanceOf(KVLogger::class, $logger);
 
-                    for ($i = 0; $i < 10; $i++) {
+                    for ($i = 0; $i < 10; $i++){
                         // because of proxy
                         self::assertNotInstanceOf(KVLogger::class, $carrier->getLogger());
                         self::assertSame('kv', $carrier->logger->getName());
@@ -69,7 +69,7 @@ 
                     // from the current `foo` scope
                     self::assertInstanceOf(FileLogger::class, $logger);
 
-                    for ($i = 0; $i < 10; $i++) {
+                    for ($i = 0; $i < 10; $i++){
                         // because of proxy
                         self::assertNotInstanceOf(FileLogger::class, $carrier->getLogger());
                         self::assertSame('file', $carrier->logger->getName());
@@ -137,7 +137,7 @@ 
             ->bind(
                 ContextInterface::class,
                 new \Spiral\Core\Config\Injectable(
-                    new class implements InjectorInterface {
+                    new class implements InjectorInterface{
                         public function createInjection(\ReflectionClass $class, mixed $context = null): Context
                         {
                             return new Context($context);
@@ -178,7 +178,7 @@ 
             ->bind(
                 ContextInterface::class,
                 new \Spiral\Core\Config\Injectable(
-                    new class implements InjectorInterface {
+                    new class implements InjectorInterface{
                         public function createInjection(\ReflectionClass $class, mixed $context = null): Context
                         {
                             return new Context($context);
@@ -189,14 +189,14 @@ 
 
         FiberHelper::runFiberSequence(
             static fn(): mixed => $root->runScope(new Scope(name: 'foo'), static function (ContextInterface $ctx): void {
-                for ($i = 0; $i < 10; $i++) {
+                for ($i = 0; $i < 10; $i++){
                     self::assertInstanceOf(ReflectionParameter::class, $ctx->getValue(), 'Context injected');
                     self::assertSame('ctx', $ctx->getValue()->getName());
                     \Fiber::suspend();
                 }
             }),
             static fn(): mixed => $root->runScope(new Scope(name: 'foo'), static function (ContextInterface $context): void {
-                for ($i = 0; $i < 10; $i++) {
+                for ($i = 0; $i < 10; $i++){
                     self::assertInstanceOf(ReflectionParameter::class, $context->getValue(), 'Context injected');
                     self::assertSame('context', $context->getValue()->getName());
                     \Fiber::suspend();
@@ -257,10 +257,10 @@ 
     {
         $root = new Container();
         $context = (object)['destroyed' => false];
-        $class = new class($context) implements DestroyableInterface {
+        $class = new class($context) implements DestroyableInterface{
             public function __construct(
                 private readonly \stdClass $context,
-            ) {
+            ){
             }
 
             public function __destruct()
@@ -288,7 +288,7 @@ 
             new Scope('http'),
             static function () use ($root, $proxy): void {
                 self::assertSame('Foo', $proxy->getName());
-                $proxy->setName(new class implements \Stringable {
+                $proxy->setName(new class implements \Stringable{
                     public function __toString(): string
                     {
                         return 'Bar';

Braces +14 added lines, -7 removed lines

@@ -49,7 +49,8 @@ 
                     // from the current `foo` scope
                     self::assertInstanceOf(KVLogger::class, $logger);
 
-                    for ($i = 0; $i < 10; $i++) {
+                    for ($i = 0; $i < 10; $i++)
+                    {
                         // because of proxy
                         self::assertNotInstanceOf(KVLogger::class, $carrier->getLogger());
                         self::assertSame('kv', $carrier->logger->getName());
@@ -69,7 +70,8 @@ 
                     // from the current `foo` scope
                     self::assertInstanceOf(FileLogger::class, $logger);
 
-                    for ($i = 0; $i < 10; $i++) {
+                    for ($i = 0; $i < 10; $i++)
+                    {
                         // because of proxy
                         self::assertNotInstanceOf(FileLogger::class, $carrier->getLogger());
                         self::assertSame('file', $carrier->logger->getName());
@@ -137,7 +139,8 @@ 
             ->bind(
                 ContextInterface::class,
                 new \Spiral\Core\Config\Injectable(
-                    new class implements InjectorInterface {
+                    new class implements InjectorInterface
+                    {
                         public function createInjection(\ReflectionClass $class, mixed $context = null): Context
                         {
                             return new Context($context);
@@ -178,7 +181,8 @@ 
             ->bind(
                 ContextInterface::class,
                 new \Spiral\Core\Config\Injectable(
-                    new class implements InjectorInterface {
+                    new class implements InjectorInterface
+                    {
                         public function createInjection(\ReflectionClass $class, mixed $context = null): Context
                         {
                             return new Context($context);
@@ -189,14 +193,16 @@ 
 
         FiberHelper::runFiberSequence(
             static fn(): mixed => $root->runScope(new Scope(name: 'foo'), static function (ContextInterface $ctx): void {
-                for ($i = 0; $i < 10; $i++) {
+                for ($i = 0; $i < 10; $i++)
+                {
                     self::assertInstanceOf(ReflectionParameter::class, $ctx->getValue(), 'Context injected');
                     self::assertSame('ctx', $ctx->getValue()->getName());
                     \Fiber::suspend();
                 }
             }),
             static fn(): mixed => $root->runScope(new Scope(name: 'foo'), static function (ContextInterface $context): void {
-                for ($i = 0; $i < 10; $i++) {
+                for ($i = 0; $i < 10; $i++)
+                {
                     self::assertInstanceOf(ReflectionParameter::class, $context->getValue(), 'Context injected');
                     self::assertSame('context', $context->getValue()->getName());
                     \Fiber::suspend();
@@ -257,7 +263,8 @@ 
     {
         $root = new Container();
         $context = (object)['destroyed' => false];
-        $class = new class($context) implements DestroyableInterface {
+        $class = new class($context) implements DestroyableInterface
+        {
             public function __construct(
                 private readonly \stdClass $context,
             ) {

src/Core/src/Container.php

Spacing +38 added lines, -38 removed lines

@@ -47,11 +47,11 @@ 
     public const DEFAULT_ROOT_SCOPE_NAME = 'root';
 
     private Internal\State $state;
-    private ResolverInterface|Internal\Resolver $resolver;
-    private FactoryInterface|Internal\Factory $factory;
-    private ContainerInterface|Internal\Container $container;
-    private BinderInterface|Internal\Binder $binder;
-    private InvokerInterface|Internal\Invoker $invoker;
+    private ResolverInterface | Internal\Resolver $resolver;
+    private FactoryInterface | Internal\Factory $factory;
+    private ContainerInterface | Internal\Container $container;
+    private BinderInterface | Internal\Binder $binder;
+    private InvokerInterface | Internal\Invoker $invoker;
     private Internal\Scope $scope;
 
     /**
@@ -59,11 +59,11 @@ 
      */
     public function __construct(
         private Config $config = new Config(),
-        string|\BackedEnum|null $scopeName = self::DEFAULT_ROOT_SCOPE_NAME,
+        string | \BackedEnum | null $scopeName = self::DEFAULT_ROOT_SCOPE_NAME,
         private Options $options = new Options(),
-    ) {
-        if (\is_object($scopeName)) {
-            $scopeName = (string) $scopeName->value;
+    ){
+        if (\is_object($scopeName)){
+            $scopeName = (string)$scopeName->value;
         }
 
         $this->initServices($this, $scopeName);
@@ -117,11 +117,11 @@ 
      * @throws \Throwable
      * @psalm-suppress TooManyArguments
      */
-    public function make(string $alias, array $parameters = [], \Stringable|string|null $context = null): mixed
+    public function make(string $alias, array $parameters = [], \Stringable | string | null $context = null): mixed
     {
         return ContainerScope::getContainer() === $this
             ? $this->factory->make($alias, $parameters, $context)
-            : ContainerScope::runScope($this, fn (): mixed => $this->factory->make($alias, $parameters, $context));
+            : ContainerScope::runScope($this, fn () : mixed => $this->factory->make($alias, $parameters, $context));
     }
 
     /**
@@ -143,7 +143,7 @@ 
      * @throws \Throwable
      * @psalm-suppress TooManyArguments
      */
-    public function get(string|Autowire $id, \Stringable|string|null $context = null): mixed
+    public function get(string | Autowire $id, \Stringable | string | null $context = null): mixed
     {
         return ContainerScope::getContainer() === $this
             ? $this->container->get($id, $context)
@@ -163,9 +163,9 @@ 
      *        If {@see string}, the default binder for the given scope will be returned. Default bindings won't affect
      *        already created Container instances except the case with the root one.
      */
-    public function getBinder(string|\BackedEnum|null $scope = null): BinderInterface
+    public function getBinder(string | \BackedEnum | null $scope = null): BinderInterface
     {
-        $scope = \is_object($scope) ? (string) $scope->value : $scope;
+        $scope = \is_object($scope) ? (string)$scope->value : $scope;
 
         return $scope === null
             ? $this->binder
@@ -175,25 +175,25 @@ 
     /**
      * @throws \Throwable
      */
-    public function runScope(Scope|array $bindings, callable $scope): mixed
+    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 +201,21 @@ 
             $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;
             }
         }
@@ -261,9 +261,9 @@ 
      * @param bool $force If the value is false, an exception will be thrown when attempting
      *  to bind an already constructed singleton.
      */
-    public function bindSingleton(string $alias, string|array|callable|object $resolver, bool $force = true): void
+    public function bindSingleton(string $alias, string | array | callable | object $resolver, bool $force = true): void
     {
-        if ($force) {
+        if ($force){
             $this->binder->removeBinding($alias);
         }
 
@@ -290,7 +290,7 @@ 
     {
         return ContainerScope::getContainer() === $this
             ? $this->invoker->invoke($target, $parameters)
-            : ContainerScope::runScope($this, fn (): mixed => $this->invoker->invoke($target, $parameters));
+            : ContainerScope::runScope($this, fn () : mixed => $this->invoker->invoke($target, $parameters));
     }
 
     /**
@@ -334,8 +334,8 @@ 
         ], $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 +349,7 @@ 
     private function closeScope(): void
     {
         /** @psalm-suppress RedundantPropertyInitializationCheck */
-        if (!isset($this->scope)) {
+        if (!isset($this->scope)){
             $this->destruct();
             return;
         }
@@ -358,10 +358,10 @@ 
 
         // 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 +370,7 @@ 
         $this->destruct();
 
         // Throw collected errors
-        if ($errors !== []) {
+        if ($errors !== []){
             throw new FinalizersException($scopeName, $errors);
         }
     }
@@ -392,18 +392,18 @@ 
         $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();
                 }
             }