spiral / framework

src/Prototype/src/NodeVisitors/AddUse.php

Spacing +18 added lines, -18 removed lines

@@ -23,21 +23,21 @@ 
 
     public function __construct(
         private readonly ClassNode $node
-    ) {
+    ){
     }
 
     public function leaveNode(Node $node): ?Node
     {
-        if (!$node instanceof Namespace_) {
+        if (!$node instanceof Namespace_){
             return null;
         }
 
         $imported = [];
-        if (!$this->node->hasConstructor && $this->node->constructorParams) {
-            foreach ($this->node->constructorParams as $param) {
-                if (!empty($param->type) && $param->type->fullName) {
+        if (!$this->node->hasConstructor && $this->node->constructorParams){
+            foreach ($this->node->constructorParams as $param){
+                if (!empty($param->type) && $param->type->fullName){
                     $import = [$param->type->fullName, $param->type->alias];
-                    if (\in_array($import, $imported, true)) {
+                    if (\in_array($import, $imported, true)){
                         continue;
                     }
 
@@ -47,9 +47,9 @@ 
             }
         }
 
-        foreach ($this->node->dependencies as $dependency) {
+        foreach ($this->node->dependencies as $dependency){
             $import = [$dependency->type->fullName, $dependency->type->alias];
-            if (\in_array($import, $imported, true)) {
+            if (\in_array($import, $imported, true)){
                 continue;
             }
 
@@ -72,8 +72,8 @@ 
 
     private function definePlacementID(Namespace_ $node): int
     {
-        foreach ($node->stmts as $index => $child) {
-            if ($child instanceof Class_) {
+        foreach ($node->stmts as $index => $child){
+            if ($child instanceof Class_){
                 return $index;
             }
         }
@@ -90,13 +90,13 @@ 
     {
         $uses = $this->getExistingUseParts($stmts);
 
-        foreach ($nodes as $i => $node) {
-            if (!$node instanceof Node\Stmt\Use_) {
+        foreach ($nodes as $i => $node){
+            if (!$node instanceof Node\Stmt\Use_){
                 continue;
             }
 
-            foreach ($node->uses as $use) {
-                if (\in_array($use->name->parts, $uses, true)) {
+            foreach ($node->uses as $use){
+                if (\in_array($use->name->parts, $uses, true)){
                     unset($nodes[$i]);
                 }
             }
@@ -115,12 +115,12 @@ 
     private function getExistingUseParts(array $stmts): array
     {
         $uses = [];
-        foreach ($stmts as $stmt) {
-            if (!$stmt instanceof Node\Stmt\Use_) {
+        foreach ($stmts as $stmt){
+            if (!$stmt instanceof Node\Stmt\Use_){
                 continue;
             }
 
-            foreach ($stmt->uses as $use) {
+            foreach ($stmt->uses as $use){
                 $uses[] = $use->name->parts;
             }
         }
@@ -131,7 +131,7 @@ 
     private function buildUse(string $type, ?string $alias = null): Node\Stmt\Use_
     {
         $b = new Use_(new Name($type), Node\Stmt\Use_::TYPE_NORMAL);
-        if (!empty($alias)) {
+        if (!empty($alias)){
             $b->as($alias);
         }
 

Braces +34 added lines, -17 removed lines

@@ -28,16 +28,21 @@ 
 
     public function leaveNode(Node $node): ?Node
     {
-        if (!$node instanceof Namespace_) {
+        if (!$node instanceof Namespace_)
+        {
             return null;
         }
 
         $imported = [];
-        if (!$this->node->hasConstructor && $this->node->constructorParams) {
-            foreach ($this->node->constructorParams as $param) {
-                if (!empty($param->type) && $param->type->fullName) {
+        if (!$this->node->hasConstructor && $this->node->constructorParams)
+        {
+            foreach ($this->node->constructorParams as $param)
+            {
+                if (!empty($param->type) && $param->type->fullName)
+                {
                     $import = [$param->type->fullName, $param->type->alias];
-                    if (\in_array($import, $imported, true)) {
+                    if (\in_array($import, $imported, true))
+                    {
                         continue;
                     }
 
@@ -47,9 +52,11 @@ 
             }
         }
 
-        foreach ($this->node->dependencies as $dependency) {
+        foreach ($this->node->dependencies as $dependency)
+        {
             $import = [$dependency->type->fullName, $dependency->type->alias];
-            if (\in_array($import, $imported, true)) {
+            if (\in_array($import, $imported, true))
+            {
                 continue;
             }
 
@@ -72,8 +79,10 @@ 
 
     private function definePlacementID(Namespace_ $node): int
     {
-        foreach ($node->stmts as $index => $child) {
-            if ($child instanceof Class_) {
+        foreach ($node->stmts as $index => $child)
+        {
+            if ($child instanceof Class_)
+            {
                 return $index;
             }
         }
@@ -90,13 +99,17 @@ 
     {
         $uses = $this->getExistingUseParts($stmts);
 
-        foreach ($nodes as $i => $node) {
-            if (!$node instanceof Node\Stmt\Use_) {
+        foreach ($nodes as $i => $node)
+        {
+            if (!$node instanceof Node\Stmt\Use_)
+            {
                 continue;
             }
 
-            foreach ($node->uses as $use) {
-                if (\in_array($use->name->parts, $uses, true)) {
+            foreach ($node->uses as $use)
+            {
+                if (\in_array($use->name->parts, $uses, true))
+                {
                     unset($nodes[$i]);
                 }
             }
@@ -115,12 +128,15 @@ 
     private function getExistingUseParts(array $stmts): array
     {
         $uses = [];
-        foreach ($stmts as $stmt) {
-            if (!$stmt instanceof Node\Stmt\Use_) {
+        foreach ($stmts as $stmt)
+        {
+            if (!$stmt instanceof Node\Stmt\Use_)
+            {
                 continue;
             }
 
-            foreach ($stmt->uses as $use) {
+            foreach ($stmt->uses as $use)
+            {
                 $uses[] = $use->name->parts;
             }
         }
@@ -131,7 +147,8 @@ 
     private function buildUse(string $type, ?string $alias = null): Node\Stmt\Use_
     {
         $b = new Use_(new Name($type), Node\Stmt\Use_::TYPE_NORMAL);
-        if (!empty($alias)) {
+        if (!empty($alias))
+        {
             $b->as($alias);
         }
 

src/Prototype/src/NodeVisitors/RemoveTrait.php

Spacing +6 added lines, -6 removed lines

@@ -17,28 +17,28 @@
  */
 final class RemoveTrait extends NodeVisitorAbstract
 {
-    public function leaveNode(Node $node): int|Node|null
+    public function leaveNode(Node $node): int | Node | null
     {
-        if (!$node instanceof TraitUse) {
+        if (!$node instanceof TraitUse){
             return null;
         }
 
-        foreach ($node->traits as $index => $use) {
-            if ($use instanceof Name) {
+        foreach ($node->traits as $index => $use){
+            if ($use instanceof Name){
                 $name = $this->trimSlashes(\implode('\\', $use->parts));
                 if (
                     \in_array($name, [
                         $this->trimSlashes(PrototypeTrait::class),
                         Utils::shortName(PrototypeTrait::class),
                     ], true)
-                ) {
+                ){
                     unset($node->traits[$index]);
                 }
             }
         }
 
         $node->traits = \array_values($node->traits);
-        if (empty($node->traits)) {
+        if (empty($node->traits)){
             return NodeTraverser::REMOVE_NODE;
         }
 

Braces +8 added lines, -4 removed lines

@@ -19,12 +19,15 @@ 
 {
     public function leaveNode(Node $node): int|Node|null
     {
-        if (!$node instanceof TraitUse) {
+        if (!$node instanceof TraitUse)
+        {
             return null;
         }
 
-        foreach ($node->traits as $index => $use) {
-            if ($use instanceof Name) {
+        foreach ($node->traits as $index => $use)
+        {
+            if ($use instanceof Name)
+            {
                 $name = $this->trimSlashes(\implode('\\', $use->parts));
                 if (
                     \in_array($name, [
@@ -38,7 +41,8 @@ 
         }
 
         $node->traits = \array_values($node->traits);
-        if (empty($node->traits)) {
+        if (empty($node->traits))
+        {
             return NodeTraverser::REMOVE_NODE;
         }
 

src/Tokenizer/tests/ReflectionFileTest.php

Spacing +10 added lines, -10 removed lines

@@ -21,17 +21,17 @@ 
         $this->assertContains(TestTrait::class, $reflection->getTraits());
         $this->assertContains(TestInterface::class, $reflection->getInterfaces());
 
-        $this->assertSame([__NAMESPACE__ . '\hello'], $reflection->getFunctions());
+        $this->assertSame([__NAMESPACE__.'\hello'], $reflection->getFunctions());
 
         $functionA = null;
         $functionB = null;
 
-        foreach ($reflection->getInvocations() as $invocation) {
-            if ($invocation->getName() == 'test_function_a') {
+        foreach ($reflection->getInvocations() as $invocation){
+            if ($invocation->getName() == 'test_function_a'){
                 $functionA = $invocation;
             }
 
-            if ($invocation->getName() == 'test_function_b') {
+            if ($invocation->getName() == 'test_function_b'){
                 $functionB = $invocation;
             }
         }
@@ -58,7 +58,7 @@ 
 
     public function testReflectionFileWithNamedParameters(): void
     {
-        $reflection = new ReflectionFile(__DIR__ . '/Classes/ClassWithNamedParameter.php');
+        $reflection = new ReflectionFile(__DIR__.'/Classes/ClassWithNamedParameter.php');
 
         $this->assertSame([
             ClassWithNamedParameter::class,
@@ -67,7 +67,7 @@ 
 
     public function testReflectionFileAnonymousClass(): void
     {
-        $reflection = new ReflectionFile(__DIR__ . '/Classes/ClassWithAnonymousClass.php');
+        $reflection = new ReflectionFile(__DIR__.'/Classes/ClassWithAnonymousClass.php');
 
         $this->assertSame([
             ClassWithAnonymousClass::class,
@@ -76,7 +76,7 @@ 
 
     public function testReflectionFileWithHeredoc(): void
     {
-        $reflection = new ReflectionFile(__DIR__ . '/Classes/ClassWithHeredoc.php');
+        $reflection = new ReflectionFile(__DIR__.'/Classes/ClassWithHeredoc.php');
 
         $this->assertSame([
             'Spiral\Tests\Tokenizer\Classes\ClassWithHeredoc',
@@ -85,7 +85,7 @@ 
 
     public function testReflectionEnum(): void
     {
-        $reflection = new ReflectionFile(__DIR__ . '/Classes/ClassD.php');
+        $reflection = new ReflectionFile(__DIR__.'/Classes/ClassD.php');
 
         $this->assertSame([
             ClassD::class,
@@ -94,7 +94,7 @@ 
 
     public function testReflectionTypedEnum(): void
     {
-        $reflection = new ReflectionFile(__DIR__ . '/Classes/ClassE.php');
+        $reflection = new ReflectionFile(__DIR__.'/Classes/ClassE.php');
 
         $this->assertSame([
             ClassE::class,
@@ -103,7 +103,7 @@ 
 
     public function testReflectionInterface(): void
     {
-        $reflection = new ReflectionFile(__DIR__ . '/Interfaces/InterfaceA.php');
+        $reflection = new ReflectionFile(__DIR__.'/Interfaces/InterfaceA.php');
 
         $this->assertSame([
             InterfaceA::class,

src/Cookies/src/Cookie.php

Spacing +10 added lines, -10 removed lines

@@ -62,7 +62,7 @@ 
         private readonly bool $secure = false,
         private readonly bool $httpOnly = true,
         ?string $sameSite = null
-    ) {
+    ){
         $this->sameSite = new SameSite($sameSite, $secure);
     }
 
@@ -158,30 +158,30 @@ 
      */
     public function createHeader(): string
     {
-        $header = [\rawurlencode($this->name) . '=' . \rawurlencode((string)$this->value)];
+        $header = [\rawurlencode($this->name).'='.\rawurlencode((string)$this->value)];
 
-        if ($this->lifetime !== null) {
-            $header[] = 'Expires=' . \gmdate(\DateTime::COOKIE, $this->getExpires());
+        if ($this->lifetime !== null){
+            $header[] = 'Expires='.\gmdate(\DateTime::COOKIE, $this->getExpires());
             $header[] = \sprintf('Max-Age=%d', $this->lifetime);
         }
 
-        if (!empty($this->path)) {
+        if (!empty($this->path)){
             $header[] = \sprintf('Path=%s', $this->path);
         }
 
-        if (!empty($this->domain)) {
+        if (!empty($this->domain)){
             $header[] = \sprintf('Domain=%s', $this->domain);
         }
 
-        if ($this->secure) {
+        if ($this->secure){
             $header[] = 'Secure';
         }
 
-        if ($this->httpOnly) {
+        if ($this->httpOnly){
             $header[] = 'HttpOnly';
         }
 
-        if ($this->sameSite->get() !== null) {
+        if ($this->sameSite->get() !== null){
             $header[] = \sprintf('SameSite=%s', $this->sameSite->get());
         }
 
@@ -195,7 +195,7 @@ 
      */
     public function getExpires(): ?int
     {
-        if ($this->lifetime === null) {
+        if ($this->lifetime === null){
             return null;
         }
 

src/Core/tests/InjectableTest.php

Spacing +5 added lines, -5 removed lines

@@ -40,7 +40,7 @@ 
 
     public function testInvalidInjector(): void
     {
-        $excepted = "Class 'Spiral\Tests\Core\Fixtures\InvalidInjector' must be an " .
+        $excepted = "Class 'Spiral\Tests\Core\Fixtures\InvalidInjector' must be an ".
                     "instance of InjectorInterface for 'Spiral\Tests\Core\Fixtures\TestConfig'";
         $this->expectException(InjectionException::class);
         $this->expectExceptionMessage($excepted);
@@ -66,7 +66,7 @@ 
 
     public function testInvalidRuntimeInjector(): void
     {
-        $excepted = "Class 'Spiral\Tests\Core\Fixtures\InvalidInjector' must be an " .
+        $excepted = "Class 'Spiral\Tests\Core\Fixtures\InvalidInjector' must be an ".
             "instance of InjectorInterface for 'Spiral\Tests\Core\Fixtures\TestConfig'";
         $this->expectException(InjectionException::class);
         $this->expectExceptionMessage($excepted);
@@ -204,8 +204,8 @@ 
     public function testExtendedInjectorAnonClassObjectParam(): void
     {
         $container = new Container();
-        $container->bind(stdClass::class, new Injectable(new class implements InjectorInterface {
-            public function createInjection(\ReflectionClass $class, object|string|null $context = null): object
+        $container->bind(stdClass::class, new Injectable(new class implements InjectorInterface{
+            public function createInjection(\ReflectionClass $class, object | string | null $context = null): object
             {
                 return (object)['context' => $context];
             }
@@ -220,7 +220,7 @@ 
     public function testExtendedInjectorAnonClassMixedParam(): void
     {
         $container = new Container();
-        $container->bind(stdClass::class, new Injectable(new class implements InjectorInterface {
+        $container->bind(stdClass::class, new Injectable(new class implements InjectorInterface{
             public function createInjection(\ReflectionClass $class, mixed $context = null): object
             {
                 return (object)['context' => $context];

Braces +4 added lines, -2 removed lines

@@ -204,7 +204,8 @@ 
     public function testExtendedInjectorAnonClassObjectParam(): void
     {
         $container = new Container();
-        $container->bind(stdClass::class, new Injectable(new class implements InjectorInterface {
+        $container->bind(stdClass::class, new Injectable(new class implements InjectorInterface
+        {
             public function createInjection(\ReflectionClass $class, object|string|null $context = null): object
             {
                 return (object)['context' => $context];
@@ -220,7 +221,8 @@ 
     public function testExtendedInjectorAnonClassMixedParam(): void
     {
         $container = new Container();
-        $container->bind(stdClass::class, new Injectable(new class implements InjectorInterface {
+        $container->bind(stdClass::class, new Injectable(new class implements InjectorInterface
+        {
             public function createInjection(\ReflectionClass $class, mixed $context = null): object
             {
                 return (object)['context' => $context];

src/Core/tests/Scope/ProxyTest.php

Spacing +17 added lines, -17 removed lines

@@ -48,7 +48,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());
@@ -68,7 +68,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());
@@ -85,14 +85,14 @@ 
         $root = new Container();
         $root->getBinder('http')->bindSingleton(LoggerInterface::class, KVLogger::class);
 
-        $root->runScope(new Scope(), static function (Container $c1) {
+        $root->runScope(new Scope(), static function (Container $c1){
             $c1->runScope(
                 new Scope(name: 'http'),
                 static function (
                     ScopedProxyLoggerCarrier $carrier,
                     ScopedProxyLoggerCarrier $carrier2,
                     LoggerInterface $logger,
-                ) {
+                ){
                     // from the current `foo` scope
                     self::assertInstanceOf(KVLogger::class, $logger);
 
@@ -112,10 +112,10 @@ 
         $root = new Container();
         $root->getBinder('foo')->bind(LoggerInterface::class, KVLogger::class);
 
-        $root->runScope(new Scope(), static function (Container $c1) {
+        $root->runScope(new Scope(), static function (Container $c1){
             $c1->runScope(
                 new Scope(name: 'foo'),
-                static function (ScopedProxyLoggerCarrier $carrier, LoggerInterface $logger) {
+                static function (ScopedProxyLoggerCarrier $carrier, LoggerInterface $logger){
                     // from the current `foo` scope
                     self::assertInstanceOf(KVLogger::class, $logger);
 
@@ -136,7 +136,7 @@ 
             ->bind(
                 ContextInterface::class,
                 new Injectable(
-                    new class implements InjectorInterface {
+                    new class implements InjectorInterface{
                         public function createInjection(\ReflectionClass $class, mixed $context = null): Context
                         {
                             return new Context($context);
@@ -145,8 +145,8 @@ 
                 ),
             );
 
-        $root->runScope(new Scope(), static function (Container $c1) {
-            $c1->runScope(new Scope(name: 'foo'), static function (Container $c, ContextInterface $param) {
+        $root->runScope(new Scope(), static function (Container $c1){
+            $c1->runScope(new Scope(name: 'foo'), static function (Container $c, ContextInterface $param){
                 self::assertInstanceOf(ReflectionParameter::class, $param->value);
                 self::assertSame('param', $param->value->getName());
 
@@ -177,7 +177,7 @@ 
             ->bind(
                 ContextInterface::class,
                 new Injectable(
-                    new class implements InjectorInterface {
+                    new class implements InjectorInterface{
                         public function createInjection(\ReflectionClass $class, mixed $context = null): Context
                         {
                             return new Context($context);
@@ -187,15 +187,15 @@ 
             );
 
         FiberHelper::runFiberSequence(
-            static fn() => $root->runScope(new Scope(name: 'foo'), static function (ContextInterface $ctx) {
-                for ($i = 0; $i < 10; $i++) {
+            static fn() => $root->runScope(new Scope(name: 'foo'), static function (ContextInterface $ctx){
+                for ($i = 0; $i < 10; $i++){
                     self::assertInstanceOf(ReflectionParameter::class, $ctx->getValue(), 'Context injected');
                     self::assertSame('ctx', $ctx->getValue()->getName());
                     \Fiber::suspend();
                 }
             }),
-            static fn() => $root->runScope(new Scope(name: 'foo'), static function (ContextInterface $context) {
-                for ($i = 0; $i < 10; $i++) {
+            static fn() => $root->runScope(new Scope(name: 'foo'), static function (ContextInterface $context){
+                for ($i = 0; $i < 10; $i++){
                     self::assertInstanceOf(ReflectionParameter::class, $context->getValue(), 'Context injected');
                     self::assertSame('context', $context->getValue()->getName());
                     \Fiber::suspend();
@@ -256,10 +256,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()
@@ -287,7 +287,7 @@ 
             new Scope('http'),
             static function () use ($root, $proxy) {
                 self::assertSame('Foo', $proxy->getName());
-                $proxy->setName(new class implements \Stringable {
+                $proxy->setName(new class implements \Stringable{
                     public function __toString(): string
                     {
                         return 'Bar';

Braces +38 added lines, -19 removed lines

@@ -44,11 +44,13 @@ 
                         LoggerInterface::class => KVLogger::class,
                     ],
                 ),
-                static function (ScopedProxyLoggerCarrier $carrier, LoggerInterface $logger) use ($lc) {
+                static function (ScopedProxyLoggerCarrier $carrier, LoggerInterface $logger) use ($lc)
+                {
                     // 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());
@@ -64,11 +66,13 @@ 
                         LoggerInterface::class => FileLogger::class,
                     ],
                 ),
-                static function (ScopedProxyLoggerCarrier $carrier, LoggerInterface $logger) use ($lc) {
+                static function (ScopedProxyLoggerCarrier $carrier, LoggerInterface $logger) use ($lc)
+                {
                     // 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());
@@ -85,7 +89,8 @@ 
         $root = new Container();
         $root->getBinder('http')->bindSingleton(LoggerInterface::class, KVLogger::class);
 
-        $root->runScope(new Scope(), static function (Container $c1) {
+        $root->runScope(new Scope(), static function (Container $c1)
+        {
             $c1->runScope(
                 new Scope(name: 'http'),
                 static function (
@@ -112,10 +117,12 @@ 
         $root = new Container();
         $root->getBinder('foo')->bind(LoggerInterface::class, KVLogger::class);
 
-        $root->runScope(new Scope(), static function (Container $c1) {
+        $root->runScope(new Scope(), static function (Container $c1)
+        {
             $c1->runScope(
                 new Scope(name: 'foo'),
-                static function (ScopedProxyLoggerCarrier $carrier, LoggerInterface $logger) {
+                static function (ScopedProxyLoggerCarrier $carrier, LoggerInterface $logger)
+                {
                     // from the current `foo` scope
                     self::assertInstanceOf(KVLogger::class, $logger);
 
@@ -136,7 +143,8 @@ 
             ->bind(
                 ContextInterface::class,
                 new Injectable(
-                    new class implements InjectorInterface {
+                    new class implements InjectorInterface
+                    {
                         public function createInjection(\ReflectionClass $class, mixed $context = null): Context
                         {
                             return new Context($context);
@@ -145,8 +153,10 @@ 
                 ),
             );
 
-        $root->runScope(new Scope(), static function (Container $c1) {
-            $c1->runScope(new Scope(name: 'foo'), static function (Container $c, ContextInterface $param) {
+        $root->runScope(new Scope(), static function (Container $c1)
+        {
+            $c1->runScope(new Scope(name: 'foo'), static function (Container $c, ContextInterface $param)
+            {
                 self::assertInstanceOf(ReflectionParameter::class, $param->value);
                 self::assertSame('param', $param->value->getName());
 
@@ -177,7 +187,8 @@ 
             ->bind(
                 ContextInterface::class,
                 new Injectable(
-                    new class implements InjectorInterface {
+                    new class implements InjectorInterface
+                    {
                         public function createInjection(\ReflectionClass $class, mixed $context = null): Context
                         {
                             return new Context($context);
@@ -187,15 +198,19 @@ 
             );
 
         FiberHelper::runFiberSequence(
-            static fn() => $root->runScope(new Scope(name: 'foo'), static function (ContextInterface $ctx) {
-                for ($i = 0; $i < 10; $i++) {
+            static fn() => $root->runScope(new Scope(name: 'foo'), static function (ContextInterface $ctx)
+            {
+                for ($i = 0; $i < 10; $i++)
+                {
                     self::assertInstanceOf(ReflectionParameter::class, $ctx->getValue(), 'Context injected');
                     self::assertSame('ctx', $ctx->getValue()->getName());
                     \Fiber::suspend();
                 }
             }),
-            static fn() => $root->runScope(new Scope(name: 'foo'), static function (ContextInterface $context) {
-                for ($i = 0; $i < 10; $i++) {
+            static fn() => $root->runScope(new Scope(name: 'foo'), static function (ContextInterface $context)
+            {
+                for ($i = 0; $i < 10; $i++)
+                {
                     self::assertInstanceOf(ReflectionParameter::class, $context->getValue(), 'Context injected');
                     self::assertSame('context', $context->getValue()->getName());
                     \Fiber::suspend();
@@ -211,8 +226,10 @@ 
 
         $root->runScope(
             new Scope(),
-            static function (#[Proxy] ContainerInterface $cp) use ($root) {
-                $root->runScope(new Scope(name: 'http'), static function (ContainerInterface $c) use ($cp) {
+            static function (#[Proxy] ContainerInterface $cp) use ($root)
+            {
+                $root->runScope(new Scope(name: 'http'), static function (ContainerInterface $c) use ($cp)
+                {
                     self::assertNotSame($c, $cp);
                     self::assertSame($c, $cp->get(ContainerInterface::class));
                     self::assertInstanceOf(KVLogger::class, $cp->get(LoggerInterface::class));
@@ -256,7 +273,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,
             ) {
@@ -285,7 +303,8 @@ 
 
         $root->runScope(
             new Scope('http'),
-            static function () use ($root, $proxy) {
+            static function () use ($root, $proxy)
+            {
                 self::assertSame('Foo', $proxy->getName());
                 $proxy->setName(new class implements \Stringable {
                     public function __toString(): string

src/Core/tests/Scope/UseCaseTest.php

Braces +50 added lines, -25 removed lines

@@ -36,7 +36,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]);
 
@@ -69,7 +70,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);
 
@@ -94,14 +96,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);
 
@@ -130,14 +134,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);
@@ -270,7 +276,8 @@ 
     {
         $root = new Container();
 
-        $root->invoke(static function () use ($root) {
+        $root->invoke(static function () use ($root)
+        {
             self::assertNotNull(ContainerScope::getContainer());
             self::assertSame($root, ContainerScope::getContainer());
         });
@@ -279,7 +286,8 @@ 
     public function testRegisterContainerOnGet(): void
     {
         $root = new Container();
-        $root->bind('foo', function () use ($root) {
+        $root->bind('foo', function () use ($root)
+        {
             self::assertNotNull(ContainerScope::getContainer());
             self::assertSame($root, ContainerScope::getContainer());
         });
@@ -290,7 +298,8 @@ 
     public function testRegisterContainerOnMake(): void
     {
         $root = new Container();
-        $root->bind('foo', function () use ($root) {
+        $root->bind('foo', function () use ($root)
+        {
             self::assertNotNull(ContainerScope::getContainer());
             self::assertSame($root, ContainerScope::getContainer());
         });
@@ -308,7 +317,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(ContainerScope::getContainer());
             self::assertNotSame($root, ContainerScope::getContainer());
@@ -323,7 +333,8 @@ 
 
         $root->runScope(
             new Scope('foo'),
-            function (ContainerInterface $c) {
+            function (ContainerInterface $c)
+            {
                 self::assertTrue($c->get('isFoo'));
                 $c->get('foo');
             }
@@ -336,7 +347,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'));
         });
@@ -348,20 +360,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'));
             });
@@ -373,33 +390,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/Factory.php

Spacing +67 added lines, -67 removed lines

@@ -75,19 +75,19 @@ 
      *
      * @throws \Throwable
      */
-    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
     {
-        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',
@@ -117,7 +117,7 @@ 
                     ->resolveWeakReference($binding, $alias, $context, $parameters),
                 default => $binding,
             };
-        } finally {
+        }finally{
             $this->state->bindings[$alias] ??= $binding;
             $this->tracer->pop(true);
             $this->tracer->pop(false);
@@ -131,18 +131,18 @@ 
     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'.",
@@ -169,7 +169,7 @@ 
                 default => (string)$context,
             });
 
-            if (!$reflection->isInstance($instance)) {
+            if (!$reflection->isInstance($instance)){
                 throw new InjectionException(
                     \sprintf(
                         "Invalid injection response for '%s'.",
@@ -179,7 +179,7 @@ 
             }
 
             return $instance;
-        } finally {
+        }finally{
             $this->state->bindings[$ctx->class] ??= $binding;
         }
     }
@@ -187,29 +187,29 @@ 
     private function resolveAlias(
         Alias $binding,
         string $alias,
-        Stringable|string|null $context,
+        Stringable | string | null $context,
         array $arguments,
     ): mixed {
         $result = $binding->alias === $alias
             ? $this->autowire(
-                new Ctx(alias: $alias, class: $binding->alias, context: $context, singleton: $binding->singleton),
+                new Ctx(alias : $alias, class : $binding->alias, context : $context, singleton : $binding->singleton),
                 $arguments,
             )
             //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;
         }
 
         return $result;
     }
 
-    private function resolveProxy(Config\Proxy $binding, string $alias, Stringable|string|null $context): mixed
+    private function resolveProxy(Config\Proxy $binding, string $alias, Stringable | string | null $context): mixed
     {
         $result = Proxy::create(new \ReflectionClass($binding->getInterface()), $context, new Attribute\Proxy());
 
-        if ($binding->singleton) {
+        if ($binding->singleton){
             $this->state->singletons[$alias] = $result;
         }
 
@@ -219,13 +219,13 @@ 
     private function resolveShared(
         Shared $binding,
         string $alias,
-        Stringable|string|null $context,
+        Stringable | string | null $context,
         array $arguments,
     ): object {
         $avoidCache = $arguments !== [];
         return $avoidCache
             ? $this->createInstance(
-                new Ctx(alias: $alias, class: $binding->value::class, context: $context),
+                new Ctx(alias : $alias, class : $binding->value::class, context : $context),
                 $arguments,
             )
             : $binding->value;
@@ -234,7 +234,7 @@ 
     private function resolveAutowire(
         Autowire $binding,
         string $alias,
-        Stringable|string|null $context,
+        Stringable | string | null $context,
         array $arguments,
     ): mixed {
         $instance = $binding->autowire->resolve($this, $arguments);
@@ -244,17 +244,17 @@ 
     }
 
     private function resolveFactory(
-        Config\Factory|DeferredFactory $binding,
+        Config\Factory | DeferredFactory $binding,
         string $alias,
-        Stringable|string|null $context,
+        Stringable | string | null $context,
         array $arguments,
     ): mixed {
         $ctx = new Ctx(alias: $alias, class: $alias, context: $context, singleton: $binding->singleton);
-        try {
+        try{
             $instance = $binding::class === 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(),
@@ -268,24 +268,24 @@ 
     private function resolveWeakReference(
         Config\WeakReference $binding,
         string $alias,
-        Stringable|string|null $context,
+        Stringable | string | null $context,
         array $arguments,
     ): ?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(
@@ -295,7 +295,7 @@ 
                         )
                     )
                 );
-            } finally {
+            }finally{
                 $this->tracer->pop();
             }
         }
@@ -306,23 +306,23 @@ 
     private function resolveWithoutBinding(
         string $alias,
         array $parameters = [],
-        Stringable|string|null $context = null
+        Stringable | string | null $context = null
     ): 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(),
                 ]);
                 /** @psalm-suppress TooManyArguments */
                 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,
@@ -331,19 +331,19 @@ 
                     '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);
         }
     }
@@ -364,7 +364,7 @@ 
                 &&
                 (isset($this->state->injectors[$ctx->class]) || $this->binder->hasInjector($ctx->class))
         ))
-        ) {
+        ){
             throw new NotFoundException($this->tracer->combineTraceMessage(\sprintf(
                 'Can\'t resolve `%s`: undefined class or binding `%s`.',
                 $this->tracer->getRootAlias(),
@@ -390,13 +390,13 @@ 
         Ctx $ctx,
         array $arguments,
     ): object {
-        if ($this->options->checkScope) {
+        if ($this->options->checkScope){
             // Check scope name
             $ctx->reflection = new \ReflectionClass($instance);
             $scopeName = ($ctx->reflection->getAttributes(Attribute\Scope::class)[0] ?? null)?->newInstance()->name;
-            if ($scopeName !== null) {
+            if ($scopeName !== null){
                 $scope = $this->scope;
-                while ($scope->getScopeName() !== $scopeName) {
+                while ($scope->getScopeName() !== $scopeName){
                     $scope = $scope->getParentScope() ?? throw new BadScopeException($scopeName, $instance::class);
                 }
             }
@@ -425,26 +425,26 @@ 
         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
-        if ($this->options->checkScope) {
+        if ($this->options->checkScope){
             $scope = ($reflection->getAttributes(Attribute\Scope::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',
@@ -457,12 +457,12 @@ 
 
         $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, $this->options->validateArguments);
-            } catch (ValidationException $e) {
+            }catch (ValidationException $e){
                 throw new ContainerException(
                     $this->tracer->combineTraceMessage(
                         \sprintf(
@@ -472,22 +472,22 @@ 
                         )
                     ),
                 );
-            } 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();
         }
@@ -505,13 +505,13 @@ 
         $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;
         }
 
@@ -523,12 +523,12 @@ 
      */
     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;
         }
 
@@ -542,7 +542,7 @@ 
          * @var Attribute\Finalize|null $attribute
          */
         $attribute = ($ctx->reflection->getAttributes(Finalize::class)[0] ?? null)?->newInstance();
-        if ($attribute === null) {
+        if ($attribute === null){
             return null;
         }
 
@@ -556,10 +556,10 @@ 
     {
         $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);
@@ -575,9 +575,9 @@ 
 
     private function validateArguments(ContextFunction $reflection, array $arguments = []): bool
     {
-        try {
+        try{
             $this->resolver->validateArguments($reflection, $arguments);
-        } catch (\Throwable) {
+        }catch (\Throwable){
             return false;
         }
 

Braces +127 added lines, -55 removed lines

@@ -77,17 +77,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',
@@ -117,7 +120,9 @@ 
                     ->resolveWeakReference($binding, $alias, $context, $parameters),
                 default => $binding,
             };
-        } finally {
+        }
+        finally
+        {
             $this->state->bindings[$alias] ??= $binding;
             $this->tracer->pop(true);
             $this->tracer->pop(false);
@@ -131,18 +136,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'.",
@@ -169,7 +179,8 @@ 
                 default => (string)$context,
             });
 
-            if (!$reflection->isInstance($instance)) {
+            if (!$reflection->isInstance($instance))
+            {
                 throw new InjectionException(
                     \sprintf(
                         "Invalid injection response for '%s'.",
@@ -179,7 +190,9 @@ 
             }
 
             return $instance;
-        } finally {
+        }
+        finally
+        {
             $this->state->bindings[$ctx->class] ??= $binding;
         }
     }
@@ -198,7 +211,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;
         }
 
@@ -209,7 +223,8 @@ 
     {
         $result = Proxy::create(new \ReflectionClass($binding->getInterface()), $context, new Attribute\Proxy());
 
-        if ($binding->singleton) {
+        if ($binding->singleton)
+        {
             $this->state->singletons[$alias] = $result;
         }
 
@@ -250,11 +265,14 @@ 
         array $arguments,
     ): mixed {
         $ctx = new Ctx(alias: $alias, class: $alias, context: $context, singleton: $binding->singleton);
-        try {
+        try
+        {
             $instance = $binding::class === 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(),
@@ -273,19 +291,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(
@@ -295,7 +318,9 @@ 
                         )
                     )
                 );
-            } finally {
+            }
+            finally
+            {
                 $this->tracer->pop();
             }
         }
@@ -310,19 +335,26 @@ 
     ): 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(),
                 ]);
                 /** @psalm-suppress TooManyArguments */
                 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,
@@ -331,19 +363,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);
         }
     }
@@ -390,13 +427,16 @@ 
         Ctx $ctx,
         array $arguments,
     ): object {
-        if ($this->options->checkScope) {
+        if ($this->options->checkScope)
+        {
             // Check scope name
             $ctx->reflection = new \ReflectionClass($instance);
             $scopeName = ($ctx->reflection->getAttributes(Attribute\Scope::class)[0] ?? null)?->newInstance()->name;
-            if ($scopeName !== null) {
+            if ($scopeName !== null)
+            {
                 $scope = $this->scope;
-                while ($scope->getScopeName() !== $scopeName) {
+                while ($scope->getScopeName() !== $scopeName)
+                {
                     $scope = $scope->getParentScope() ?? throw new BadScopeException($scopeName, $instance::class);
                 }
             }
@@ -425,26 +465,33 @@ 
         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
-        if ($this->options->checkScope) {
+        if ($this->options->checkScope)
+        {
             $scope = ($reflection->getAttributes(Attribute\Scope::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',
@@ -457,12 +504,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, $this->options->validateArguments);
-            } catch (ValidationException $e) {
+            }
+            catch (ValidationException $e)
+            {
                 throw new ContainerException(
                     $this->tracer->combineTraceMessage(
                         \sprintf(
@@ -472,22 +523,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();
         }
@@ -505,13 +565,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;
         }
 
@@ -523,12 +585,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;
         }
 
@@ -542,7 +606,8 @@ 
          * @var Attribute\Finalize|null $attribute
          */
         $attribute = ($ctx->reflection->getAttributes(Finalize::class)[0] ?? null)?->newInstance();
-        if ($attribute === null) {
+        if ($attribute === null)
+        {
             return null;
         }
 
@@ -556,10 +621,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);
@@ -575,9 +644,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

Spacing +36 added lines, -36 removed lines

@@ -53,11 +53,11 @@ 
     public const DEFAULT_ROOT_SCOPE_NAME = 'root';
 
     private State $state;
-    private ResolverInterface|Resolver $resolver;
-    private FactoryInterface|Factory $factory;
-    private ContainerInterface|Internal\Container $container;
-    private BinderInterface|Binder $binder;
-    private InvokerInterface|Invoker $invoker;
+    private ResolverInterface | Resolver $resolver;
+    private FactoryInterface | Factory $factory;
+    private ContainerInterface | Internal\Container $container;
+    private BinderInterface | Binder $binder;
+    private InvokerInterface | Invoker $invoker;
     private Internal\Scope $scope;
 
     /**
@@ -65,11 +65,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);
@@ -123,7 +123,7 @@ 
      * @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)
@@ -149,7 +149,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)
@@ -169,9 +169,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
@@ -181,25 +181,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]);
             }
@@ -207,21 +207,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;
             }
         }
@@ -267,9 +267,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);
         }
 
@@ -340,8 +340,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);
             }
         }
@@ -355,7 +355,7 @@ 
     private function closeScope(): void
     {
         /** @psalm-suppress RedundantPropertyInitializationCheck */
-        if (!isset($this->scope)) {
+        if (!isset($this->scope)){
             $this->destruct();
             return;
         }
@@ -364,10 +364,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;
             }
         }
@@ -376,7 +376,7 @@ 
         $this->destruct();
 
         // Throw collected errors
-        if ($errors !== []) {
+        if ($errors !== []){
             throw new FinalizersException($scopeName, $errors);
         }
     }
@@ -398,18 +398,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();
                 }
             }