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());
         }
 
@@ -127,13 +127,13 @@ 
     {
         $interceptors = $this->config->getInterceptors();
 
-        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);
             }
 
@@ -148,27 +148,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),
@@ -176,22 +176,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 (
@@ -199,17 +199,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());
         }
 
@@ -127,13 +132,16 @@ 
     {
         $interceptors = $this->config->getInterceptors();
 
-        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);
             }
 
@@ -148,22 +156,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);
             }
         }
@@ -176,10 +192,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)
@@ -187,14 +206,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)
@@ -205,7 +226,8 @@ 
             }
         }
 
-        if ($shellVerbosity === -1) {
+        if ($shellVerbosity === -1)
+        {
             $input->setInteractive(false);
         }