spiral / framework

src/Core/tests/ScopesTest.php

Spacing +5 added lines, -5 removed lines

@@ -33,11 +33,11 @@ 
 
         $this->assertNull(ContainerScope::getContainer());
 
-        try {
+        try{
             $this->assertTrue(ContainerScope::runScope($container, function () use ($container): void {
                 throw new RuntimeException('exception');
             }));
-        } catch (\Throwable $e) {
+        }catch (\Throwable $e){
         }
 
         $this->assertInstanceOf(RuntimeException::class, $e);
@@ -84,14 +84,14 @@ 
             return $c->get('bucket')->getName() == 'b' && $c->has('other');
         }));
 
-        try {
+        try{
             $this->assertTrue($c->runScope([
                 'bucket' => new Bucket('b'),
                 'other'  => new SampleClass()
             ], function () use ($c): void {
                 throw new RuntimeException('exception');
             }));
-        } catch (\Throwable $e) {
+        }catch (\Throwable $e){
         }
 
         $this->assertSame('a', $c->get('bucket')->getName());
@@ -107,7 +107,7 @@ 
             ContainerScope::runScope($container, static fn (ContainerInterface $container) => $container)
         );
 
-        $result = ContainerScope::runScope($container, static function (Container $container) {
+        $result = ContainerScope::runScope($container, static function (Container $container){
             return $container->runScope([], static fn (Container $container) => $container);
         });
 

Braces +18 added lines, -8 removed lines

@@ -20,7 +20,8 @@ 
 
         $this->assertNull(ContainerScope::getContainer());
 
-        $this->assertTrue(ContainerScope::runScope($container, function () use ($container) {
+        $this->assertTrue(ContainerScope::runScope($container, function () use ($container)
+        {
             return $container === ContainerScope::getContainer();
         }));
 
@@ -33,11 +34,14 @@ 
 
         $this->assertNull(ContainerScope::getContainer());
 
-        try {
+        try
+        {
             $this->assertTrue(ContainerScope::runScope($container, function () use ($container): void {
                 throw new RuntimeException('exception');
             }));
-        } catch (\Throwable $e) {
+        }
+        catch (\Throwable $e)
+        {
         }
 
         $this->assertInstanceOf(RuntimeException::class, $e);
@@ -55,7 +59,8 @@ 
         $this->assertTrue($c->runScope([
             'bucket' => new Bucket('b'),
             'other'  => new SampleClass()
-        ], function () use ($c) {
+        ], function () use ($c)
+        {
             $this->assertSame('b', $c->get('bucket')->getName());
             $this->assertTrue($c->has('other'));
 
@@ -77,21 +82,25 @@ 
         $this->assertTrue($c->runScope([
             'bucket' => new Bucket('b'),
             'other'  => new SampleClass()
-        ], function () use ($c) {
+        ], function () use ($c)
+        {
             $this->assertSame('b', $c->get('bucket')->getName());
             $this->assertTrue($c->has('other'));
 
             return $c->get('bucket')->getName() == 'b' && $c->has('other');
         }));
 
-        try {
+        try
+        {
             $this->assertTrue($c->runScope([
                 'bucket' => new Bucket('b'),
                 'other'  => new SampleClass()
             ], function () use ($c): void {
                 throw new RuntimeException('exception');
             }));
-        } catch (\Throwable $e) {
+        }
+        catch (\Throwable $e)
+        {
         }
 
         $this->assertSame('a', $c->get('bucket')->getName());
@@ -107,7 +116,8 @@ 
             ContainerScope::runScope($container, static fn (ContainerInterface $container) => $container)
         );
 
-        $result = ContainerScope::runScope($container, static function (Container $container) {
+        $result = ContainerScope::runScope($container, static function (Container $container)
+        {
             return $container->runScope([], static fn (Container $container) => $container);
         });
 

src/Core/src/Container.php

Spacing +16 added lines, -16 removed lines

@@ -44,11 +44,11 @@ 
     use DestructorTrait;
 
     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;
 
     /**
      * Container constructor.
@@ -58,7 +58,7 @@ 
         $constructor = new Internal\Registry($config, [
             'state' => new Internal\State(),
         ]);
-        foreach ($config as $property => $class) {
+        foreach ($config as $property => $class){
             $this->$property = $constructor->get($property, $class);
         }
 
@@ -129,7 +129,7 @@ 
      *
      * @psalm-suppress PossiblyInvalidArgument, PossiblyInvalidCast
      */
-    public function get(string|Autowire $id, string $context = null): mixed
+    public function get(string | Autowire $id, string $context = null): mixed
     {
         return $this->container->get($id, $context);
     }
@@ -143,26 +143,26 @@ 
     {
         $binds = &$this->state->bindings;
         $cleanup = $previous = [];
-        foreach ($bindings as $alias => $resolver) {
-            if (isset($binds[$alias])) {
+        foreach ($bindings as $alias => $resolver){
+            if (isset($binds[$alias])){
                 $previous[$alias] = $binds[$alias];
-            } else {
+            }else{
                 $cleanup[] = $alias;
             }
 
             $this->binder->bind($alias, $resolver);
         }
 
-        try {
+        try{
             return ContainerScope::getContainer() !== $this
                 ? ContainerScope::runScope($this, $scope)
                 : $scope($this);
-        } finally {
-            foreach ($previous as $alias => $resolver) {
+        }finally{
+            foreach ($previous as $alias => $resolver){
                 $binds[$alias] = $resolver;
             }
 
-            foreach ($cleanup as $alias) {
+            foreach ($cleanup as $alias){
                 unset($binds[$alias]);
             }
         }
@@ -173,7 +173,7 @@ 
      * for each method call), function array or Closure (executed every call). Only object resolvers
      * supported by this method.
      */
-    public function bind(string $alias, string|array|callable|object $resolver): void
+    public function bind(string $alias, string | array | callable | object $resolver): void
     {
         $this->binder->bind($alias, $resolver);
     }
@@ -184,7 +184,7 @@ 
      *
      * @psalm-param TResolver $resolver
      */
-    public function bindSingleton(string $alias, string|array|callable|object $resolver): void
+    public function bindSingleton(string $alias, string | array | callable | object $resolver): void
     {
         $this->binder->bindSingleton($alias, $resolver);
     }

Braces +18 added lines, -8 removed lines

@@ -58,7 +58,8 @@ 
         $constructor = new Internal\Registry($config, [
             'state' => new Internal\State(),
         ]);
-        foreach ($config as $property => $class) {
+        foreach ($config as $property => $class)
+        {
             $this->$property = $constructor->get($property, $class);
         }
 
@@ -143,26 +144,35 @@ 
     {
         $binds = &$this->state->bindings;
         $cleanup = $previous = [];
-        foreach ($bindings as $alias => $resolver) {
-            if (isset($binds[$alias])) {
+        foreach ($bindings as $alias => $resolver)
+        {
+            if (isset($binds[$alias]))
+            {
                 $previous[$alias] = $binds[$alias];
-            } else {
+            }
+            else
+            {
                 $cleanup[] = $alias;
             }
 
             $this->binder->bind($alias, $resolver);
         }
 
-        try {
+        try
+        {
             return ContainerScope::getContainer() !== $this
                 ? ContainerScope::runScope($this, $scope)
                 : $scope($this);
-        } finally {
-            foreach ($previous as $alias => $resolver) {
+        }
+        finally
+        {
+            foreach ($previous as $alias => $resolver)
+            {
                 $binds[$alias] = $resolver;
             }
 
-            foreach ($cleanup as $alias) {
+            foreach ($cleanup as $alias)
+            {
                 unset($binds[$alias]);
             }
         }

src/Core/src/ContainerScope.php

Spacing +2 added lines, -2 removed lines

@@ -33,9 +33,9 @@
     {
         [$previous, self::$container] = [self::$container, $container];
 
-        try {
+        try{
             return $scope(self::$container);
-        } finally {
+        }finally{
             self::$container = $previous;
         }
     }

Braces +5 added lines, -2 removed lines

@@ -33,9 +33,12 @@
     {
         [$previous, self::$container] = [self::$container, $container];
 
-        try {
+        try
+        {
             return $scope(self::$container);
-        } finally {
+        }
+        finally
+        {
             self::$container = $previous;
         }
     }