spiral / framework

src/Core/src/Exception/Container/AutowireException.php

Spacing +1 added lines, -1 removed lines

@@ -7,4 +7,4 @@
 /**
  * When class can not be created.
  */
-class AutowireException extends TracedContainerException {}
+class AutowireException extends TracedContainerException{}

Braces +3 added lines, -1 removed lines

@@ -7,4 +7,6 @@
 /**
  * When class can not be created.
  */
-class AutowireException extends TracedContainerException {}
+class AutowireException extends TracedContainerException
+{
+}

src/Core/tests/Internal/Resolver/NullableParameterTest.php

Spacing +3 added lines, -3 removed lines

@@ -82,7 +82,7 @@ 
     public function testNullableUnionDefaultScalar(): void
     {
         $result = $this->resolveClosure(
-            static fn(null|int|string $param = 42) => $param,
+            static fn(null | int | string $param = 42) => $param,
         );
 
         $this->assertSame([42], $result);
@@ -103,12 +103,12 @@ 
     {
         $this->bind(\DateTimeInterface::class, static fn() => throw new \RuntimeException('fail!'));
 
-        try {
+        try{
             $this->resolveClosure(
                 static fn(\DateTimeInterface $param) => $param,
             );
             self::fail('Exception should be thrown');
-        } catch (NotFoundException $e) {
+        }catch (NotFoundException $e){
             self::assertNotNull($e->getPrevious());
             self::assertStringContainsString('fail!', $e->getPrevious()->getMessage());
         }

Braces +5 added lines, -2 removed lines

@@ -103,12 +103,15 @@
     {
         $this->bind(\DateTimeInterface::class, static fn() => throw new \RuntimeException('fail!'));
 
-        try {
+        try
+        {
             $this->resolveClosure(
                 static fn(\DateTimeInterface $param) => $param,
             );
             self::fail('Exception should be thrown');
-        } catch (NotFoundException $e) {
+        }
+        catch (NotFoundException $e)
+        {
             self::assertNotNull($e->getPrevious());
             self::assertStringContainsString('fail!', $e->getPrevious()->getMessage());
         }

src/Core/tests/InvokerTest.php

Spacing +9 added lines, -9 removed lines

@@ -73,7 +73,7 @@ 
     {
         $this->container->bindSingleton(Bucket::class, $bucket = new Bucket('foo'));
 
-        $result = $this->container->invoke(Storage::class . '::createBucket', ['name' => 'bar']);
+        $result = $this->container->invoke(Storage::class.'::createBucket', ['name' => 'bar']);
 
         self::assertSame($bucket, $result['bucket']);
         self::assertInstanceOf(SampleClass::class, $result['class']);
@@ -142,10 +142,10 @@ 
         // Note: do not add a return type to the closure
         $this->container->bind('foo', fn() => throw new \Exception('Factory called'));
 
-        try {
+        try{
             $this->container->invoke(['foo', 'publicMethod'], [42]);
             self::fail('Exception should be thrown');
-        } catch (\Throwable $e) {
+        }catch (\Throwable $e){
             self::assertInstanceOf(NotFoundException::class, $e);
             self::assertNotNull($e->getPrevious());
             self::assertStringContainsString('Factory called', $e->getPrevious()->getMessage());
@@ -157,12 +157,12 @@ 
      */
     public function testCallStaticMethodWithoutInstantiationWithOvertypedFactory(): void
     {
-        $this->container->bind('foo', fn(): PrivateConstructor|SampleClass => throw new \Exception('Factory called'));
+        $this->container->bind('foo', fn(): PrivateConstructor | SampleClass => throw new \Exception('Factory called'));
 
-        try {
+        try{
             $this->container->invoke(['foo', 'publicMethod'], [42]);
             self::fail('Exception should be thrown');
-        } catch (\Throwable $e) {
+        }catch (\Throwable $e){
             self::assertInstanceOf(NotFoundException::class, $e);
             self::assertNotNull($e->getPrevious());
             self::assertStringContainsString('Factory called', $e->getPrevious()->getMessage());
@@ -175,10 +175,10 @@ 
     public function testCallStaticMethodWithoutInstantiationWithNullableTypedFactory(): void
     {
         $this->container->bind('foo', fn(): ?PrivateConstructor => throw new \Exception('Factory called'));
-        try {
+        try{
             $this->container->invoke(['foo', 'publicMethod'], [42]);
             self::fail('Exception should be thrown');
-        } catch (\Throwable $e) {
+        }catch (\Throwable $e){
             self::assertInstanceOf(NotFoundException::class, $e);
             self::assertNotNull($e->getPrevious());
             self::assertStringContainsString('Factory called', $e->getPrevious()->getMessage());
@@ -190,7 +190,7 @@ 
         $this->expectException(ArgumentResolvingException::class);
         $this->expectExceptionMessage('Unable to resolve required argument `name` when resolving');
 
-        $this->container->invoke(Storage::class . '::createBucket', ['name' => 'bar']);
+        $this->container->invoke(Storage::class.'::createBucket', ['name' => 'bar']);
     }
 
     public function testCallValidClosure(): void

Braces +15 added lines, -6 removed lines

@@ -142,10 +142,13 @@ 
         // Note: do not add a return type to the closure
         $this->container->bind('foo', fn() => throw new \Exception('Factory called'));
 
-        try {
+        try
+        {
             $this->container->invoke(['foo', 'publicMethod'], [42]);
             self::fail('Exception should be thrown');
-        } catch (\Throwable $e) {
+        }
+        catch (\Throwable $e)
+        {
             self::assertInstanceOf(NotFoundException::class, $e);
             self::assertNotNull($e->getPrevious());
             self::assertStringContainsString('Factory called', $e->getPrevious()->getMessage());
@@ -159,10 +162,13 @@ 
     {
         $this->container->bind('foo', fn(): PrivateConstructor|SampleClass => throw new \Exception('Factory called'));
 
-        try {
+        try
+        {
             $this->container->invoke(['foo', 'publicMethod'], [42]);
             self::fail('Exception should be thrown');
-        } catch (\Throwable $e) {
+        }
+        catch (\Throwable $e)
+        {
             self::assertInstanceOf(NotFoundException::class, $e);
             self::assertNotNull($e->getPrevious());
             self::assertStringContainsString('Factory called', $e->getPrevious()->getMessage());
@@ -175,10 +181,13 @@ 
     public function testCallStaticMethodWithoutInstantiationWithNullableTypedFactory(): void
     {
         $this->container->bind('foo', fn(): ?PrivateConstructor => throw new \Exception('Factory called'));
-        try {
+        try
+        {
             $this->container->invoke(['foo', 'publicMethod'], [42]);
             self::fail('Exception should be thrown');
-        } catch (\Throwable $e) {
+        }
+        catch (\Throwable $e)
+        {
             self::assertInstanceOf(NotFoundException::class, $e);
             self::assertNotNull($e->getPrevious());
             self::assertStringContainsString('Factory called', $e->getPrevious()->getMessage());

src/Core/src/Internal/Factory.php

Spacing +8 added lines, -8 removed lines

@@ -37,23 +37,23 @@ 
     public function make(
         string $alias,
         array $parameters = [],
-        \Stringable|string|null $context = null,
+        \Stringable | string | null $context = null,
         ?Tracer $tracer = 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];
         }
 
 
         $this->actor->resolveType($alias, $binding, $singleton, $injector, $actor, false);
-        if ($parameters === [] && $singleton !== null) {
+        if ($parameters === [] && $singleton !== null){
             return $singleton;
         }
 
         $tracer ??= new Tracer();
 
         // Resolve without binding
-        if ($binding === null) {
+        if ($binding === null){
             $tracer->push(
                 false,
                 action: 'autowire',
@@ -61,7 +61,7 @@ 
                 scope: $this->scope->getScopeName(),
                 context: $context,
             );
-            try {
+            try{
                 // No direct instructions how to construct class, make is automatically
                 return $this->actor->autowire(
                     new Ctx(alias: $alias, class: $alias, context: $context, singleton: $parameters === [] ? null : false),
@@ -69,12 +69,12 @@ 
                     $actor,
                     $tracer,
                 );
-            } finally {
+            }finally{
                 $tracer->pop(false);
             }
         }
 
-        try {
+        try{
             $tracer->push(
                 false,
                 action: 'resolve from binding',
@@ -87,7 +87,7 @@ 
 
             $actor->disableBinding($alias);
             return $actor->resolveBinding($binding, $alias, $context, $parameters, $tracer);
-        } finally {
+        }finally{
             $actor->enableBinding($alias, $binding);
             $tracer->pop(true);
             $tracer->pop(false);

Braces +16 added lines, -7 removed lines

@@ -40,20 +40,23 @@ 
         \Stringable|string|null $context = null,
         ?Tracer $tracer = 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];
         }
 
 
         $this->actor->resolveType($alias, $binding, $singleton, $injector, $actor, false);
-        if ($parameters === [] && $singleton !== null) {
+        if ($parameters === [] && $singleton !== null)
+        {
             return $singleton;
         }
 
         $tracer ??= new Tracer();
 
         // Resolve without binding
-        if ($binding === null) {
+        if ($binding === null)
+        {
             $tracer->push(
                 false,
                 action: 'autowire',
@@ -61,7 +64,8 @@ 
                 scope: $this->scope->getScopeName(),
                 context: $context,
             );
-            try {
+            try
+            {
                 // No direct instructions how to construct class, make is automatically
                 return $this->actor->autowire(
                     new Ctx(alias: $alias, class: $alias, context: $context, singleton: $parameters === [] ? null : false),
@@ -69,12 +73,15 @@ 
                     $actor,
                     $tracer,
                 );
-            } finally {
+            }
+            finally
+            {
                 $tracer->pop(false);
             }
         }
 
-        try {
+        try
+        {
             $tracer->push(
                 false,
                 action: 'resolve from binding',
@@ -87,7 +94,9 @@ 
 
             $actor->disableBinding($alias);
             return $actor->resolveBinding($binding, $alias, $context, $parameters, $tracer);
-        } finally {
+        }
+        finally
+        {
             $actor->enableBinding($alias, $binding);
             $tracer->pop(true);
             $tracer->pop(false);

src/Router/src/Loader/Configurator/RouteConfigurator.php

Spacing +11 added lines, -11 removed lines

@@ -32,7 +32,7 @@ 
     private ?string $group = null;
     private ?array $methods = null;
     private string $prefix = '';
-    private HandlerInterface|CoreInterface|null $core = null;
+    private HandlerInterface | CoreInterface | null $core = null;
     private ?array $middleware = null;
 
     /** @var null|string|callable|RequestHandlerInterface|TargetInterface */
@@ -46,7 +46,7 @@ 
         private readonly string $name,
         private readonly string $pattern,
         private readonly RouteCollection $collection,
-    ) {}
+    ){}
 
     public function controller(string $controller, int $options = 0, string $defaultAction = 'index'): self
     {
@@ -69,21 +69,21 @@ 
         return $this;
     }
 
-    public function action(string $controller, string|array $action, int $options = 0): self
+    public function action(string $controller, string | array $action, int $options = 0): self
     {
         $this->target = new Action($controller, $action, $options);
 
         return $this;
     }
 
-    public function callable(array|\Closure $callable): self
+    public function callable(array | \Closure $callable): self
     {
         $this->target = $callable;
 
         return $this;
     }
 
-    public function handler(TargetInterface|string $target): self
+    public function handler(TargetInterface | string $target): self
     {
         $this->target = $target;
 
@@ -111,16 +111,16 @@ 
         return $this;
     }
 
-    public function core(HandlerInterface|CoreInterface $core): self
+    public function core(HandlerInterface | CoreInterface $core): self
     {
         $this->core = $core;
 
         return $this;
     }
 
-    public function middleware(MiddlewareInterface|string|array $middleware): self
+    public function middleware(MiddlewareInterface | string | array $middleware): self
     {
-        if (!\is_array($middleware)) {
+        if (!\is_array($middleware)){
             $middleware = [$middleware];
         }
 
@@ -132,9 +132,9 @@ 
     /**
      * @param non-empty-string|list<non-empty-string> $methods
      */
-    public function methods(string|array $methods): self
+    public function methods(string | array $methods): self
     {
-        $this->methods = (array) $methods;
+        $this->methods = (array)$methods;
 
         return $this;
     }
@@ -161,7 +161,7 @@ 
 
     public function __destruct()
     {
-        if ($this->target === null) {
+        if ($this->target === null){
             throw new TargetException(
                 \sprintf('The [%s] route has no defined target. Call one of: `controller`, `action`,
                     `namespaced`, `groupControllers`, `callable`, `handler` methods.', $this->name),

src/Files/src/Files.php

Spacing +41 added lines, -41 removed lines

@@ -39,30 +39,30 @@ 
         ?int $mode = null,
         bool $recursivePermissions = true,
     ): bool {
-        if (empty($mode)) {
+        if (empty($mode)){
             $mode = self::DEFAULT_FILE_MODE;
         }
 
         //Directories always executable
         $mode |= 0o111;
-        if (\is_dir($directory)) {
+        if (\is_dir($directory)){
             //Exists :(
             return $this->setPermissions($directory, $mode);
         }
 
-        if (!$recursivePermissions) {
+        if (!$recursivePermissions){
             return \mkdir($directory, $mode, true);
         }
 
         $directoryChain = [\basename($directory)];
 
         $baseDirectory = $directory;
-        while (!\is_dir($baseDirectory = \dirname($baseDirectory))) {
+        while (!\is_dir($baseDirectory = \dirname($baseDirectory))){
             $directoryChain[] = \basename($baseDirectory);
         }
 
-        foreach (\array_reverse($directoryChain) as $dir) {
-            if (!\mkdir($baseDirectory = \sprintf('%s/%s', $baseDirectory, $dir))) {
+        foreach (\array_reverse($directoryChain) as $dir){
+            if (!\mkdir($baseDirectory = \sprintf('%s/%s', $baseDirectory, $dir))){
                 return false;
             }
 
@@ -74,7 +74,7 @@ 
 
     public function read(string $filename): string
     {
-        if (!$this->exists($filename)) {
+        if (!$this->exists($filename)){
             throw new FileNotFoundException($filename);
         }
 
@@ -96,12 +96,12 @@ 
     ): bool {
         $mode ??= self::DEFAULT_FILE_MODE;
 
-        try {
-            if ($ensureDirectory) {
+        try{
+            if ($ensureDirectory){
                 $this->ensureDirectory(\dirname($filename), $mode);
             }
 
-            if ($this->exists($filename)) {
+            if ($this->exists($filename)){
                 //Forcing mode for existed file
                 $this->setPermissions($filename, $mode);
             }
@@ -112,12 +112,12 @@ 
                 $append ? FILE_APPEND | LOCK_EX : LOCK_EX,
             );
 
-            if ($result !== false) {
+            if ($result !== false){
                 //Forcing mode after file creation
                 $this->setPermissions($filename, $mode);
             }
-        } catch (\Exception $e) {
-            throw new WriteErrorException($e->getMessage(), (int) $e->getCode(), $e);
+        }catch (\Exception $e){
+            throw new WriteErrorException($e->getMessage(), (int)$e->getCode(), $e);
         }
 
         return $result !== false;
@@ -134,7 +134,7 @@ 
 
     public function delete(string $filename): bool
     {
-        if ($this->exists($filename)) {
+        if ($this->exists($filename)){
             $result = \unlink($filename);
 
             //Wiping out changes in local file cache
@@ -153,7 +153,7 @@ 
      */
     public function deleteDirectory(string $directory, bool $contentOnly = false): bool
     {
-        if (!$this->isDirectory($directory)) {
+        if (!$this->isDirectory($directory)){
             throw new FilesException(\sprintf('Undefined or invalid directory %s', $directory));
         }
 
@@ -162,15 +162,15 @@ 
             \RecursiveIteratorIterator::CHILD_FIRST,
         );
 
-        foreach ($files as $file) {
-            if ($file->isDir()) {
+        foreach ($files as $file){
+            if ($file->isDir()){
                 \rmdir($file->getRealPath());
-            } else {
+            }else{
                 $this->delete($file->getRealPath());
             }
         }
 
-        if (!$contentOnly) {
+        if (!$contentOnly){
             return \rmdir($directory);
         }
 
@@ -179,7 +179,7 @@ 
 
     public function move(string $filename, string $destination): bool
     {
-        if (!$this->exists($filename)) {
+        if (!$this->exists($filename)){
             throw new FileNotFoundException($filename);
         }
 
@@ -188,7 +188,7 @@ 
 
     public function copy(string $filename, string $destination): bool
     {
-        if (!$this->exists($filename)) {
+        if (!$this->exists($filename)){
             throw new FileNotFoundException($filename);
         }
 
@@ -197,7 +197,7 @@ 
 
     public function touch(string $filename, ?int $mode = null): bool
     {
-        if (!\touch($filename)) {
+        if (!\touch($filename)){
             return false;
         }
 
@@ -213,7 +213,7 @@ 
     {
         $this->exists($filename) or throw new FileNotFoundException($filename);
 
-        return (int) \filesize($filename);
+        return (int)\filesize($filename);
     }
 
     public function extension(string $filename): string
@@ -223,7 +223,7 @@ 
 
     public function md5(string $filename): string
     {
-        if (!$this->exists($filename)) {
+        if (!$this->exists($filename)){
             throw new FileNotFoundException($filename);
         }
 
@@ -237,7 +237,7 @@ 
 
     public function time(string $filename): int
     {
-        if (!$this->exists($filename)) {
+        if (!$this->exists($filename)){
             throw new FileNotFoundException($filename);
         }
 
@@ -268,7 +268,7 @@ 
 
     public function setPermissions(string $filename, int $mode): bool
     {
-        if (\is_dir($filename)) {
+        if (\is_dir($filename)){
             //Directories must always be executable (i.e. 664 for dir => 775)
             $mode |= 0111;
         }
@@ -279,14 +279,14 @@ 
     public function getFiles(string $location, ?string $pattern = null): array
     {
         $result = [];
-        foreach ($this->filesIterator($location, $pattern) as $filename) {
-            if ($this->isDirectory($filename->getPathname())) {
-                $result = \array_merge($result, $this->getFiles(((string) $filename) . DIRECTORY_SEPARATOR));
+        foreach ($this->filesIterator($location, $pattern) as $filename){
+            if ($this->isDirectory($filename->getPathname())){
+                $result = \array_merge($result, $this->getFiles(((string)$filename).DIRECTORY_SEPARATOR));
 
                 continue;
             }
 
-            $result[] = $this->normalizePath((string) $filename);
+            $result[] = $this->normalizePath((string)$filename);
         }
 
         return $result;
@@ -294,14 +294,14 @@ 
 
     public function tempFilename(string $extension = '', ?string $location = null): string
     {
-        if (empty($location)) {
+        if (empty($location)){
             $location = \sys_get_temp_dir();
         }
 
         $filename = \tempnam($location, 'spiral');
         $filename === false and throw new FilesException('Unable to create temporary file.');
 
-        if (!empty($extension)) {
+        if (!empty($extension)){
             $old = $filename;
             $filename = \sprintf('%s.%s', $filename, $extension);
             \rename($old, $filename);
@@ -314,7 +314,7 @@ 
     public function normalizePath(string $path, bool $asDirectory = false): string
     {
         $isUnc = \str_starts_with($path, '\\\\') || \str_starts_with($path, '//');
-        if ($isUnc) {
+        if ($isUnc){
             $leadingSlashes = \substr($path, 0, 2);
             $path = \substr($path, 2);
         }
@@ -322,7 +322,7 @@ 
         $path = \str_replace(['//', '\\'], '/', $path);
 
         //Potentially open links and ../ type directories?
-        return ($isUnc ? $leadingSlashes : '') . \rtrim($path, '/') . ($asDirectory ? '/' : '');
+        return ($isUnc ? $leadingSlashes : '').\rtrim($path, '/').($asDirectory ? '/' : '');
     }
 
     /**
@@ -337,21 +337,21 @@ 
         $path = \explode('/', $path);
         $relative = $path;
 
-        foreach ($from as $depth => $dir) {
+        foreach ($from as $depth => $dir){
             //Find first non-matching dir
-            if ($dir === $path[$depth]) {
+            if ($dir === $path[$depth]){
                 //Ignore this directory
                 \array_shift($relative);
-            } else {
+            }else{
                 //Get number of remaining dirs to $from
                 $remaining = \count($from) - $depth;
-                if ($remaining > 1) {
+                if ($remaining > 1){
                     //Add traversals up to first matching directory
                     $padLength = (\count($relative) + $remaining - 1) * -1;
                     $relative = \array_pad($relative, $padLength, '..');
                     break;
                 }
-                $relative[0] = './' . $relative[0];
+                $relative[0] = './'.$relative[0];
             }
         }
 
@@ -363,7 +363,7 @@ 
      */
     public function __destruct()
     {
-        foreach ($this->destructFiles as $filename) {
+        foreach ($this->destructFiles as $filename){
             $this->delete($filename);
         }
     }
@@ -371,7 +371,7 @@ 
     private function filesIterator(string $location, ?string $pattern = null): \GlobIterator
     {
         $pattern ??= '*';
-        $regexp = \rtrim($location, DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR . \ltrim($pattern, DIRECTORY_SEPARATOR);
+        $regexp = \rtrim($location, DIRECTORY_SEPARATOR).DIRECTORY_SEPARATOR.\ltrim($pattern, DIRECTORY_SEPARATOR);
 
         return new \GlobIterator($regexp);
     }

Braces +71 added lines, -34 removed lines

@@ -39,30 +39,36 @@ 
         ?int $mode = null,
         bool $recursivePermissions = true,
     ): bool {
-        if (empty($mode)) {
+        if (empty($mode))
+        {
             $mode = self::DEFAULT_FILE_MODE;
         }
 
         //Directories always executable
         $mode |= 0o111;
-        if (\is_dir($directory)) {
+        if (\is_dir($directory))
+        {
             //Exists :(
             return $this->setPermissions($directory, $mode);
         }
 
-        if (!$recursivePermissions) {
+        if (!$recursivePermissions)
+        {
             return \mkdir($directory, $mode, true);
         }
 
         $directoryChain = [\basename($directory)];
 
         $baseDirectory = $directory;
-        while (!\is_dir($baseDirectory = \dirname($baseDirectory))) {
+        while (!\is_dir($baseDirectory = \dirname($baseDirectory)))
+        {
             $directoryChain[] = \basename($baseDirectory);
         }
 
-        foreach (\array_reverse($directoryChain) as $dir) {
-            if (!\mkdir($baseDirectory = \sprintf('%s/%s', $baseDirectory, $dir))) {
+        foreach (\array_reverse($directoryChain) as $dir)
+        {
+            if (!\mkdir($baseDirectory = \sprintf('%s/%s', $baseDirectory, $dir)))
+            {
                 return false;
             }
 
@@ -74,7 +80,8 @@ 
 
     public function read(string $filename): string
     {
-        if (!$this->exists($filename)) {
+        if (!$this->exists($filename))
+        {
             throw new FileNotFoundException($filename);
         }
 
@@ -96,12 +103,15 @@ 
     ): bool {
         $mode ??= self::DEFAULT_FILE_MODE;
 
-        try {
-            if ($ensureDirectory) {
+        try
+        {
+            if ($ensureDirectory)
+            {
                 $this->ensureDirectory(\dirname($filename), $mode);
             }
 
-            if ($this->exists($filename)) {
+            if ($this->exists($filename))
+            {
                 //Forcing mode for existed file
                 $this->setPermissions($filename, $mode);
             }
@@ -112,11 +122,14 @@ 
                 $append ? FILE_APPEND | LOCK_EX : LOCK_EX,
             );
 
-            if ($result !== false) {
+            if ($result !== false)
+            {
                 //Forcing mode after file creation
                 $this->setPermissions($filename, $mode);
             }
-        } catch (\Exception $e) {
+        }
+        catch (\Exception $e)
+        {
             throw new WriteErrorException($e->getMessage(), (int) $e->getCode(), $e);
         }
 
@@ -134,7 +147,8 @@ 
 
     public function delete(string $filename): bool
     {
-        if ($this->exists($filename)) {
+        if ($this->exists($filename))
+        {
             $result = \unlink($filename);
 
             //Wiping out changes in local file cache
@@ -153,7 +167,8 @@ 
      */
     public function deleteDirectory(string $directory, bool $contentOnly = false): bool
     {
-        if (!$this->isDirectory($directory)) {
+        if (!$this->isDirectory($directory))
+        {
             throw new FilesException(\sprintf('Undefined or invalid directory %s', $directory));
         }
 
@@ -162,15 +177,20 @@ 
             \RecursiveIteratorIterator::CHILD_FIRST,
         );
 
-        foreach ($files as $file) {
-            if ($file->isDir()) {
+        foreach ($files as $file)
+        {
+            if ($file->isDir())
+            {
                 \rmdir($file->getRealPath());
-            } else {
+            }
+            else
+            {
                 $this->delete($file->getRealPath());
             }
         }
 
-        if (!$contentOnly) {
+        if (!$contentOnly)
+        {
             return \rmdir($directory);
         }
 
@@ -179,7 +199,8 @@ 
 
     public function move(string $filename, string $destination): bool
     {
-        if (!$this->exists($filename)) {
+        if (!$this->exists($filename))
+        {
             throw new FileNotFoundException($filename);
         }
 
@@ -188,7 +209,8 @@ 
 
     public function copy(string $filename, string $destination): bool
     {
-        if (!$this->exists($filename)) {
+        if (!$this->exists($filename))
+        {
             throw new FileNotFoundException($filename);
         }
 
@@ -197,7 +219,8 @@ 
 
     public function touch(string $filename, ?int $mode = null): bool
     {
-        if (!\touch($filename)) {
+        if (!\touch($filename))
+        {
             return false;
         }
 
@@ -223,7 +246,8 @@ 
 
     public function md5(string $filename): string
     {
-        if (!$this->exists($filename)) {
+        if (!$this->exists($filename))
+        {
             throw new FileNotFoundException($filename);
         }
 
@@ -237,7 +261,8 @@ 
 
     public function time(string $filename): int
     {
-        if (!$this->exists($filename)) {
+        if (!$this->exists($filename))
+        {
             throw new FileNotFoundException($filename);
         }
 
@@ -268,7 +293,8 @@ 
 
     public function setPermissions(string $filename, int $mode): bool
     {
-        if (\is_dir($filename)) {
+        if (\is_dir($filename))
+        {
             //Directories must always be executable (i.e. 664 for dir => 775)
             $mode |= 0111;
         }
@@ -279,8 +305,10 @@ 
     public function getFiles(string $location, ?string $pattern = null): array
     {
         $result = [];
-        foreach ($this->filesIterator($location, $pattern) as $filename) {
-            if ($this->isDirectory($filename->getPathname())) {
+        foreach ($this->filesIterator($location, $pattern) as $filename)
+        {
+            if ($this->isDirectory($filename->getPathname()))
+            {
                 $result = \array_merge($result, $this->getFiles(((string) $filename) . DIRECTORY_SEPARATOR));
 
                 continue;
@@ -294,14 +322,16 @@ 
 
     public function tempFilename(string $extension = '', ?string $location = null): string
     {
-        if (empty($location)) {
+        if (empty($location))
+        {
             $location = \sys_get_temp_dir();
         }
 
         $filename = \tempnam($location, 'spiral');
         $filename === false and throw new FilesException('Unable to create temporary file.');
 
-        if (!empty($extension)) {
+        if (!empty($extension))
+        {
             $old = $filename;
             $filename = \sprintf('%s.%s', $filename, $extension);
             \rename($old, $filename);
@@ -314,7 +344,8 @@ 
     public function normalizePath(string $path, bool $asDirectory = false): string
     {
         $isUnc = \str_starts_with($path, '\\\\') || \str_starts_with($path, '//');
-        if ($isUnc) {
+        if ($isUnc)
+        {
             $leadingSlashes = \substr($path, 0, 2);
             $path = \substr($path, 2);
         }
@@ -337,15 +368,20 @@ 
         $path = \explode('/', $path);
         $relative = $path;
 
-        foreach ($from as $depth => $dir) {
+        foreach ($from as $depth => $dir)
+        {
             //Find first non-matching dir
-            if ($dir === $path[$depth]) {
+            if ($dir === $path[$depth])
+            {
                 //Ignore this directory
                 \array_shift($relative);
-            } else {
+            }
+            else
+            {
                 //Get number of remaining dirs to $from
                 $remaining = \count($from) - $depth;
-                if ($remaining > 1) {
+                if ($remaining > 1)
+                {
                     //Add traversals up to first matching directory
                     $padLength = (\count($relative) + $remaining - 1) * -1;
                     $relative = \array_pad($relative, $padLength, '..');
@@ -363,7 +399,8 @@ 
      */
     public function __destruct()
     {
-        foreach ($this->destructFiles as $filename) {
+        foreach ($this->destructFiles as $filename)
+        {
             $this->delete($filename);
         }
     }

src/Core/src/Exception/ScopeException.php

Spacing +1 added lines, -1 removed lines

@@ -12,4 +12,4 @@
  *
  * Sugar conditions are avoidable.
  */
-class ScopeException extends LogicException implements NotFoundExceptionInterface {}
+class ScopeException extends LogicException implements NotFoundExceptionInterface{}

Braces +3 added lines, -1 removed lines

@@ -12,4 +12,6 @@
  *
  * Sugar conditions are avoidable.
  */
-class ScopeException extends LogicException implements NotFoundExceptionInterface {}
+class ScopeException extends LogicException implements NotFoundExceptionInterface
+{
+}

src/Core/src/Internal/Actor.php

Spacing +77 added lines, -77 removed lines

@@ -87,7 +87,7 @@ 
      */
     public function resolveType(
         string $alias,
-        ?Binding &$binding = null,
+        ?Binding & $binding = null,
         ?object &$singleton = null,
         ?object &$injector = null,
         ?self &$actor = null,
@@ -96,20 +96,20 @@ 
         // Aliases to prevent circular dependencies
         $as = [];
         $actor = $this;
-        do {
+        do{
             $bindings = &$actor->state->bindings;
             $singletons = &$actor->state->singletons;
             $injectors = &$actor->state->injectors;
             $binding = $bindings[$alias] ?? null;
-            if (\array_key_exists($alias, $singletons)) {
+            if (\array_key_exists($alias, $singletons)){
                 $singleton = $singletons[$alias];
                 $injector = $injectors[$alias] ?? null;
                 return \is_object($singleton::class) ? $singleton::class : null;
             }
 
-            if ($binding !== null) {
-                if ($followAlias && $binding::class === Alias::class) {
-                    if ($binding->alias === $alias) {
+            if ($binding !== null){
+                if ($followAlias && $binding::class === Alias::class){
+                    if ($binding->alias === $alias){
                         break;
                     }
 
@@ -124,7 +124,7 @@ 
                 return $binding->getReturnClass();
             }
 
-            if (\array_key_exists($alias, $injectors)) {
+            if (\array_key_exists($alias, $injectors)){
                 $injector = $injectors[$alias];
                 $binding = $bindings[$alias] ?? null;
                 return $alias;
@@ -132,12 +132,12 @@ 
 
             // Go to parent scope
             $parent = $actor->scope->getParentActor();
-            if ($parent === null) {
+            if ($parent === null){
                 break;
             }
 
             $actor = $parent;
-        } while (true);
+        }while (true);
 
         return \class_exists($alias) ? $alias : null;
     }
@@ -145,7 +145,7 @@ 
     public function resolveBinding(
         object $binding,
         string $alias,
-        \Stringable|string|null $context,
+        \Stringable | string | null $context,
         array $arguments,
         Tracer $tracer,
     ): mixed {
@@ -202,18 +202,18 @@ 
     private function resolveInjector(Config\Injectable $binding, Ctx $ctx, array $arguments, Tracer $tracer)
     {
         $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'.",
@@ -227,7 +227,7 @@ 
             static $cache = [];
             $extended = $cache[$injectorInstance::class] ??= (
             static fn(\ReflectionType $type): bool =>
-                $type::class === \ReflectionUnionType::class || (string) $type === 'mixed'
+                $type::class === \ReflectionUnionType::class || (string)$type === 'mixed'
             )(
                 ($refMethod = new \ReflectionMethod($injectorInstance, 'createInjection'))
                     ->getParameters()[1]->getType()
@@ -237,10 +237,10 @@ 
             $instance = $injectorInstance->createInjection($reflection, match (true) {
                 $asIs => $context,
                 $context instanceof \ReflectionParameter => $context->getName(),
-                default => (string) $context,
+                default => (string)$context,
             });
 
-            if (!$reflection->isInstance($instance)) {
+            if (!$reflection->isInstance($instance)){
                 throw new InjectionException(
                     \sprintf(
                         "Invalid injection response for '%s'.",
@@ -250,12 +250,12 @@ 
             }
 
             return $instance;
-        } catch (TracedContainerException $e) {
+        }catch (TracedContainerException $e){
             throw isset($injectorInstance) ? $e : $e::extendTracedException(\sprintf(
                 'Can\'t resolve `%s`.',
                 $tracer->getRootAlias(),
             ), $tracer->getTraces(), $e);
-        } finally {
+        }finally{
             $this->state->bindings[$ctx->class] ??= $binding;
         }
     }
@@ -263,22 +263,22 @@ 
     private function resolveAlias(
         Config\Alias $binding,
         string $alias,
-        \Stringable|string|null $context,
+        \Stringable | string | null $context,
         array $arguments,
         Tracer $tracer,
     ): mixed {
-        if ($binding->alias === $alias) {
+        if ($binding->alias === $alias){
             $instance = $this->autowire(
                 new Ctx(alias: $alias, class: $binding->alias, context: $context, singleton: $binding->singleton && $arguments === []),
                 $arguments,
                 $this,
                 $tracer,
             );
-        } else {
-            try {
+        }else{
+            try{
                 //Binding is pointing to something else
                 $instance = $this->factory->make($binding->alias, $arguments, $context);
-            } catch (TracedContainerException $e) {
+            }catch (TracedContainerException $e){
                 throw $e::extendTracedException(
                     $alias === $tracer->getRootAlias()
                         ? "Can't resolve `{$alias}`."
@@ -295,9 +295,9 @@ 
         return $instance;
     }
 
-    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
     {
-        if ($context instanceof RetryContext) {
+        if ($context instanceof RetryContext){
             return $binding->fallbackFactory === null
                 ? throw new RecursiveProxyException(
                     $alias,
@@ -308,7 +308,7 @@ 
 
         $result = Proxy::create(new \ReflectionClass($binding->getReturnClass()), $context, new Attribute\Proxy());
 
-        if ($binding->singleton) {
+        if ($binding->singleton){
             $this->state->singletons[$alias] = $result;
         }
 
@@ -318,11 +318,11 @@ 
     private function resolveShared(
         Config\Shared $binding,
         string $alias,
-        \Stringable|string|null $context,
+        \Stringable | string | null $context,
         array $arguments,
         Tracer $tracer,
     ): object {
-        if ($arguments !== []) {
+        if ($arguments !== []){
             // Avoid singleton cache
             return $this->createInstance(
                 new Ctx(alias: $alias, class: $binding->value::class, context: $context, singleton: false),
@@ -332,7 +332,7 @@ 
             );
         }
 
-        if ($binding->singleton) {
+        if ($binding->singleton){
             $this->state->singletons[$alias] = $binding->value;
         }
 
@@ -342,16 +342,16 @@ 
     private function resolveAutowire(
         Config\Autowire $binding,
         string $alias,
-        \Stringable|string|null $context,
+        \Stringable | string | null $context,
         array $arguments,
         Tracer $tracer,
     ): mixed {
         $target = $binding->autowire->alias;
         $ctx = new Ctx(alias: $alias, class: $target, context: $context, singleton: $binding->singleton && $arguments === [] ?: null);
 
-        if ($alias === $target) {
+        if ($alias === $target){
             $instance = $this->autowire($ctx, \array_merge($binding->autowire->parameters, $arguments), $this, $tracer);
-        } else {
+        }else{
             $instance = $binding->autowire->resolve($this->factory, $arguments);
             $this->validateConstraint($instance, $ctx);
         }
@@ -360,32 +360,32 @@ 
     }
 
     private function resolveFactory(
-        Config\Factory|Config\DeferredFactory $binding,
+        Config\Factory | Config\DeferredFactory $binding,
         string $alias,
-        \Stringable|string|null $context,
+        \Stringable | string | null $context,
         array $arguments,
         Tracer $tracer,
     ): mixed {
         $ctx = new Ctx(alias: $alias, class: $alias, context: $context, singleton: $binding->singleton && $arguments === [] ?: null);
-        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 TracedContainerException::createWithTrace(
                 \sprintf('Invalid callable binding for `%s`.', $ctx->alias),
                 $tracer->getTraces(),
                 $e,
             );
-        } catch (TracedContainerException $e) {
+        }catch (TracedContainerException $e){
             throw $e::extendTracedException(
                 \sprintf("Can't resolve `%s`: factory invocation failed.", $tracer->getRootAlias()),
                 $tracer->getTraces(),
                 $e,
             );
-        } catch (ContainerExceptionInterface $e) {
+        }catch (ContainerExceptionInterface $e){
             throw $e;
-        } catch (\Throwable $e) {
+        }catch (\Throwable $e){
             throw NotFoundException::createWithTrace(
                 \sprintf("Can't resolve `%s` due to factory invocation error: %s", $tracer->getRootAlias(), $e->getMessage()),
                 $tracer->getTraces(),
@@ -393,7 +393,7 @@ 
             );
         }
 
-        if (\is_object($instance)) {
+        if (\is_object($instance)){
             $this->validateConstraint($instance, $ctx);
             return $this->registerInstance($ctx, $instance);
         }
@@ -404,14 +404,14 @@ 
     private function resolveWeakReference(
         Config\WeakReference $binding,
         string $alias,
-        \Stringable|string|null $context,
+        \Stringable | string | null $context,
         array $arguments,
         Tracer $tracer,
     ): ?object {
         $avoidCache = $arguments !== [];
 
-        if (($avoidCache || $binding->reference->get() === null) && \class_exists($alias)) {
-            try {
+        if (($avoidCache || $binding->reference->get() === null) && \class_exists($alias)){
+            try{
                 $tracer->push(false, alias: $alias, source: \WeakReference::class, context: $context);
 
                 $object = $this->createInstance(
@@ -420,17 +420,17 @@ 
                     $this,
                     $tracer,
                 );
-                if ($avoidCache) {
+                if ($avoidCache){
                     return $object;
                 }
                 $binding->reference = \WeakReference::create($object);
-            } catch (\Throwable) {
+            }catch (\Throwable){
                 throw TracedContainerException::createWithTrace(\sprintf(
                     'Can\'t resolve `%s`: can\'t instantiate `%s` from WeakReference binding.',
                     $tracer->getRootAlias(),
                     $alias,
                 ), $tracer->getTraces());
-            } finally {
+            }finally{
                 $tracer->pop();
             }
         }
@@ -446,13 +446,13 @@ 
         object $instance,
         Ctx $ctx,
     ): void {
-        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);
                 }
             }
@@ -479,26 +479,26 @@ 
         Tracer $tracer,
     ): 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 attribute
         $actor = $fallbackActor ?? $this;
-        if ($this->options->checkScope) { # todo
+        if ($this->options->checkScope){ # todo
             $ar = ($reflection->getAttributes(Attribute\Scope::class)[0] ?? null);
-            if ($ar !== null) {
+            if ($ar !== null){
                 /** @var Attribute\Scope $attr */
                 $attr = $ar->newInstance();
                 $scope = $this->scope;
                 $actor = $this;
                 // Go through all parent scopes
                 $needed = $actor;
-                while ($attr->name !== $scope->getScopeName()) {
+                while ($attr->name !== $scope->getScopeName()){
                     $needed = $scope->getParentActor();
-                    if ($needed === null) {
+                    if ($needed === null){
                         throw new BadScopeException($attr->name, $class);
                     }
 
@@ -511,11 +511,11 @@ 
         } # todo
 
         // We have to construct class using external injector when we know the exact context
-        if ($arguments === [] && $actor->binder->hasInjector($class)) {
+        if ($arguments === [] && $actor->binder->hasInjector($class)){
             return $actor->resolveInjector($actor->state->bindings[$ctx->class], $ctx, $arguments, $tracer);
         }
 
-        if (!$reflection->isInstantiable()) {
+        if (!$reflection->isInstantiable()){
             $itIs = match (true) {
                 $reflection->isEnum() => 'Enum',
                 $reflection->isAbstract() => 'Abstract class',
@@ -529,8 +529,8 @@ 
 
         $constructor = $reflection->getConstructor();
 
-        if ($constructor !== null) {
-            try {
+        if ($constructor !== null){
+            try{
                 $newScope = $this !== $actor;
                 $debug = [
                     'action' => 'resolve arguments',
@@ -544,39 +544,39 @@ 
                 $tracer->push($newScope, ...$debug);
                 $tracer->push(true);
                 $args = $actor->resolver->resolveArguments($constructor, $arguments, $actor->options->validateArguments);
-            } catch (ValidationException $e) {
+            }catch (ValidationException $e){
                 throw TracedContainerException::createWithTrace(\sprintf(
                     'Can\'t resolve `%s`. %s',
                     $tracer->getRootAlias(),
                     $e->getMessage(),
                 ), $tracer->getTraces());
-            } catch (TracedContainerException $e) {
+            }catch (TracedContainerException $e){
                 throw $e::extendTracedException(\sprintf(
                     'Can\'t resolve `%s`.',
                     $tracer->getRootAlias(),
                 ), $tracer->getTraces(), $e);
-            } finally {
+            }finally{
                 $tracer->pop($newScope);
                 $tracer->pop(false);
             }
-            try {
+            try{
                 // Using constructor with resolved arguments
                 $tracer->push(false, call: "$class::__construct", arguments: $args);
                 $tracer->push(true);
                 $instance = new $class(...$args);
-            } catch (\TypeError $e) {
+            }catch (\TypeError $e){
                 throw new WrongTypeException($constructor, $e);
-            } catch (TracedContainerException $e) {
+            }catch (TracedContainerException $e){
                 throw $e::extendTracedException(\sprintf(
                     'Can\'t resolve `%s`: failed constructing `%s`.',
                     $tracer->getRootAlias(),
                     $class,
                 ), $tracer->getTraces(), $e);
-            } finally {
+            }finally{
                 $tracer->pop(true);
                 $tracer->pop(false);
             }
-        } else {
+        }else{
             // No constructor specified
             $instance = $reflection->newInstance();
         }
@@ -608,12 +608,12 @@ 
      */
     private function isSingleton(Ctx $ctx): bool
     {
-        if (is_bool($ctx->singleton)) {
+        if (is_bool($ctx->singleton)){
             return $ctx->singleton;
         }
 
         /** @psalm-suppress RedundantCondition https://github.com/vimeo/psalm/issues/9489 */
-        if ($ctx->reflection->implementsInterface(SingletonInterface::class)) {
+        if ($ctx->reflection->implementsInterface(SingletonInterface::class)){
             return true;
         }
 
@@ -627,7 +627,7 @@ 
          * @var Attribute\Finalize|null $attribute
          */
         $attribute = ($ctx->reflection->getAttributes(Attribute\Finalize::class)[0] ?? null)?->newInstance();
-        if ($attribute === null) {
+        if ($attribute === null){
             return null;
         }
 
@@ -641,10 +641,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);
@@ -660,9 +660,9 @@ 
 
     private function validateArguments(ContextFunction $reflection, array $arguments = []): bool
     {
-        try {
+        try{
             $this->resolver->validateArguments($reflection, $arguments);
-        } catch (\Throwable) {
+        }catch (\Throwable){
             return false;
         }
 

Braces +152 added lines, -65 removed lines

@@ -96,20 +96,25 @@ 
         // Aliases to prevent circular dependencies
         $as = [];
         $actor = $this;
-        do {
+        do
+        {
             $bindings = &$actor->state->bindings;
             $singletons = &$actor->state->singletons;
             $injectors = &$actor->state->injectors;
             $binding = $bindings[$alias] ?? null;
-            if (\array_key_exists($alias, $singletons)) {
+            if (\array_key_exists($alias, $singletons))
+            {
                 $singleton = $singletons[$alias];
                 $injector = $injectors[$alias] ?? null;
                 return \is_object($singleton::class) ? $singleton::class : null;
             }
 
-            if ($binding !== null) {
-                if ($followAlias && $binding::class === Alias::class) {
-                    if ($binding->alias === $alias) {
+            if ($binding !== null)
+            {
+                if ($followAlias && $binding::class === Alias::class)
+                {
+                    if ($binding->alias === $alias)
+                    {
                         break;
                     }
 
@@ -124,7 +129,8 @@ 
                 return $binding->getReturnClass();
             }
 
-            if (\array_key_exists($alias, $injectors)) {
+            if (\array_key_exists($alias, $injectors))
+            {
                 $injector = $injectors[$alias];
                 $binding = $bindings[$alias] ?? null;
                 return $alias;
@@ -132,7 +138,8 @@ 
 
             // Go to parent scope
             $parent = $actor->scope->getParentActor();
-            if ($parent === null) {
+            if ($parent === null)
+            {
                 break;
             }
 
@@ -202,18 +209,23 @@ 
     private function resolveInjector(Config\Injectable $binding, Ctx $ctx, array $arguments, Tracer $tracer)
     {
         $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'.",
@@ -240,7 +252,8 @@ 
                 default => (string) $context,
             });
 
-            if (!$reflection->isInstance($instance)) {
+            if (!$reflection->isInstance($instance))
+            {
                 throw new InjectionException(
                     \sprintf(
                         "Invalid injection response for '%s'.",
@@ -250,12 +263,16 @@ 
             }
 
             return $instance;
-        } catch (TracedContainerException $e) {
+        }
+        catch (TracedContainerException $e)
+        {
             throw isset($injectorInstance) ? $e : $e::extendTracedException(\sprintf(
                 'Can\'t resolve `%s`.',
                 $tracer->getRootAlias(),
             ), $tracer->getTraces(), $e);
-        } finally {
+        }
+        finally
+        {
             $this->state->bindings[$ctx->class] ??= $binding;
         }
     }
@@ -267,18 +284,24 @@ 
         array $arguments,
         Tracer $tracer,
     ): mixed {
-        if ($binding->alias === $alias) {
+        if ($binding->alias === $alias)
+        {
             $instance = $this->autowire(
                 new Ctx(alias: $alias, class: $binding->alias, context: $context, singleton: $binding->singleton && $arguments === []),
                 $arguments,
                 $this,
                 $tracer,
             );
-        } else {
-            try {
+        }
+        else
+        {
+            try
+            {
                 //Binding is pointing to something else
                 $instance = $this->factory->make($binding->alias, $arguments, $context);
-            } catch (TracedContainerException $e) {
+            }
+            catch (TracedContainerException $e)
+            {
                 throw $e::extendTracedException(
                     $alias === $tracer->getRootAlias()
                         ? "Can't resolve `{$alias}`."
@@ -297,7 +320,8 @@ 
 
     private function resolveProxy(Config\Proxy $binding, string $alias, \Stringable|string|null $context): mixed
     {
-        if ($context instanceof RetryContext) {
+        if ($context instanceof RetryContext)
+        {
             return $binding->fallbackFactory === null
                 ? throw new RecursiveProxyException(
                     $alias,
@@ -308,7 +332,8 @@ 
 
         $result = Proxy::create(new \ReflectionClass($binding->getReturnClass()), $context, new Attribute\Proxy());
 
-        if ($binding->singleton) {
+        if ($binding->singleton)
+        {
             $this->state->singletons[$alias] = $result;
         }
 
@@ -322,7 +347,8 @@ 
         array $arguments,
         Tracer $tracer,
     ): object {
-        if ($arguments !== []) {
+        if ($arguments !== [])
+        {
             // Avoid singleton cache
             return $this->createInstance(
                 new Ctx(alias: $alias, class: $binding->value::class, context: $context, singleton: false),
@@ -332,7 +358,8 @@ 
             );
         }
 
-        if ($binding->singleton) {
+        if ($binding->singleton)
+        {
             $this->state->singletons[$alias] = $binding->value;
         }
 
@@ -349,9 +376,12 @@ 
         $target = $binding->autowire->alias;
         $ctx = new Ctx(alias: $alias, class: $target, context: $context, singleton: $binding->singleton && $arguments === [] ?: null);
 
-        if ($alias === $target) {
+        if ($alias === $target)
+        {
             $instance = $this->autowire($ctx, \array_merge($binding->autowire->parameters, $arguments), $this, $tracer);
-        } else {
+        }
+        else
+        {
             $instance = $binding->autowire->resolve($this->factory, $arguments);
             $this->validateConstraint($instance, $ctx);
         }
@@ -367,25 +397,34 @@ 
         Tracer $tracer,
     ): mixed {
         $ctx = new Ctx(alias: $alias, class: $alias, context: $context, singleton: $binding->singleton && $arguments === [] ?: null);
-        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 TracedContainerException::createWithTrace(
                 \sprintf('Invalid callable binding for `%s`.', $ctx->alias),
                 $tracer->getTraces(),
                 $e,
             );
-        } catch (TracedContainerException $e) {
+        }
+        catch (TracedContainerException $e)
+        {
             throw $e::extendTracedException(
                 \sprintf("Can't resolve `%s`: factory invocation failed.", $tracer->getRootAlias()),
                 $tracer->getTraces(),
                 $e,
             );
-        } catch (ContainerExceptionInterface $e) {
+        }
+        catch (ContainerExceptionInterface $e)
+        {
             throw $e;
-        } catch (\Throwable $e) {
+        }
+        catch (\Throwable $e)
+        {
             throw NotFoundException::createWithTrace(
                 \sprintf("Can't resolve `%s` due to factory invocation error: %s", $tracer->getRootAlias(), $e->getMessage()),
                 $tracer->getTraces(),
@@ -393,7 +432,8 @@ 
             );
         }
 
-        if (\is_object($instance)) {
+        if (\is_object($instance))
+        {
             $this->validateConstraint($instance, $ctx);
             return $this->registerInstance($ctx, $instance);
         }
@@ -410,8 +450,10 @@ 
     ): ?object {
         $avoidCache = $arguments !== [];
 
-        if (($avoidCache || $binding->reference->get() === null) && \class_exists($alias)) {
-            try {
+        if (($avoidCache || $binding->reference->get() === null) && \class_exists($alias))
+        {
+            try
+            {
                 $tracer->push(false, alias: $alias, source: \WeakReference::class, context: $context);
 
                 $object = $this->createInstance(
@@ -420,17 +462,22 @@ 
                     $this,
                     $tracer,
                 );
-                if ($avoidCache) {
+                if ($avoidCache)
+                {
                     return $object;
                 }
                 $binding->reference = \WeakReference::create($object);
-            } catch (\Throwable) {
+            }
+            catch (\Throwable)
+            {
                 throw TracedContainerException::createWithTrace(\sprintf(
                     'Can\'t resolve `%s`: can\'t instantiate `%s` from WeakReference binding.',
                     $tracer->getRootAlias(),
                     $alias,
                 ), $tracer->getTraces());
-            } finally {
+            }
+            finally
+            {
                 $tracer->pop();
             }
         }
@@ -446,13 +493,16 @@ 
         object $instance,
         Ctx $ctx,
     ): void {
-        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);
                 }
             }
@@ -479,26 +529,34 @@ 
         Tracer $tracer,
     ): 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 attribute
         $actor = $fallbackActor ?? $this;
-        if ($this->options->checkScope) { # todo
+        if ($this->options->checkScope)
+        {
+# todo
             $ar = ($reflection->getAttributes(Attribute\Scope::class)[0] ?? null);
-            if ($ar !== null) {
+            if ($ar !== null)
+            {
                 /** @var Attribute\Scope $attr */
                 $attr = $ar->newInstance();
                 $scope = $this->scope;
                 $actor = $this;
                 // Go through all parent scopes
                 $needed = $actor;
-                while ($attr->name !== $scope->getScopeName()) {
+                while ($attr->name !== $scope->getScopeName())
+                {
                     $needed = $scope->getParentActor();
-                    if ($needed === null) {
+                    if ($needed === null)
+                    {
                         throw new BadScopeException($attr->name, $class);
                     }
 
@@ -511,11 +569,13 @@ 
         } # todo
 
         // We have to construct class using external injector when we know the exact context
-        if ($arguments === [] && $actor->binder->hasInjector($class)) {
+        if ($arguments === [] && $actor->binder->hasInjector($class))
+        {
             return $actor->resolveInjector($actor->state->bindings[$ctx->class], $ctx, $arguments, $tracer);
         }
 
-        if (!$reflection->isInstantiable()) {
+        if (!$reflection->isInstantiable())
+        {
             $itIs = match (true) {
                 $reflection->isEnum() => 'Enum',
                 $reflection->isAbstract() => 'Abstract class',
@@ -529,8 +589,10 @@ 
 
         $constructor = $reflection->getConstructor();
 
-        if ($constructor !== null) {
-            try {
+        if ($constructor !== null)
+        {
+            try
+            {
                 $newScope = $this !== $actor;
                 $debug = [
                     'action' => 'resolve arguments',
@@ -544,39 +606,54 @@ 
                 $tracer->push($newScope, ...$debug);
                 $tracer->push(true);
                 $args = $actor->resolver->resolveArguments($constructor, $arguments, $actor->options->validateArguments);
-            } catch (ValidationException $e) {
+            }
+            catch (ValidationException $e)
+            {
                 throw TracedContainerException::createWithTrace(\sprintf(
                     'Can\'t resolve `%s`. %s',
                     $tracer->getRootAlias(),
                     $e->getMessage(),
                 ), $tracer->getTraces());
-            } catch (TracedContainerException $e) {
+            }
+            catch (TracedContainerException $e)
+            {
                 throw $e::extendTracedException(\sprintf(
                     'Can\'t resolve `%s`.',
                     $tracer->getRootAlias(),
                 ), $tracer->getTraces(), $e);
-            } finally {
+            }
+            finally
+            {
                 $tracer->pop($newScope);
                 $tracer->pop(false);
             }
-            try {
+            try
+            {
                 // Using constructor with resolved arguments
                 $tracer->push(false, call: "$class::__construct", arguments: $args);
                 $tracer->push(true);
                 $instance = new $class(...$args);
-            } catch (\TypeError $e) {
+            }
+            catch (\TypeError $e)
+            {
                 throw new WrongTypeException($constructor, $e);
-            } catch (TracedContainerException $e) {
+            }
+            catch (TracedContainerException $e)
+            {
                 throw $e::extendTracedException(\sprintf(
                     'Can\'t resolve `%s`: failed constructing `%s`.',
                     $tracer->getRootAlias(),
                     $class,
                 ), $tracer->getTraces(), $e);
-            } finally {
+            }
+            finally
+            {
                 $tracer->pop(true);
                 $tracer->pop(false);
             }
-        } else {
+        }
+        else
+        {
             // No constructor specified
             $instance = $reflection->newInstance();
         }
@@ -608,12 +685,14 @@ 
      */
     private function isSingleton(Ctx $ctx): bool
     {
-        if (is_bool($ctx->singleton)) {
+        if (is_bool($ctx->singleton))
+        {
             return $ctx->singleton;
         }
 
         /** @psalm-suppress RedundantCondition https://github.com/vimeo/psalm/issues/9489 */
-        if ($ctx->reflection->implementsInterface(SingletonInterface::class)) {
+        if ($ctx->reflection->implementsInterface(SingletonInterface::class))
+        {
             return true;
         }
 
@@ -627,7 +706,8 @@ 
          * @var Attribute\Finalize|null $attribute
          */
         $attribute = ($ctx->reflection->getAttributes(Attribute\Finalize::class)[0] ?? null)?->newInstance();
-        if ($attribute === null) {
+        if ($attribute === null)
+        {
             return null;
         }
 
@@ -641,10 +721,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);
@@ -660,9 +744,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/Internal/Invoker.php

Spacing +10 added lines, -10 removed lines

@@ -42,26 +42,26 @@ 
      */
     public function invoke(mixed $target, array $parameters = []): mixed
     {
-        if (\is_array($target) && isset($target[1])) {
+        if (\is_array($target) && isset($target[1])){
             // In a form of alias and method
             [$alias, $method] = $target;
 
             // Resolver instance or class name if the method is static (i.e. [ClassName::class, 'method'])
-            if (\is_string($alias)) {
+            if (\is_string($alias)){
                 // Detect return type
                 $type = $this->actor->resolveType($alias, $binding, $singleton, $injector);
 
-                if ($singleton === null) {
+                if ($singleton === null){
                     $type ??= $injector === null && $binding === null ? $alias : null;
                     $alias = \is_callable([$type, $method]) ? $type : $this->container->get($alias);
-                } else {
+                }else{
                     $alias = $singleton;
                 }
             }
 
-            try {
+            try{
                 $method = new \ReflectionMethod($alias, $method);
-            } catch (\ReflectionException $e) {
+            }catch (\ReflectionException $e){
                 throw new ContainerException($e->getMessage(), $e->getCode(), $e);
             }
 
@@ -72,14 +72,14 @@ 
             );
         }
 
-        if (\is_string($target) && \is_callable($target)) {
+        if (\is_string($target) && \is_callable($target)){
             $target = $target(...);
         }
 
-        if ($target instanceof \Closure) {
-            try {
+        if ($target instanceof \Closure){
+            try{
                 $reflection = new \ReflectionFunction($target);
-            } catch (\ReflectionException $e) {
+            }catch (\ReflectionException $e){
                 throw new ContainerException($e->getMessage(), $e->getCode(), $e);
             }
 

Braces +23 added lines, -10 removed lines

@@ -42,26 +42,34 @@ 
      */
     public function invoke(mixed $target, array $parameters = []): mixed
     {
-        if (\is_array($target) && isset($target[1])) {
+        if (\is_array($target) && isset($target[1]))
+        {
             // In a form of alias and method
             [$alias, $method] = $target;
 
             // Resolver instance or class name if the method is static (i.e. [ClassName::class, 'method'])
-            if (\is_string($alias)) {
+            if (\is_string($alias))
+            {
                 // Detect return type
                 $type = $this->actor->resolveType($alias, $binding, $singleton, $injector);
 
-                if ($singleton === null) {
+                if ($singleton === null)
+                {
                     $type ??= $injector === null && $binding === null ? $alias : null;
                     $alias = \is_callable([$type, $method]) ? $type : $this->container->get($alias);
-                } else {
+                }
+                else
+                {
                     $alias = $singleton;
                 }
             }
 
-            try {
+            try
+            {
                 $method = new \ReflectionMethod($alias, $method);
-            } catch (\ReflectionException $e) {
+            }
+            catch (\ReflectionException $e)
+            {
                 throw new ContainerException($e->getMessage(), $e->getCode(), $e);
             }
 
@@ -72,14 +80,19 @@ 
             );
         }
 
-        if (\is_string($target) && \is_callable($target)) {
+        if (\is_string($target) && \is_callable($target))
+        {
             $target = $target(...);
         }
 
-        if ($target instanceof \Closure) {
-            try {
+        if ($target instanceof \Closure)
+        {
+            try
+            {
                 $reflection = new \ReflectionFunction($target);
-            } catch (\ReflectionException $e) {
+            }
+            catch (\ReflectionException $e)
+            {
                 throw new ContainerException($e->getMessage(), $e->getCode(), $e);
             }