spiral / framework

src/Exceptions/src/Renderer/ConsoleRenderer.php

Spacing +27 added lines, -27 removed lines

@@ -66,7 +66,7 @@ 
         $exceptions = [$exception];
         $currentE = $exception;
 
-        while ($exception = $exception->getPrevious()) {
+        while ($exception = $exception->getPrevious()){
             $exceptions[] = $exception;
         }
 
@@ -75,7 +75,7 @@ 
         $result = [];
         $rootDir = \getcwd();
 
-        foreach ($exceptions as $exception) {
+        foreach ($exceptions as $exception){
             $prefix = $currentE === $exception ? '' : 'Previous: ';
             $row = $this->renderHeader(
                 \sprintf("%s[%s]\n%s", $prefix, $exception::class, $exception->getMessage()),
@@ -92,14 +92,14 @@ 
                 $exception->getLine(),
             );
 
-            if ($verbosity->value >= Verbosity::DEBUG->value) {
+            if ($verbosity->value >= Verbosity::DEBUG->value){
                 $row .= $this->renderTrace(
                     $exception,
                     new Highlighter(
                         $this->colorsSupport ? new ConsoleStyle() : new PlainStyle(),
                     ),
                 );
-            } elseif ($verbosity->value >= Verbosity::VERBOSE->value) {
+            } elseif ($verbosity->value >= Verbosity::VERBOSE->value){
                 $row .= $this->renderTrace($exception);
             }
 
@@ -130,7 +130,7 @@ 
 
         $length += $padding;
 
-        foreach ($lines as $line) {
+        foreach ($lines as $line){
             $result .= $this->format(
                 "<{$style}>%s%s%s</reset>\n",
                 \str_repeat('', $padding + 1),
@@ -148,39 +148,39 @@ 
     private function renderTrace(\Throwable $e, ?Highlighter $h = null): string
     {
         $stacktrace = $this->getStacktrace($e);
-        if (empty($stacktrace)) {
+        if (empty($stacktrace)){
             return '';
         }
 
         $result = "\n";
         $rootDir = \getcwd();
 
-        $pad = \strlen((string) \count($stacktrace));
+        $pad = \strlen((string)\count($stacktrace));
 
-        foreach ($stacktrace as $i => $trace) {
-            $file = isset($trace['file']) ? (string) $trace['file'] : null;
+        foreach ($stacktrace as $i => $trace){
+            $file = isset($trace['file']) ? (string)$trace['file'] : null;
             $classColor = 'while';
 
-            if ($file !== null) {
+            if ($file !== null){
                 \str_starts_with($file, $rootDir) and $file = \substr($file, \strlen($rootDir) + 1);
                 $classColor = \str_starts_with($file, 'vendor/') ? 'gray' : 'white';
             }
 
-            if (isset($trace['type'], $trace['class'])) {
+            if (isset($trace['type'], $trace['class'])){
                 $line = $this->format(
                     "<$classColor>%s.</reset> <white>%s%s%s()</reset>",
-                    \str_pad((string) ((int) $i + 1), $pad, ' ', \STR_PAD_LEFT),
+                    \str_pad((string)((int)$i + 1), $pad, ' ', \STR_PAD_LEFT),
                     $trace['class'],
                     $trace['type'],
                     $trace['function'],
                 );
-            } else {
+            }else{
                 $line = $this->format(
                     ' <white>%s()</reset>',
                     $trace['function'],
                 );
             }
-            if ($file !== null) {
+            if ($file !== null){
                 $line .= $this->format(
                     ' <yellow>at</reset> <green>%s</reset><yellow>:</reset><white>%s</reset>',
                     $file,
@@ -188,21 +188,21 @@ 
                 );
             }
 
-            if (\in_array($line, $this->lines, true)) {
+            if (\in_array($line, $this->lines, true)){
                 continue;
             }
 
             $this->lines[] = $line;
 
-            $result .= $line . "\n";
+            $result .= $line."\n";
 
-            if ($h !== null && !empty($trace['file'])) {
+            if ($h !== null && !empty($trace['file'])){
                 $str = @\file_get_contents($trace['file']);
                 $result .= $h->highlightLines(
                     $str,
                     $trace['line'],
                     static::SHOW_LINES,
-                ) . "\n";
+                )."\n";
                 unset($str);
             }
         }
@@ -215,13 +215,13 @@ 
      */
     private function format(string $format, mixed ...$args): string
     {
-        if (!$this->colorsSupport) {
+        if (!$this->colorsSupport){
             $format = \preg_replace('/<[^>]+>/', '', $format);
-        } else {
-            $format = \preg_replace_callback('/(<([^>]+)>)/', static function ($partial) {
+        }else{
+            $format = \preg_replace_callback('/(<([^>]+)>)/', static function ($partial){
                 $style = '';
-                foreach (\explode(',', \trim($partial[2], '/')) as $color) {
-                    if (isset(self::COLORS[$color])) {
+                foreach (\explode(',', \trim($partial[2], '/')) as $color){
+                    if (isset(self::COLORS[$color])){
                         $style .= self::COLORS[$color];
                     }
                 }
@@ -240,12 +240,12 @@ 
      */
     private function isColorsSupported(mixed $stream = STDOUT): bool
     {
-        if (\getenv('TERM_PROGRAM') === 'Hyper') {
+        if (\getenv('TERM_PROGRAM') === 'Hyper'){
             return true;
         }
 
-        try {
-            if (\DIRECTORY_SEPARATOR === '\\') {
+        try{
+            if (\DIRECTORY_SEPARATOR === '\\'){
                 return (\function_exists('sapi_windows_vt100_support') && @\sapi_windows_vt100_support($stream))
                     || \getenv('ANSICON') !== false
                     || \getenv('ConEmuANSI') === 'ON'
@@ -253,7 +253,7 @@ 
             }
 
             return @\stream_isatty($stream);
-        } catch (\Throwable) {
+        }catch (\Throwable){
             return false;
         }
     }

Braces +48 added lines, -22 removed lines

@@ -66,7 +66,8 @@ 
         $exceptions = [$exception];
         $currentE = $exception;
 
-        while ($exception = $exception->getPrevious()) {
+        while ($exception = $exception->getPrevious())
+        {
             $exceptions[] = $exception;
         }
 
@@ -75,7 +76,8 @@ 
         $result = [];
         $rootDir = \getcwd();
 
-        foreach ($exceptions as $exception) {
+        foreach ($exceptions as $exception)
+        {
             $prefix = $currentE === $exception ? '' : 'Previous: ';
             $row = $this->renderHeader(
                 \sprintf("%s[%s]\n%s", $prefix, $exception::class, $exception->getMessage()),
@@ -92,14 +94,17 @@ 
                 $exception->getLine(),
             );
 
-            if ($verbosity->value >= Verbosity::DEBUG->value) {
+            if ($verbosity->value >= Verbosity::DEBUG->value)
+            {
                 $row .= $this->renderTrace(
                     $exception,
                     new Highlighter(
                         $this->colorsSupport ? new ConsoleStyle() : new PlainStyle(),
                     ),
                 );
-            } elseif ($verbosity->value >= Verbosity::VERBOSE->value) {
+            }
+            elseif ($verbosity->value >= Verbosity::VERBOSE->value)
+            {
                 $row .= $this->renderTrace($exception);
             }
 
@@ -130,7 +135,8 @@ 
 
         $length += $padding;
 
-        foreach ($lines as $line) {
+        foreach ($lines as $line)
+        {
             $result .= $this->format(
                 "<{$style}>%s%s%s</reset>\n",
                 \str_repeat('', $padding + 1),
@@ -148,7 +154,8 @@ 
     private function renderTrace(\Throwable $e, ?Highlighter $h = null): string
     {
         $stacktrace = $this->getStacktrace($e);
-        if (empty($stacktrace)) {
+        if (empty($stacktrace))
+        {
             return '';
         }
 
@@ -157,16 +164,19 @@ 
 
         $pad = \strlen((string) \count($stacktrace));
 
-        foreach ($stacktrace as $i => $trace) {
+        foreach ($stacktrace as $i => $trace)
+        {
             $file = isset($trace['file']) ? (string) $trace['file'] : null;
             $classColor = 'while';
 
-            if ($file !== null) {
+            if ($file !== null)
+            {
                 \str_starts_with($file, $rootDir) and $file = \substr($file, \strlen($rootDir) + 1);
                 $classColor = \str_starts_with($file, 'vendor/') ? 'gray' : 'white';
             }
 
-            if (isset($trace['type'], $trace['class'])) {
+            if (isset($trace['type'], $trace['class']))
+            {
                 $line = $this->format(
                     "<$classColor>%s.</reset> <white>%s%s%s()</reset>",
                     \str_pad((string) ((int) $i + 1), $pad, ' ', \STR_PAD_LEFT),
@@ -174,13 +184,16 @@ 
                     $trace['type'],
                     $trace['function'],
                 );
-            } else {
+            }
+            else
+            {
                 $line = $this->format(
                     ' <white>%s()</reset>',
                     $trace['function'],
                 );
             }
-            if ($file !== null) {
+            if ($file !== null)
+            {
                 $line .= $this->format(
                     ' <yellow>at</reset> <green>%s</reset><yellow>:</reset><white>%s</reset>',
                     $file,
@@ -188,7 +201,8 @@ 
                 );
             }
 
-            if (\in_array($line, $this->lines, true)) {
+            if (\in_array($line, $this->lines, true))
+            {
                 continue;
             }
 
@@ -196,7 +210,8 @@ 
 
             $result .= $line . "\n";
 
-            if ($h !== null && !empty($trace['file'])) {
+            if ($h !== null && !empty($trace['file']))
+            {
                 $str = @\file_get_contents($trace['file']);
                 $result .= $h->highlightLines(
                     $str,
@@ -215,13 +230,19 @@ 
      */
     private function format(string $format, mixed ...$args): string
     {
-        if (!$this->colorsSupport) {
+        if (!$this->colorsSupport)
+        {
             $format = \preg_replace('/<[^>]+>/', '', $format);
-        } else {
-            $format = \preg_replace_callback('/(<([^>]+)>)/', static function ($partial) {
+        }
+        else
+        {
+            $format = \preg_replace_callback('/(<([^>]+)>)/', static function ($partial)
+            {
                 $style = '';
-                foreach (\explode(',', \trim($partial[2], '/')) as $color) {
-                    if (isset(self::COLORS[$color])) {
+                foreach (\explode(',', \trim($partial[2], '/')) as $color)
+                {
+                    if (isset(self::COLORS[$color]))
+                    {
                         $style .= self::COLORS[$color];
                     }
                 }
@@ -240,12 +261,15 @@ 
      */
     private function isColorsSupported(mixed $stream = STDOUT): bool
     {
-        if (\getenv('TERM_PROGRAM') === 'Hyper') {
+        if (\getenv('TERM_PROGRAM') === 'Hyper')
+        {
             return true;
         }
 
-        try {
-            if (\DIRECTORY_SEPARATOR === '\\') {
+        try
+        {
+            if (\DIRECTORY_SEPARATOR === '\\')
+            {
                 return (\function_exists('sapi_windows_vt100_support') && @\sapi_windows_vt100_support($stream))
                     || \getenv('ANSICON') !== false
                     || \getenv('ConEmuANSI') === 'ON'
@@ -253,7 +277,9 @@ 
             }
 
             return @\stream_isatty($stream);
-        } catch (\Throwable) {
+        }
+        catch (\Throwable)
+        {
             return false;
         }
     }

src/Console/src/Console.php

Spacing +23 added lines, -23 removed lines

@@ -38,7 +38,7 @@ 
         #[Proxy] private readonly ContainerInterface $container = new Container(),
         private readonly ScopeInterface $scope = new Container(),
         private readonly ?EventDispatcherInterface $dispatcher = null,
-    ) {}
+    ){}
 
     /**
      * Run console application.
@@ -62,14 +62,14 @@ 
      */
     public function run(
         ?string $command,
-        array|InputInterface $input = [],
+        array | InputInterface $input = [],
         OutputInterface $output = new BufferedOutput(),
     ): CommandOutput {
         $input = \is_array($input) ? new ArrayInput($input) : $input;
 
         $this->configureIO($input, $output);
 
-        if ($command !== null) {
+        if ($command !== null){
             $input = new InputProxy($input, ['firstArgument' => $command]);
         }
 
@@ -96,18 +96,18 @@ 
      */
     public function getApplication(): Application
     {
-        if ($this->application !== null) {
+        if ($this->application !== null){
             return $this->application;
         }
 
         $this->application = new Application($this->config->getName(), $this->config->getVersion());
         $this->application->setCatchExceptions(false);
         $this->application->setAutoExit(false);
-        if ($this->dispatcher instanceof SymfonyEventDispatcherInterface) {
+        if ($this->dispatcher instanceof SymfonyEventDispatcherInterface){
             $this->application->setDispatcher($this->dispatcher);
         }
 
-        if ($this->locator !== null) {
+        if ($this->locator !== null){
             $this->addCommands($this->locator->locateCommands());
         }
 
@@ -130,13 +130,13 @@ 
             ? $this->application->addCommand(...)
             : $this->application->add(...);
 
-        foreach ($commands as $command) {
-            if ($command instanceof Command) {
+        foreach ($commands as $command){
+            if ($command instanceof Command){
                 $command->setContainer($this->container);
                 $command->setInterceptors($interceptors);
             }
 
-            if ($this->dispatcher !== null && $command instanceof EventDispatcherAwareInterface) {
+            if ($this->dispatcher !== null && $command instanceof EventDispatcherAwareInterface){
                 $command->setEventDispatcher($this->dispatcher);
             }
 
@@ -151,27 +151,27 @@ 
      */
     private function configureIO(InputInterface $input, OutputInterface $output): void
     {
-        if ($input->hasParameterOption(['--ansi'], true)) {
+        if ($input->hasParameterOption(['--ansi'], true)){
             $output->setDecorated(true);
-        } elseif ($input->hasParameterOption(['--no-ansi'], true)) {
+        } elseif ($input->hasParameterOption(['--no-ansi'], true)){
             $output->setDecorated(false);
         }
 
-        if ($input->hasParameterOption(['--no-interaction', '-n'], true)) {
+        if ($input->hasParameterOption(['--no-interaction', '-n'], true)){
             $input->setInteractive(false);
-        } elseif (\function_exists('posix_isatty')) {
+        } elseif (\function_exists('posix_isatty')){
             $inputStream = null;
 
-            if ($input instanceof StreamableInputInterface) {
+            if ($input instanceof StreamableInputInterface){
                 $inputStream = $input->getStream();
             }
 
-            if ($inputStream !== null && !@posix_isatty($inputStream) && \getenv('SHELL_INTERACTIVE') === false) {
+            if ($inputStream !== null && !@posix_isatty($inputStream) && \getenv('SHELL_INTERACTIVE') === false){
                 $input->setInteractive(false);
             }
         }
 
-        match ($shellVerbosity = (int) \getenv('SHELL_VERBOSITY')) {
+        match ($shellVerbosity = (int)\getenv('SHELL_VERBOSITY')) {
             -1 => $output->setVerbosity(OutputInterface::VERBOSITY_QUIET),
             1 => $output->setVerbosity(OutputInterface::VERBOSITY_VERBOSE),
             2 => $output->setVerbosity(OutputInterface::VERBOSITY_VERY_VERBOSE),
@@ -179,22 +179,22 @@ 
             default => $shellVerbosity = 0,
         };
 
-        if ($input->hasParameterOption(['--quiet', '-q'], true)) {
+        if ($input->hasParameterOption(['--quiet', '-q'], true)){
             $output->setVerbosity(OutputInterface::VERBOSITY_QUIET);
             $shellVerbosity = -1;
-        } else {
+        }else{
             if (
                 $input->hasParameterOption('-vvv', true)
                 || $input->hasParameterOption('--verbose=3', true)
                 || $input->getParameterOption('--verbose', false, true) === 3
-            ) {
+            ){
                 $output->setVerbosity(OutputInterface::VERBOSITY_DEBUG);
                 $shellVerbosity = 3;
             } elseif (
                 $input->hasParameterOption('-vv', true)
                 || $input->hasParameterOption('--verbose=2', true)
                 || $input->getParameterOption('--verbose', false, true) === 2
-            ) {
+            ){
                 $output->setVerbosity(OutputInterface::VERBOSITY_VERY_VERBOSE);
                 $shellVerbosity = 2;
             } elseif (
@@ -202,17 +202,17 @@ 
                 || $input->hasParameterOption('--verbose=1', true)
                 || $input->hasParameterOption('--verbose', true)
                 || $input->getParameterOption('--verbose', false, true)
-            ) {
+            ){
                 $output->setVerbosity(OutputInterface::VERBOSITY_VERBOSE);
                 $shellVerbosity = 1;
             }
         }
 
-        if ($shellVerbosity === -1) {
+        if ($shellVerbosity === -1){
             $input->setInteractive(false);
         }
 
-        \putenv('SHELL_VERBOSITY=' . $shellVerbosity);
+        \putenv('SHELL_VERBOSITY='.$shellVerbosity);
         $_ENV['SHELL_VERBOSITY'] = $shellVerbosity;
         $_SERVER['SHELL_VERBOSITY'] = $shellVerbosity;
     }

Braces +41 added lines, -19 removed lines

@@ -38,7 +38,8 @@ 
         #[Proxy] private readonly ContainerInterface $container = new Container(),
         private readonly ScopeInterface $scope = new Container(),
         private readonly ?EventDispatcherInterface $dispatcher = null,
-    ) {}
+    ) {
+}
 
     /**
      * Run console application.
@@ -69,7 +70,8 @@ 
 
         $this->configureIO($input, $output);
 
-        if ($command !== null) {
+        if ($command !== null)
+        {
             $input = new InputProxy($input, ['firstArgument' => $command]);
         }
 
@@ -96,18 +98,21 @@ 
      */
     public function getApplication(): Application
     {
-        if ($this->application !== null) {
+        if ($this->application !== null)
+        {
             return $this->application;
         }
 
         $this->application = new Application($this->config->getName(), $this->config->getVersion());
         $this->application->setCatchExceptions(false);
         $this->application->setAutoExit(false);
-        if ($this->dispatcher instanceof SymfonyEventDispatcherInterface) {
+        if ($this->dispatcher instanceof SymfonyEventDispatcherInterface)
+        {
             $this->application->setDispatcher($this->dispatcher);
         }
 
-        if ($this->locator !== null) {
+        if ($this->locator !== null)
+        {
             $this->addCommands($this->locator->locateCommands());
         }
 
@@ -130,13 +135,16 @@ 
             ? $this->application->addCommand(...)
             : $this->application->add(...);
 
-        foreach ($commands as $command) {
-            if ($command instanceof Command) {
+        foreach ($commands as $command)
+        {
+            if ($command instanceof Command)
+            {
                 $command->setContainer($this->container);
                 $command->setInterceptors($interceptors);
             }
 
-            if ($this->dispatcher !== null && $command instanceof EventDispatcherAwareInterface) {
+            if ($this->dispatcher !== null && $command instanceof EventDispatcherAwareInterface)
+            {
                 $command->setEventDispatcher($this->dispatcher);
             }
 
@@ -151,22 +159,30 @@ 
      */
     private function configureIO(InputInterface $input, OutputInterface $output): void
     {
-        if ($input->hasParameterOption(['--ansi'], true)) {
+        if ($input->hasParameterOption(['--ansi'], true))
+        {
             $output->setDecorated(true);
-        } elseif ($input->hasParameterOption(['--no-ansi'], true)) {
+        }
+        elseif ($input->hasParameterOption(['--no-ansi'], true))
+        {
             $output->setDecorated(false);
         }
 
-        if ($input->hasParameterOption(['--no-interaction', '-n'], true)) {
+        if ($input->hasParameterOption(['--no-interaction', '-n'], true))
+        {
             $input->setInteractive(false);
-        } elseif (\function_exists('posix_isatty')) {
+        }
+        elseif (\function_exists('posix_isatty'))
+        {
             $inputStream = null;
 
-            if ($input instanceof StreamableInputInterface) {
+            if ($input instanceof StreamableInputInterface)
+            {
                 $inputStream = $input->getStream();
             }
 
-            if ($inputStream !== null && !@posix_isatty($inputStream) && \getenv('SHELL_INTERACTIVE') === false) {
+            if ($inputStream !== null && !@posix_isatty($inputStream) && \getenv('SHELL_INTERACTIVE') === false)
+            {
                 $input->setInteractive(false);
             }
         }
@@ -179,10 +195,13 @@ 
             default => $shellVerbosity = 0,
         };
 
-        if ($input->hasParameterOption(['--quiet', '-q'], true)) {
+        if ($input->hasParameterOption(['--quiet', '-q'], true))
+        {
             $output->setVerbosity(OutputInterface::VERBOSITY_QUIET);
             $shellVerbosity = -1;
-        } else {
+        }
+        else
+        {
             if (
                 $input->hasParameterOption('-vvv', true)
                 || $input->hasParameterOption('--verbose=3', true)
@@ -190,14 +209,16 @@ 
             ) {
                 $output->setVerbosity(OutputInterface::VERBOSITY_DEBUG);
                 $shellVerbosity = 3;
-            } elseif (
+            }
+            elseif (
                 $input->hasParameterOption('-vv', true)
                 || $input->hasParameterOption('--verbose=2', true)
                 || $input->getParameterOption('--verbose', false, true) === 2
             ) {
                 $output->setVerbosity(OutputInterface::VERBOSITY_VERY_VERBOSE);
                 $shellVerbosity = 2;
-            } elseif (
+            }
+            elseif (
                 $input->hasParameterOption('-v', true)
                 || $input->hasParameterOption('--verbose=1', true)
                 || $input->hasParameterOption('--verbose', true)
@@ -208,7 +229,8 @@ 
             }
         }
 
-        if ($shellVerbosity === -1) {
+        if ($shellVerbosity === -1)
+        {
             $input->setInteractive(false);
         }
 

src/Core/src/Exception/Resolver/PositionalArgumentException.php

Spacing +1 added lines, -1 removed lines

@@ -8,7 +8,7 @@
 {
     public function getParameter(): string
     {
-        return '#' . $this->parameter;
+        return '#'.$this->parameter;
     }
 
     protected function getValidationMessage(

src/Core/src/Container.php

Spacing +38 added lines, -38 removed lines

@@ -48,11 +48,11 @@ 
     public const DEFAULT_ROOT_SCOPE_NAME = 'root';
 
     private Internal\State $state;
-    private ResolverInterface|Internal\Resolver $resolver;
-    private FactoryInterface|Internal\Factory $factory;
-    private ContainerInterface|Internal\Container $container;
-    private BinderInterface|Internal\Binder $binder;
-    private InvokerInterface|Internal\Invoker $invoker;
+    private ResolverInterface | Internal\Resolver $resolver;
+    private FactoryInterface | Internal\Factory $factory;
+    private ContainerInterface | Internal\Container $container;
+    private BinderInterface | Internal\Binder $binder;
+    private InvokerInterface | Internal\Invoker $invoker;
     private Internal\Scope $scope;
     private Internal\Actor $actor;
 
@@ -61,11 +61,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);
@@ -106,11 +106,11 @@ 
      * @throws \Throwable
      * @psalm-suppress TooManyArguments
      */
-    public function make(string $alias, array $parameters = [], \Stringable|string|null $context = null): mixed
+    public function make(string $alias, array $parameters = [], \Stringable | string | null $context = null): mixed
     {
         return ContainerScope::getContainer() === $this
             ? $this->factory->make($alias, $parameters, $context)
-            : ContainerScope::runScope($this, fn(): mixed => $this->factory->make($alias, $parameters, $context));
+            : ContainerScope::runScope($this, fn() : mixed => $this->factory->make($alias, $parameters, $context));
     }
 
     /**
@@ -132,7 +132,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)
@@ -152,9 +152,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
@@ -164,25 +164,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]);
             }
@@ -190,21 +190,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;
             }
         }
@@ -252,9 +252,9 @@ 
      * @psalm-param TResolver $resolver
      * @throws SingletonOverloadException
      */
-    public function bindSingleton(string $alias, string|array|callable|object $resolver, ?bool $force = null): void
+    public function bindSingleton(string $alias, string | array | callable | object $resolver, ?bool $force = null): void
     {
-        if ($force ?? $this->options->allowSingletonsRebinding) {
+        if ($force ?? $this->options->allowSingletonsRebinding){
             $this->binder->removeBinding($alias);
         }
 
@@ -289,7 +289,7 @@ 
     {
         return ContainerScope::getContainer() === $this
             ? $this->invoker->invoke($target, $parameters)
-            : ContainerScope::runScope($this, fn(): mixed => $this->invoker->invoke($target, $parameters));
+            : ContainerScope::runScope($this, fn() : mixed => $this->invoker->invoke($target, $parameters));
     }
 
     /**
@@ -346,8 +346,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);
             }
         }
@@ -361,7 +361,7 @@ 
     private function closeScope(): void
     {
         /** @psalm-suppress RedundantPropertyInitializationCheck */
-        if (!isset($this->scope)) {
+        if (!isset($this->scope)){
             $this->destruct();
             return;
         }
@@ -370,10 +370,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;
             }
         }
@@ -382,7 +382,7 @@ 
         $this->destruct();
 
         // Throw collected errors
-        if ($errors !== []) {
+        if ($errors !== []){
             throw new FinalizersException($scopeName, $errors);
         }
     }
@@ -404,18 +404,18 @@ 
         $container->scope->setParent($this, $this->scope, $this->actor);
 
         // 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();
                 }
             },

src/Core/src/Config/Shared.php

Spacing +2 added lines, -2 removed lines

@@ -12,7 +12,7 @@ 
     public function __construct(
         public readonly object $value,
         public readonly bool $singleton = false,
-    ) {}
+    ){}
 
     /**
      * @return class-string
@@ -25,6 +25,6 @@ 
 
     public function __toString(): string
     {
-        return 'Shared object of class ' . $this->value::class;
+        return 'Shared object of class '.$this->value::class;
     }
 }

Braces +2 added lines, -1 removed lines

@@ -12,7 +12,8 @@
     public function __construct(
         public readonly object $value,
         public readonly bool $singleton = false,
-    ) {}
+    ) {
+}
 
     /**
      * @return class-string

src/Core/src/Internal/Actor.php

Spacing +76 added lines, -76 removed lines

@@ -86,7 +86,7 @@ 
      */
     public function resolveType(
         string $alias,
-        ?Binding &$binding = null,
+        ?Binding & $binding = null,
         ?object &$singleton = null,
         ?object &$injector = null,
         ?self &$actor = null,
@@ -95,20 +95,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;
                     }
 
@@ -123,7 +123,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;
@@ -131,12 +131,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;
     }
@@ -144,7 +144,7 @@ 
     public function resolveBinding(
         object $binding,
         string $alias,
-        \Stringable|string|null $context,
+        \Stringable | string | null $context,
         array $arguments,
         Tracer $tracer,
     ): mixed {
@@ -201,18 +201,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'.",
@@ -226,7 +226,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()
@@ -236,10 +236,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'.",
@@ -249,12 +249,12 @@ 
             }
 
             return $instance;
-        } catch (TracedContainerException $e) {
+        }catch (TracedContainerException $e){
             throw isset($injectorInstance) ? $e : $e::createWithTrace(\sprintf(
                 'Can\'t resolve `%s`.',
                 $tracer->getRootAlias(),
             ), $tracer->getTraces(), $e);
-        } finally {
+        }finally{
             $this->state->bindings[$ctx->class] ??= $binding;
         }
     }
@@ -262,22 +262,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::createWithTrace(
                     $alias === $tracer->getRootAlias()
                         ? "Can't resolve `{$alias}`."
@@ -294,9 +294,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,
@@ -307,7 +307,7 @@ 
 
         $result = Proxy::create(new \ReflectionClass($binding->getReturnClass()), $context, new Attribute\Proxy());
 
-        if ($binding->singleton) {
+        if ($binding->singleton){
             $this->state->singletons[$alias] = $result;
         }
 
@@ -317,11 +317,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),
@@ -331,7 +331,7 @@ 
             );
         }
 
-        if ($binding->singleton) {
+        if ($binding->singleton){
             $this->state->singletons[$alias] = $binding->value;
         }
 
@@ -341,16 +341,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);
         }
@@ -359,32 +359,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::createWithTrace(
                 \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(),
@@ -392,7 +392,7 @@ 
             );
         }
 
-        if (\is_object($instance)) {
+        if (\is_object($instance)){
             $this->validateConstraint($instance, $ctx);
             return $this->registerInstance($ctx, $instance);
         }
@@ -403,14 +403,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(
@@ -419,17 +419,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();
             }
         }
@@ -445,13 +445,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);
                 }
             }
@@ -478,26 +478,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);
                     }
 
@@ -510,11 +510,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',
@@ -528,8 +528,8 @@ 
 
         $constructor = $reflection->getConstructor();
 
-        if ($constructor !== null) {
-            try {
+        if ($constructor !== null){
+            try{
                 $newScope = $this !== $actor;
                 $debug = [
                     'action' => 'resolve arguments',
@@ -543,7 +543,7 @@ 
                 $tracer->push($newScope, ...$debug);
                 $tracer->push(true);
                 $args = $actor->resolver->resolveArguments($constructor, $arguments, $actor->options->validateArguments);
-            } catch (\Throwable $e) {
+            }catch (\Throwable $e){
                 throw TracedContainerException::createWithTrace(
                     \sprintf(
                         "Can't resolve `%s`.",
@@ -552,28 +552,28 @@ 
                     $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::createWithTrace(\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();
         }
@@ -605,12 +605,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;
         }
 
@@ -624,7 +624,7 @@ 
          * @var Attribute\Finalize|null $attribute
          */
         $attribute = ($ctx->reflection->getAttributes(Attribute\Finalize::class)[0] ?? null)?->newInstance();
-        if ($attribute === null) {
+        if ($attribute === null){
             return null;
         }
 
@@ -638,10 +638,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);
@@ -657,9 +657,9 @@ 
 
     private function validateArguments(ContextFunction $reflection, array $arguments = []): bool
     {
-        try {
+        try{
             $this->resolver->validateArguments($reflection, $arguments);
-        } catch (\Throwable) {
+        }catch (\Throwable){
             return false;
         }
 

Braces +149 added lines, -64 removed lines

@@ -95,20 +95,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;
                     }
 
@@ -123,7 +128,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;
@@ -131,7 +137,8 @@ 
 
             // Go to parent scope
             $parent = $actor->scope->getParentActor();
-            if ($parent === null) {
+            if ($parent === null)
+            {
                 break;
             }
 
@@ -201,18 +208,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'.",
@@ -239,7 +251,8 @@ 
                 default => (string) $context,
             });
 
-            if (!$reflection->isInstance($instance)) {
+            if (!$reflection->isInstance($instance))
+            {
                 throw new InjectionException(
                     \sprintf(
                         "Invalid injection response for '%s'.",
@@ -249,12 +262,16 @@ 
             }
 
             return $instance;
-        } catch (TracedContainerException $e) {
+        }
+        catch (TracedContainerException $e)
+        {
             throw isset($injectorInstance) ? $e : $e::createWithTrace(\sprintf(
                 'Can\'t resolve `%s`.',
                 $tracer->getRootAlias(),
             ), $tracer->getTraces(), $e);
-        } finally {
+        }
+        finally
+        {
             $this->state->bindings[$ctx->class] ??= $binding;
         }
     }
@@ -266,18 +283,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::createWithTrace(
                     $alias === $tracer->getRootAlias()
                         ? "Can't resolve `{$alias}`."
@@ -296,7 +319,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,
@@ -307,7 +331,8 @@ 
 
         $result = Proxy::create(new \ReflectionClass($binding->getReturnClass()), $context, new Attribute\Proxy());
 
-        if ($binding->singleton) {
+        if ($binding->singleton)
+        {
             $this->state->singletons[$alias] = $result;
         }
 
@@ -321,7 +346,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),
@@ -331,7 +357,8 @@ 
             );
         }
 
-        if ($binding->singleton) {
+        if ($binding->singleton)
+        {
             $this->state->singletons[$alias] = $binding->value;
         }
 
@@ -348,9 +375,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);
         }
@@ -366,25 +396,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::createWithTrace(
                 \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(),
@@ -392,7 +431,8 @@ 
             );
         }
 
-        if (\is_object($instance)) {
+        if (\is_object($instance))
+        {
             $this->validateConstraint($instance, $ctx);
             return $this->registerInstance($ctx, $instance);
         }
@@ -409,8 +449,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(
@@ -419,17 +461,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();
             }
         }
@@ -445,13 +492,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);
                 }
             }
@@ -478,26 +528,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);
                     }
 
@@ -510,11 +568,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',
@@ -528,8 +588,10 @@ 
 
         $constructor = $reflection->getConstructor();
 
-        if ($constructor !== null) {
-            try {
+        if ($constructor !== null)
+        {
+            try
+            {
                 $newScope = $this !== $actor;
                 $debug = [
                     'action' => 'resolve arguments',
@@ -543,7 +605,9 @@ 
                 $tracer->push($newScope, ...$debug);
                 $tracer->push(true);
                 $args = $actor->resolver->resolveArguments($constructor, $arguments, $actor->options->validateArguments);
-            } catch (\Throwable $e) {
+            }
+            catch (\Throwable $e)
+            {
                 throw TracedContainerException::createWithTrace(
                     \sprintf(
                         "Can't resolve `%s`.",
@@ -552,28 +616,39 @@ 
                     $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::createWithTrace(\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();
         }
@@ -605,12 +680,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;
         }
 
@@ -624,7 +701,8 @@ 
          * @var Attribute\Finalize|null $attribute
          */
         $attribute = ($ctx->reflection->getAttributes(Attribute\Finalize::class)[0] ?? null)?->newInstance();
-        if ($attribute === null) {
+        if ($attribute === null)
+        {
             return null;
         }
 
@@ -638,10 +716,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);
@@ -657,9 +739,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/Tracer.php

Spacing +8 added lines, -8 removed lines

@@ -25,7 +25,7 @@ 
     {
         $result = [];
         $i = 0;
-        foreach ($blocks as $block) {
+        foreach ($blocks as $block){
             \array_push($result, ...self::blockToStringList($block, $i++));
         }
         return \implode("\n", $result);
@@ -47,19 +47,19 @@ 
     public function push(bool $nextLevel, mixed ...$details): void
     {
         $trace = $details === [] ? null : new Trace($details);
-        if ($nextLevel || $this->traces === []) {
+        if ($nextLevel || $this->traces === []){
             $this->traces[] = $trace === null ? [] : [$trace];
-        } elseif ($trace !== null) {
+        } elseif ($trace !== null){
             $this->traces[\array_key_last($this->traces)][] = $trace;
         }
     }
 
     public function pop(bool $previousLevel = false): void
     {
-        if ($this->traces === []) {
+        if ($this->traces === []){
             return;
         }
-        if ($previousLevel) {
+        if ($previousLevel){
             \array_pop($this->traces);
             return;
         }
@@ -75,7 +75,7 @@ 
 
     public function __toString(): string
     {
-        return $this->traces === [] ? '' : "Resolving trace:\n" . self::renderTraceList($this->traces);
+        return $this->traces === [] ? '' : "Resolving trace:\n".self::renderTraceList($this->traces);
     }
 
     /**
@@ -92,8 +92,8 @@ 
         // Separator
         $s = "\n";
         $nexPrefix = "$s$padding  ";
-        foreach ($items as $item) {
-            $result[] = $firstPrefix . \str_replace($s, $nexPrefix, (string) $item);
+        foreach ($items as $item){
+            $result[] = $firstPrefix.\str_replace($s, $nexPrefix, (string)$item);
         }
         return $result;
     }

Braces +13 added lines, -6 removed lines

@@ -25,7 +25,8 @@ 
     {
         $result = [];
         $i = 0;
-        foreach ($blocks as $block) {
+        foreach ($blocks as $block)
+        {
             \array_push($result, ...self::blockToStringList($block, $i++));
         }
         return \implode("\n", $result);
@@ -47,19 +48,24 @@ 
     public function push(bool $nextLevel, mixed ...$details): void
     {
         $trace = $details === [] ? null : new Trace($details);
-        if ($nextLevel || $this->traces === []) {
+        if ($nextLevel || $this->traces === [])
+        {
             $this->traces[] = $trace === null ? [] : [$trace];
-        } elseif ($trace !== null) {
+        }
+        elseif ($trace !== null)
+        {
             $this->traces[\array_key_last($this->traces)][] = $trace;
         }
     }
 
     public function pop(bool $previousLevel = false): void
     {
-        if ($this->traces === []) {
+        if ($this->traces === [])
+        {
             return;
         }
-        if ($previousLevel) {
+        if ($previousLevel)
+        {
             \array_pop($this->traces);
             return;
         }
@@ -92,7 +98,8 @@ 
         // Separator
         $s = "\n";
         $nexPrefix = "$s$padding  ";
-        foreach ($items as $item) {
+        foreach ($items as $item)
+        {
             $result[] = $firstPrefix . \str_replace($s, $nexPrefix, (string) $item);
         }
         return $result;

src/Core/src/Internal/Proxy/ProxyClassRenderer.php

Spacing +25 added lines, -25 removed lines

@@ -27,29 +27,29 @@ 
             MagicCallTrait::class,
         ] : [];
 
-        if (\str_contains($className, '\\')) {
+        if (\str_contains($className, '\\')){
             $classShortName = \substr($className, \strrpos($className, '\\') + 1);
-            $classNamespaceStr = 'namespace ' . \substr($className, 0, \strrpos($className, '\\')) . ';';
-        } else {
+            $classNamespaceStr = 'namespace '.\substr($className, 0, \strrpos($className, '\\')).';';
+        }else{
             $classShortName = $className;
             $classNamespaceStr = '';
         }
 
         $interface = $type->getName();
         $classBody = [];
-        foreach ($type->getMethods() as $method) {
-            if ($method->isConstructor()) {
+        foreach ($type->getMethods() as $method){
+            if ($method->isConstructor()){
                 throw new \LogicException('Constructor is not allowed in a proxy.');
             }
 
-            if ($method->isDestructor()) {
+            if ($method->isDestructor()){
                 $classBody[] = self::renderMethod($method);
                 continue;
             }
 
             $hasRefs = false;
-            $return = $method->hasReturnType() && (string) $method->getReturnType() === 'void' ? '' : 'return ';
-            $call = ($method->isStatic() ? '::' : '->') . $method->getName();
+            $return = $method->hasReturnType() && (string)$method->getReturnType() === 'void' ? '' : 'return ';
+            $call = ($method->isStatic() ? '::' : '->').$method->getName();
             $context = $method->isStatic() ? 'null' : '$this->__container_proxy_context';
             $containerStr = match (false) {
                 $attachContainer => 'null',
@@ -69,12 +69,12 @@ 
                 PHP;
 
             $args = [];
-            foreach ($method->getParameters() as $param) {
+            foreach ($method->getParameters() as $param){
                 $hasRefs = $hasRefs || $param->isPassedByReference();
-                $args[] = ($param->isVariadic() ? '...' : '') . '$' . $param->getName();
+                $args[] = ($param->isVariadic() ? '...' : '').'$'.$param->getName();
             }
 
-            if (!$hasRefs && !$method->isVariadic()) {
+            if (!$hasRefs && !$method->isVariadic()){
                 $classBody[] = self::renderMethod(
                     $method,
                     <<<PHP
@@ -86,7 +86,7 @@ 
 
             $argsStr = \implode(', ', $args);
 
-            if ($method->isVariadic()) {
+            if ($method->isVariadic()){
                 $classBody[] = self::renderMethod(
                     $method,
                     <<<PHP
@@ -108,7 +108,7 @@ 
 
         $traitsStr = $traits === [] ? '' : \implode(
             "\n    ",
-            \array_map(static fn(string $trait): string => 'use \\' . \ltrim($trait, '\\') . ';', $traits),
+            \array_map(static fn(string $trait) : string => 'use \\'.\ltrim($trait, '\\').';', $traits),
         );
         return <<<PHP
             $classNamespaceStr
@@ -131,7 +131,7 @@ 
             $m->getName(),
             \implode(', ', \array_map(self::renderParameter(...), $m->getParameters())),
             $m->hasReturnType()
-                ? ': ' . self::renderParameterTypes($m->getReturnType(), $m->getDeclaringClass())
+                ? ': '.self::renderParameterTypes($m->getReturnType(), $m->getDeclaringClass())
                 : '',
             $body,
         );
@@ -145,8 +145,8 @@ 
                 $param->hasType() ? 'mixed' : '',
                 $param->isPassedByReference() ? '&' : '',
                 $param->isVariadic() ? '...' : '',
-                '$' . $param->getName(),
-                $param->isOptional() && !$param->isVariadic() ? ' = ' . self::renderDefaultValue($param) : '',
+                '$'.$param->getName(),
+                $param->isOptional() && !$param->isVariadic() ? ' = '.self::renderDefaultValue($param) : '',
             ),
             ' ',
         );
@@ -154,8 +154,8 @@ 
 
     public static function renderParameterTypes(\ReflectionType $types, \ReflectionClass $class): string
     {
-        if ($types instanceof \ReflectionNamedType) {
-            return ($types->allowsNull() && $types->getName() !== 'mixed' ? '?' : '') . ($types->isBuiltin()
+        if ($types instanceof \ReflectionNamedType){
+            return ($types->allowsNull() && $types->getName() !== 'mixed' ? '?' : '').($types->isBuiltin()
                     ? $types->getName()
                     : self::normalizeClassType($types, $class));
         }
@@ -167,7 +167,7 @@ 
         };
 
         $result = [];
-        foreach ($types as $type) {
+        foreach ($types as $type){
             $result[] = $type->isBuiltin()
                 ? $type->getName()
                 : self::normalizeClassType($type, $class);
@@ -178,12 +178,12 @@ 
 
     public static function renderDefaultValue(\ReflectionParameter $param): string
     {
-        if ($param->isDefaultValueConstant()) {
+        if ($param->isDefaultValueConstant()){
             $result = $param->getDefaultValueConstantName();
 
-            return \explode('::', (string) $result)[0] === 'self'
+            return \explode('::', (string)$result)[0] === 'self'
                 ? $result
-                : '\\' . $result;
+                : '\\'.$result;
         }
 
         $cut = self::cutDefaultValue($param);
@@ -197,14 +197,14 @@ 
     {
         return match ($type->getName()) {
             'static' => 'static',
-            'self' => '\\' . $class->getName(),
-            default => '\\' . $type->getName(),
+            'self' => '\\'.$class->getName(),
+            default => '\\'.$type->getName(),
         };
     }
 
     private static function cutDefaultValue(\ReflectionParameter $param): string
     {
-        $string = (string) $param;
+        $string = (string)$param;
 
         return \trim(\substr($string, \strpos($string, '=') + 1, -1));
     }

src/Queue/src/QueueableDetector.php

Spacing +4 added lines, -4 removed lines

@@ -9,7 +9,7 @@ 
 
 final class QueueableDetector
 {
-    public function __construct(private readonly ReaderInterface $reader) {}
+    public function __construct(private readonly ReaderInterface $reader){}
 
     /**
      * @param class-string|object $object
@@ -19,7 +19,7 @@ 
         $reflection = new \ReflectionClass($object);
 
         /** @psalm-suppress RedundantCondition https://github.com/vimeo/psalm/issues/9489 */
-        if ($reflection->implementsInterface(QueueableInterface::class)) {
+        if ($reflection->implementsInterface(QueueableInterface::class)){
             return true;
         }
 
@@ -34,11 +34,11 @@ 
         $reflection = new \ReflectionClass($object);
 
         $attribute = $this->reader->firstClassMetadata($reflection, Queueable::class);
-        if ($attribute !== null) {
+        if ($attribute !== null){
             return $attribute->queue;
         }
 
-        if (\is_object($object) && $reflection->hasMethod('getQueue')) {
+        if (\is_object($object) && $reflection->hasMethod('getQueue')){
             return $reflection->getMethod('getQueue')->invoke($object);
         }
 

Braces +9 added lines, -4 removed lines

@@ -9,7 +9,9 @@ 
 
 final class QueueableDetector
 {
-    public function __construct(private readonly ReaderInterface $reader) {}
+    public function __construct(private readonly ReaderInterface $reader)
+    {
+}
 
     /**
      * @param class-string|object $object
@@ -19,7 +21,8 @@ 
         $reflection = new \ReflectionClass($object);
 
         /** @psalm-suppress RedundantCondition https://github.com/vimeo/psalm/issues/9489 */
-        if ($reflection->implementsInterface(QueueableInterface::class)) {
+        if ($reflection->implementsInterface(QueueableInterface::class))
+        {
             return true;
         }
 
@@ -34,11 +37,13 @@ 
         $reflection = new \ReflectionClass($object);
 
         $attribute = $this->reader->firstClassMetadata($reflection, Queueable::class);
-        if ($attribute !== null) {
+        if ($attribute !== null)
+        {
             return $attribute->queue;
         }
 
-        if (\is_object($object) && $reflection->hasMethod('getQueue')) {
+        if (\is_object($object) && $reflection->hasMethod('getQueue'))
+        {
             return $reflection->getMethod('getQueue')->invoke($object);
         }