spiral / framework

src/Core/tests/Scope/FibersTest.php

Spacing +22 added lines, -22 removed lines

@@ -30,7 +30,7 @@ 
 
         self::runInFiber(
             self::functionScopedTestDataIterator(),
-            static function (mixed $suspendValue) {
+            static function (mixed $suspendValue){
                 self::assertNull(ContainerScope::getContainer());
                 self::assertTrue(\in_array($suspendValue, self::TEST_DATA, true));
             },
@@ -63,7 +63,7 @@ 
         );
 
         self::assertCount(5, $result);
-        foreach ($result as $suspendValue) {
+        foreach ($result as $suspendValue){
             self::assertSame(self::TEST_DATA, $suspendValue);
         }
     }
@@ -81,7 +81,7 @@ 
         );
 
         self::assertCount(2, $result);
-        foreach ($result as $suspendValue) {
+        foreach ($result as $suspendValue){
             self::assertSame(self::TEST_DATA, $suspendValue);
         }
     }
@@ -92,7 +92,7 @@ 
         $this->expectExceptionMessage('test');
 
         self::runInFiber(
-            static function () {
+            static function (){
                 return (new Container())->runScoped(
                     function (): string {
                         $result = '';
@@ -114,15 +114,15 @@ 
     public function testCatchThrownException(): void
     {
         $result = self::runInFiber(
-            static function () {
+            static function (){
                 return (new Container())->runScoped(
                     function (): string {
                         $result = '';
                         $result .= Fiber::suspend('foo');
                         $result .= Fiber::suspend('bar');
-                        try {
+                        try{
                             $result .= Fiber::suspend('error');
-                        } catch (\Throwable $e) {
+                        }catch (\Throwable $e){
                             $result .= $e->getMessage();
                         }
                         $result .= Fiber::suspend('baz');
@@ -152,7 +152,7 @@ 
         ?callable $load = null,
         ?Container $container = null,
     ): callable {
-        return static function () use ($load, $container): array {
+        return static function () use ($load, $container) : array {
             // The function should be called in a fiber
             self::assertNotNull(Fiber::getCurrent());
 
@@ -173,7 +173,7 @@ 
                         $resource = $c3->get('resource');
                         self::assertInstanceOf(DateTimeImmutable::class, $c3->get('bar'));
                         self::assertInstanceOf(stdClass::class, $resource);
-                        foreach (self::TEST_DATA as $key => $value) {
+                        foreach (self::TEST_DATA as $key => $value){
                             $resource->$key = $value;
                             $load === null or $load();
                             Fiber::suspend($value);
@@ -186,8 +186,8 @@ 
             }, ['foo' => new DateTime()]);
             self::assertFalse($c1->has('foo'));
 
-            self::assertSame(self::TEST_DATA, (array) $result);
-            return (array) $result;
+            self::assertSame(self::TEST_DATA, (array)$result);
+            return (array)$result;
         };
     }
 
@@ -204,11 +204,11 @@ 
     {
         $fiber = new Fiber($callable);
         $value = $fiber->start();
-        while (!$fiber->isTerminated()) {
-            if ($check !== null) {
-                try {
+        while (!$fiber->isTerminated()){
+            if ($check !== null){
+                try{
                     $value = $check($value);
-                } catch (\Throwable $e) {
+                }catch (\Throwable $e){
                     $value = $fiber->throw($e);
                     continue;
                 }
@@ -232,14 +232,14 @@ 
         /** Values that were suspended by the fiber. */
         $suspends = [];
         $results = [];
-        foreach ($callables as $key => $callable) {
+        foreach ($callables as $key => $callable){
             $fiberGenerators[$key] = (static function () use ($callable) {
                 $fiber = new Fiber($callable);
                 // Get ready
                 yield null;
 
                 $value = yield $fiber->start();
-                while (!$fiber->isTerminated()) {
+                while (!$fiber->isTerminated()){
                     $value = yield $fiber->resume($value);
                 }
                 return $fiber->getReturn();
@@ -249,15 +249,15 @@ 
         }
 
 
-        while ($fiberGenerators !== []) {
-            foreach ($fiberGenerators as $key => $generator) {
-                try {
+        while ($fiberGenerators !== []){
+            foreach ($fiberGenerators as $key => $generator){
+                try{
                     $suspends[$key] = $generator->send($suspends[$key]);
-                    if (!$generator->valid()) {
+                    if (!$generator->valid()){
                         $results[$key] = $generator->getReturn();
                         unset($fiberGenerators[$key]);
                     }
-                } catch (\Throwable $e) {
+                }catch (\Throwable $e){
                     unset($fiberGenerators[$key]);
                     $results[$key] = $e;
                 }

Braces +47 added lines, -22 removed lines

@@ -30,7 +30,8 @@ 
 
         self::runInFiber(
             self::functionScopedTestDataIterator(),
-            static function (mixed $suspendValue) {
+            static function (mixed $suspendValue)
+            {
                 self::assertNull(ContainerScope::getContainer());
                 self::assertTrue(\in_array($suspendValue, self::TEST_DATA, true));
             },
@@ -63,7 +64,8 @@ 
         );
 
         self::assertCount(5, $result);
-        foreach ($result as $suspendValue) {
+        foreach ($result as $suspendValue)
+        {
             self::assertSame(self::TEST_DATA, $suspendValue);
         }
     }
@@ -81,7 +83,8 @@ 
         );
 
         self::assertCount(2, $result);
-        foreach ($result as $suspendValue) {
+        foreach ($result as $suspendValue)
+        {
             self::assertSame(self::TEST_DATA, $suspendValue);
         }
     }
@@ -92,7 +95,8 @@ 
         $this->expectExceptionMessage('test');
 
         self::runInFiber(
-            static function () {
+            static function ()
+            {
                 return (new Container())->runScoped(
                     function (): string {
                         $result = '';
@@ -114,15 +118,19 @@ 
     public function testCatchThrownException(): void
     {
         $result = self::runInFiber(
-            static function () {
+            static function ()
+            {
                 return (new Container())->runScoped(
                     function (): string {
                         $result = '';
                         $result .= Fiber::suspend('foo');
                         $result .= Fiber::suspend('bar');
-                        try {
+                        try
+                        {
                             $result .= Fiber::suspend('error');
-                        } catch (\Throwable $e) {
+                        }
+                        catch (\Throwable $e)
+                        {
                             $result .= $e->getMessage();
                         }
                         $result .= Fiber::suspend('baz');
@@ -160,20 +168,23 @@ 
             $c1 = $container ?? new Container();
             $c1->bindSingleton('resource', new stdClass());
 
-            $result = $c1->runScoped(static function (Container $c2) use ($load) {
+            $result = $c1->runScoped(static function (Container $c2) use ($load)
+            {
                 // check local binding
                 self::assertTrue($c2->has('foo'));
                 self::assertInstanceOf(DateTime::class, $c2->get('foo'));
 
                 return $c2->runScoped(
-                    static function (ContainerInterface $c3) use ($load) {
+                    static function (ContainerInterface $c3) use ($load)
+                    {
                         // check local binding
                         self::assertTrue($c3->has('bar'));
 
                         $resource = $c3->get('resource');
                         self::assertInstanceOf(DateTimeImmutable::class, $c3->get('bar'));
                         self::assertInstanceOf(stdClass::class, $resource);
-                        foreach (self::TEST_DATA as $key => $value) {
+                        foreach (self::TEST_DATA as $key => $value)
+                        {
                             $resource->$key = $value;
                             $load === null or $load();
                             Fiber::suspend($value);
@@ -204,11 +215,16 @@ 
     {
         $fiber = new Fiber($callable);
         $value = $fiber->start();
-        while (!$fiber->isTerminated()) {
-            if ($check !== null) {
-                try {
+        while (!$fiber->isTerminated())
+        {
+            if ($check !== null)
+            {
+                try
+                {
                     $value = $check($value);
-                } catch (\Throwable $e) {
+                }
+                catch (\Throwable $e)
+                {
                     $value = $fiber->throw($e);
                     continue;
                 }
@@ -232,14 +248,17 @@ 
         /** Values that were suspended by the fiber. */
         $suspends = [];
         $results = [];
-        foreach ($callables as $key => $callable) {
-            $fiberGenerators[$key] = (static function () use ($callable) {
+        foreach ($callables as $key => $callable)
+        {
+            $fiberGenerators[$key] = (static function () use ($callable)
+            {
                 $fiber = new Fiber($callable);
                 // Get ready
                 yield null;
 
                 $value = yield $fiber->start();
-                while (!$fiber->isTerminated()) {
+                while (!$fiber->isTerminated())
+                {
                     $value = yield $fiber->resume($value);
                 }
                 return $fiber->getReturn();
@@ -249,15 +268,21 @@ 
         }
 
 
-        while ($fiberGenerators !== []) {
-            foreach ($fiberGenerators as $key => $generator) {
-                try {
+        while ($fiberGenerators !== [])
+        {
+            foreach ($fiberGenerators as $key => $generator)
+            {
+                try
+                {
                     $suspends[$key] = $generator->send($suspends[$key]);
-                    if (!$generator->valid()) {
+                    if (!$generator->valid())
+                    {
                         $results[$key] = $generator->getReturn();
                         unset($fiberGenerators[$key]);
                     }
-                } catch (\Throwable $e) {
+                }
+                catch (\Throwable $e)
+                {
                     unset($fiberGenerators[$key]);
                     $results[$key] = $e;
                 }

src/Core/tests/Scope/SideEffectTest.php

Spacing +3 added lines, -3 removed lines

@@ -22,10 +22,10 @@ 
         $root = new Container();
         $root->bind(LoggerInterface::class, KVLogger::class);
 
-        $root->runScoped(static function (Container $c1) {
+        $root->runScoped(static function (Container $c1){
             $c1->bind(LoggerInterface::class, FileLogger::class);
 
-            $c1->runScoped(static function (LoggerCarrier $carrier, LoggerInterface $logger) {
+            $c1->runScoped(static function (LoggerCarrier $carrier, LoggerInterface $logger){
                 // from the $root container
                 self::assertInstanceOf(KVLogger::class, $carrier->logger);
                 // from the $c1 container
@@ -39,7 +39,7 @@ 
         $root = new Container();
         $root->bind(LoggerInterface::class, KVLogger::class);
 
-        $root->runScoped(static function (Container $c1) {
+        $root->runScoped(static function (Container $c1){
             $c1->bind(LoggerInterface::class, FileLogger::class);
 
             self::assertInstanceOf(

Braces +6 added lines, -3 removed lines

@@ -22,10 +22,12 @@ 
         $root = new Container();
         $root->bind(LoggerInterface::class, KVLogger::class);
 
-        $root->runScoped(static function (Container $c1) {
+        $root->runScoped(static function (Container $c1)
+        {
             $c1->bind(LoggerInterface::class, FileLogger::class);
 
-            $c1->runScoped(static function (LoggerCarrier $carrier, LoggerInterface $logger) {
+            $c1->runScoped(static function (LoggerCarrier $carrier, LoggerInterface $logger)
+            {
                 // from the $root container
                 self::assertInstanceOf(KVLogger::class, $carrier->logger);
                 // from the $c1 container
@@ -39,7 +41,8 @@ 
         $root = new Container();
         $root->bind(LoggerInterface::class, KVLogger::class);
 
-        $root->runScoped(static function (Container $c1) {
+        $root->runScoped(static function (Container $c1)
+        {
             $c1->bind(LoggerInterface::class, FileLogger::class);
 
             self::assertInstanceOf(

src/Core/tests/Scope/FinalizeAttributeTest.php

Spacing +8 added lines, -8 removed lines

@@ -21,8 +21,8 @@ 
     {
         $root = new Container();
 
-        $obj = $root->runScoped(static function (Container $c1) {
-            $obj = $c1->runScoped(static function (Container $c2) {
+        $obj = $root->runScoped(static function (Container $c1){
+            $obj = $c1->runScoped(static function (Container $c2){
                 $obj = $c2->get(AttrScopeFooFinalize::class);
 
                 self::assertFalse($obj->finalized);
@@ -124,12 +124,12 @@ 
         self::expectException(FinalizersException::class);
         self::expectExceptionMessage('An exception has been thrown during finalization of the scope `foo`');
 
-        try {
-            $root->runScoped(static function (Container $c1) {
+        try{
+            $root->runScoped(static function (Container $c1){
                 $obj = $c1->get(AttrScopeFooFinalize::class);
                 $obj->throwException = true;
             }, name: 'foo');
-        } catch (FinalizersException $e) {
+        }catch (FinalizersException $e){
             self::assertSame('foo', $e->getScope());
             self::assertCount(1, $e->getExceptions());
             // Contains the message from the inner exception.
@@ -153,13 +153,13 @@ 
         self::expectException(FinalizersException::class);
         self::expectExceptionMessage('3 exceptions have been thrown during finalization of the scope `foo`');
 
-        try {
-            $root->runScoped(static function (Container $c1) {
+        try{
+            $root->runScoped(static function (Container $c1){
                 $c1->get(AttrScopeFooFinalize::class)->throwException = true;
                 $c1->get(AttrScopeFooFinalize::class)->throwException = true;
                 $c1->get(AttrScopeFooFinalize::class)->throwException = true;
             }, name: 'foo');
-        } catch (FinalizersException $e) {
+        }catch (FinalizersException $e){
             self::assertSame('foo', $e->getScope());
             self::assertCount(3, $e->getExceptions());
             // Contains the message from the inner exception.

Braces +26 added lines, -12 removed lines

@@ -21,8 +21,10 @@ 
     {
         $root = new Container();
 
-        $obj = $root->runScoped(static function (Container $c1) {
-            $obj = $c1->runScoped(static function (Container $c2) {
+        $obj = $root->runScoped(static function (Container $c1)
+        {
+            $obj = $c1->runScoped(static function (Container $c2)
+            {
                 $obj = $c2->get(AttrScopeFooFinalize::class);
 
                 self::assertFalse($obj->finalized);
@@ -46,8 +48,10 @@ 
         $root->bindSingleton(LoggerInterface::class, FileLogger::class);
 
         $obj2 = null;
-        $obj = $root->runScoped(static function (Container $c1) use (&$obj2) {
-            $obj = $c1->runScoped(static function (Container $c2) use (&$obj2) {
+        $obj = $root->runScoped(static function (Container $c1) use (&$obj2)
+        {
+            $obj = $c1->runScoped(static function (Container $c2) use (&$obj2)
+            {
                 $obj = $c2->get(AttrScopeFooFinalize::class);
                 $obj2 = $c2->get(AttrScopeFooFinalize::class);
 
@@ -77,8 +81,10 @@ 
         $root->bindSingleton(LoggerInterface::class, FileLogger::class);
 
         $obj2 = null;
-        $obj = $root->runScoped(static function (Container $c1) use (&$obj2) {
-            $obj = $c1->runScoped(static function (Container $c2) use (&$obj2) {
+        $obj = $root->runScoped(static function (Container $c1) use (&$obj2)
+        {
+            $obj = $c1->runScoped(static function (Container $c2) use (&$obj2)
+            {
                 $obj = $c2->get(AttrFinalize::class);
                 $obj2 = $c2->get(AttrFinalize::class);
 
@@ -124,12 +130,16 @@ 
         self::expectException(FinalizersException::class);
         self::expectExceptionMessage('An exception has been thrown during finalization of the scope `foo`');
 
-        try {
-            $root->runScoped(static function (Container $c1) {
+        try
+        {
+            $root->runScoped(static function (Container $c1)
+            {
                 $obj = $c1->get(AttrScopeFooFinalize::class);
                 $obj->throwException = true;
             }, name: 'foo');
-        } catch (FinalizersException $e) {
+        }
+        catch (FinalizersException $e)
+        {
             self::assertSame('foo', $e->getScope());
             self::assertCount(1, $e->getExceptions());
             // Contains the message from the inner exception.
@@ -153,13 +163,17 @@ 
         self::expectException(FinalizersException::class);
         self::expectExceptionMessage('3 exceptions have been thrown during finalization of the scope `foo`');
 
-        try {
-            $root->runScoped(static function (Container $c1) {
+        try
+        {
+            $root->runScoped(static function (Container $c1)
+            {
                 $c1->get(AttrScopeFooFinalize::class)->throwException = true;
                 $c1->get(AttrScopeFooFinalize::class)->throwException = true;
                 $c1->get(AttrScopeFooFinalize::class)->throwException = true;
             }, name: 'foo');
-        } catch (FinalizersException $e) {
+        }
+        catch (FinalizersException $e)
+        {
             self::assertSame('foo', $e->getScope());
             self::assertCount(3, $e->getExceptions());
             // Contains the message from the inner exception.

src/Core/tests/Scope/ExceptionsTest.php

Spacing +9 added lines, -9 removed lines

@@ -20,11 +20,11 @@ 
 
         $container = new Container();
 
-        $container->runScoped(static function (Container $c1) {
-            try {
+        $container->runScoped(static function (Container $c1){
+            try{
                 $c1->get(ExceptionConstructor::class);
                 self::fail('Exception should be thrown');
-            } catch (\Throwable $e) {
+            }catch (\Throwable $e){
                 // self::assertInstanceOf(\InvalidArgumentException::class, $e);
                 throw $e;
             }
@@ -38,11 +38,11 @@ 
 
         $container = new Container();
 
-        $container->runScoped(static function (Container $c1) {
-            try {
+        $container->runScoped(static function (Container $c1){
+            try{
                 $c1->get(ExceptionConstructor::class);
                 self::fail('Exception should be thrown');
-            } catch (\Throwable $e) {
+            }catch (\Throwable $e){
                 // self::assertInstanceOf(\InvalidArgumentException::class, $e);
                 throw $e;
             }
@@ -56,11 +56,11 @@ 
 
         $container = new Container();
 
-        $container->runScoped(static function (Container $c1) {
-            try {
+        $container->runScoped(static function (Container $c1){
+            try{
                 $c1->get(DatetimeCarrier::class);
                 self::fail('Exception should be thrown');
-            } catch (\Throwable $e) {
+            }catch (\Throwable $e){
                 self::assertInstanceOf(NotFoundException::class, $e);
                 self::assertInstanceOf(NotFoundException::class, $e->getPrevious());
                 self::assertStringContainsString(

Braces +21 added lines, -9 removed lines

@@ -20,11 +20,15 @@ 
 
         $container = new Container();
 
-        $container->runScoped(static function (Container $c1) {
-            try {
+        $container->runScoped(static function (Container $c1)
+        {
+            try
+            {
                 $c1->get(ExceptionConstructor::class);
                 self::fail('Exception should be thrown');
-            } catch (\Throwable $e) {
+            }
+            catch (\Throwable $e)
+            {
                 // self::assertInstanceOf(\InvalidArgumentException::class, $e);
                 throw $e;
             }
@@ -38,11 +42,15 @@ 
 
         $container = new Container();
 
-        $container->runScoped(static function (Container $c1) {
-            try {
+        $container->runScoped(static function (Container $c1)
+        {
+            try
+            {
                 $c1->get(ExceptionConstructor::class);
                 self::fail('Exception should be thrown');
-            } catch (\Throwable $e) {
+            }
+            catch (\Throwable $e)
+            {
                 // self::assertInstanceOf(\InvalidArgumentException::class, $e);
                 throw $e;
             }
@@ -56,11 +64,15 @@ 
 
         $container = new Container();
 
-        $container->runScoped(static function (Container $c1) {
-            try {
+        $container->runScoped(static function (Container $c1)
+        {
+            try
+            {
                 $c1->get(DatetimeCarrier::class);
                 self::fail('Exception should be thrown');
-            } catch (\Throwable $e) {
+            }
+            catch (\Throwable $e)
+            {
                 self::assertInstanceOf(NotFoundException::class, $e);
                 self::assertInstanceOf(NotFoundException::class, $e->getPrevious());
                 self::assertStringContainsString(

src/Core/tests/Scope/UseCaseTest.php

Spacing +1 added lines, -1 removed lines

@@ -23,7 +23,7 @@
         $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]);
 

Braces +12 added lines, -6 removed lines

@@ -23,7 +23,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]);
 
@@ -54,7 +55,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);
 
@@ -79,14 +81,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);
 
@@ -115,14 +119,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);

src/Core/tests/Scope/ScopeAttributeTest.php

Spacing +14 added lines, -14 removed lines

@@ -33,7 +33,7 @@ 
     {
         $root = new Container();
 
-        $root->runScoped(static function (Container $c1) {
+        $root->runScoped(static function (Container $c1){
             $c1->runScoped(static function (Container $c2) use ($c1) {
                 $obj1 = $c1->get(AttrScopeFooSingleton::class);
                 $obj2 = $c2->get(AttrScopeFooSingleton::class);
@@ -56,8 +56,8 @@ 
         $root = new Container();
         $root->bind('foo', self::makeFooScopeObject(...));
 
-        $root->runScoped(static function (Container $c1) {
-            $c1->runScoped(static function (Container $c2) {
+        $root->runScoped(static function (Container $c1){
+            $c1->runScoped(static function (Container $c2){
                 $c2->get('foo');
             }, name: 'foo');
         });
@@ -75,8 +75,8 @@ 
         $root = new Container();
         $root->bind('foo', self::makeFooScopeObject(...));
 
-        $root->runScoped(static function (Container $c1) {
-            $c1->runScoped(static function (Container $c2) {
+        $root->runScoped(static function (Container $c1){
+            $c1->runScoped(static function (Container $c2){
                 $c2->get('foo');
             });
         });
@@ -94,15 +94,15 @@ 
 
         $root = new Container();
 
-        try {
-            $root->runScoped(static function (Container $c1) {
-                $c1->runScoped(static function (Container $c2) {
-                    $c2->runScoped(static function (Container $c3) {
+        try{
+            $root->runScoped(static function (Container $c1){
+                $c1->runScoped(static function (Container $c2){
+                    $c2->runScoped(static function (Container $c3){
                         // do nothing
                     }, name: 'root');
                 });
             });
-        } catch (NamedScopeDuplicationException $e) {
+        }catch (NamedScopeDuplicationException $e){
             self::assertSame('root', $e->getScope());
             throw $e;
         }
@@ -117,14 +117,14 @@ 
     {
         self::expectException(BadScopeException::class);
 
-        try {
+        try{
             $root = new Container();
-            $root->runScoped(static function (Container $c1) {
-                $c1->runScoped(static function (Container $c2) {
+            $root->runScoped(static function (Container $c1){
+                $c1->runScoped(static function (Container $c2){
                     $c2->get(AttrScopeFoo::class);
                 });
             }, name: 'bar');
-        } catch (BadScopeException $e) {
+        }catch (BadScopeException $e){
             self::assertSame('foo', $e->getScope());
             throw $e;
         }

Braces +32 added lines, -15 removed lines

@@ -33,8 +33,10 @@ 
     {
         $root = new Container();
 
-        $root->runScoped(static function (Container $c1) {
-            $c1->runScoped(static function (Container $c2) use ($c1) {
+        $root->runScoped(static function (Container $c1)
+        {
+            $c1->runScoped(static function (Container $c2) use ($c1)
+            {
                 $obj1 = $c1->get(AttrScopeFooSingleton::class);
                 $obj2 = $c2->get(AttrScopeFooSingleton::class);
 
@@ -56,8 +58,10 @@ 
         $root = new Container();
         $root->bind('foo', self::makeFooScopeObject(...));
 
-        $root->runScoped(static function (Container $c1) {
-            $c1->runScoped(static function (Container $c2) {
+        $root->runScoped(static function (Container $c1)
+        {
+            $c1->runScoped(static function (Container $c2)
+            {
                 $c2->get('foo');
             }, name: 'foo');
         });
@@ -75,8 +79,10 @@ 
         $root = new Container();
         $root->bind('foo', self::makeFooScopeObject(...));
 
-        $root->runScoped(static function (Container $c1) {
-            $c1->runScoped(static function (Container $c2) {
+        $root->runScoped(static function (Container $c1)
+        {
+            $c1->runScoped(static function (Container $c2)
+            {
                 $c2->get('foo');
             });
         });
@@ -94,15 +100,21 @@ 
 
         $root = new Container();
 
-        try {
-            $root->runScoped(static function (Container $c1) {
-                $c1->runScoped(static function (Container $c2) {
-                    $c2->runScoped(static function (Container $c3) {
+        try
+        {
+            $root->runScoped(static function (Container $c1)
+            {
+                $c1->runScoped(static function (Container $c2)
+                {
+                    $c2->runScoped(static function (Container $c3)
+                    {
                         // do nothing
                     }, name: 'root');
                 });
             });
-        } catch (NamedScopeDuplicationException $e) {
+        }
+        catch (NamedScopeDuplicationException $e)
+        {
             self::assertSame('root', $e->getScope());
             throw $e;
         }
@@ -117,14 +129,19 @@ 
     {
         self::expectException(BadScopeException::class);
 
-        try {
+        try
+        {
             $root = new Container();
-            $root->runScoped(static function (Container $c1) {
-                $c1->runScoped(static function (Container $c2) {
+            $root->runScoped(static function (Container $c1)
+            {
+                $c1->runScoped(static function (Container $c2)
+                {
                     $c2->get(AttrScopeFoo::class);
                 });
             }, name: 'bar');
-        } catch (BadScopeException $e) {
+        }
+        catch (BadScopeException $e)
+        {
             self::assertSame('foo', $e->getScope());
             throw $e;
         }

src/Core/src/Container.php

Spacing +29 added lines, -29 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;
 
     /**
@@ -60,7 +60,7 @@ 
     public function __construct(
         private Config $config = new Config(),
         ?string $scopeName = self::DEFAULT_ROOT_SCOPE_NAME,
-    ) {
+    ){
         $this->initServices($this, $scopeName);
 
         /** @psalm-suppress RedundantPropertyInitializationCheck */
@@ -137,7 +137,7 @@ 
      *
      * @psalm-suppress InvalidArgument, InvalidCast
      */
-    public function get(string|Autowire $id, string $context = null): mixed
+    public function get(string | Autowire $id, string $context = null): mixed
     {
         /** @psalm-suppress TooManyArguments */
         return $this->container->get($id, $context);
@@ -164,26 +164,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]);
             }
         }
@@ -197,32 +197,32 @@ 
         // Open scope
         $container = new self($this->config, $name);
 
-        try {
+        try{
             // Configure scope
             $container->scope->setParent($this, $this->scope);
 
             // Add specific bindings
-            foreach ($bindings as $alias => $resolver) {
+            foreach ($bindings as $alias => $resolver){
                 $container->binder->bind($alias, $resolver);
             }
 
             return ContainerScope::runScope(
                 $container,
                 static function (self $container) use ($autowire, $closure): mixed {
-                    try {
+                    try{
                         return $autowire
                             ? $container->invoke($closure)
                             : $closure($container);
-                    } finally {
+                    }finally{
                         $container->closeScope();
                     }
                 }
             );
-        } finally {
+        }finally{
             // Check the container has not been leaked
             $link = \WeakReference::create($container);
             unset($container);
-            if ($link->get() !== null) {
+            if ($link->get() !== null){
                 throw new ScopeContainerLeakedException($name, $this->scope->getParentScopeNames());
             }
         }
@@ -238,7 +238,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);
     }
@@ -249,7 +249,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);
     }
@@ -319,8 +319,8 @@ 
         ]);
 
         // 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);
             }
         }
@@ -334,7 +334,7 @@ 
     private function closeScope(): void
     {
         /** @psalm-suppress RedundantPropertyInitializationCheck */
-        if (!isset($this->scope)) {
+        if (!isset($this->scope)){
             $this->destruct();
             return;
         }
@@ -343,10 +343,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;
             }
         }
@@ -355,7 +355,7 @@ 
         $this->destruct();
 
         // Throw collected errors
-        if ($errors !== []) {
+        if ($errors !== []){
             throw new FinalizersException($scopeName, $errors);
         }
     }