[Cache][Config][Console][DependencyInjection][FrameworkBundle] Remove dead code and useless casts

alexandre-daubois · nicolas-grekas · commit 24d7bc4a12cb · 2024-07-26T15:29:19.000+02:00
diff --git a/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/AbstractPhpFileCacheWarmer.php b/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/AbstractPhpFileCacheWarmer.php
@@ -58,7 +58,7 @@ public function warmUp(string $cacheDir, ?string $buildDir = null): array
      */
     protected function warmUpPhpArrayAdapter(PhpArrayAdapter $phpArrayAdapter, array $values): array
     {
-        return (array) $phpArrayAdapter->warmUp($values);
+        return $phpArrayAdapter->warmUp($values);
     }
 
     /**
diff --git a/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/XmlDescriptor.php b/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/XmlDescriptor.php
@@ -64,7 +64,7 @@ protected function describeContainerService(object $service, array $options = []
 
     protected function describeContainerServices(ContainerBuilder $container, array $options = []): void
     {
-        $this->writeDocument($this->getContainerServicesDocument($container, $options['tag'] ?? null, isset($options['show_hidden']) && $options['show_hidden'], isset($options['show_arguments']) && $options['show_arguments'], $options['filter'] ?? null, $options['id'] ?? null));
+        $this->writeDocument($this->getContainerServicesDocument($container, $options['tag'] ?? null, isset($options['show_hidden']) && $options['show_hidden'], isset($options['show_arguments']) && $options['show_arguments'], $options['filter'] ?? null));
     }
 
     protected function describeContainerDefinition(Definition $definition, array $options = [], ?ContainerBuilder $container = null): void
@@ -288,7 +288,7 @@ private function getContainerServiceDocument(object $service, string $id, ?Conta
         return $dom;
     }
 
-    private function getContainerServicesDocument(ContainerBuilder $container, ?string $tag = null, bool $showHidden = false, bool $showArguments = false, ?callable $filter = null, ?string $id = null): \DOMDocument
+    private function getContainerServicesDocument(ContainerBuilder $container, ?string $tag = null, bool $showHidden = false, bool $showArguments = false, ?callable $filter = null): \DOMDocument
     {
         $dom = new \DOMDocument('1.0', 'UTF-8');
         $dom->appendChild($containerXML = $dom->createElement('container'));
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
@@ -498,7 +498,7 @@ public function load(array $configs, ContainerBuilder $container): void
             if (!$messengerEnabled) {
                 throw new LogicException('Scheduler support cannot be enabled as the Messenger component is not '.(interface_exists(MessageBusInterface::class) ? 'enabled.' : 'installed. Try running "composer require symfony/messenger".'));
             }
-            $this->registerSchedulerConfiguration($config['scheduler'], $container, $loader);
+            $this->registerSchedulerConfiguration($container, $loader);
         } else {
             $container->removeDefinition('cache.scheduler');
             $container->removeDefinition('console.command.scheduler_debug');
@@ -570,7 +570,7 @@ public function load(array $configs, ContainerBuilder $container): void
         }
 
         if ($this->readConfigEnabled('remote-event', $container, $config['remote-event'])) {
-            $this->registerRemoteEventConfiguration($config['remote-event'], $container, $loader);
+            $this->registerRemoteEventConfiguration($loader);
         }
 
         if ($this->readConfigEnabled('html_sanitizer', $container, $config['html_sanitizer'])) {
@@ -2073,7 +2073,7 @@ private function registerSemaphoreConfiguration(array $config, ContainerBuilder
         }
     }
 
-    private function registerSchedulerConfiguration(array $config, ContainerBuilder $container, PhpFileLoader $loader): void
+    private function registerSchedulerConfiguration(ContainerBuilder $container, PhpFileLoader $loader): void
     {
         if (!class_exists(SchedulerTransportFactory::class)) {
             throw new LogicException('Scheduler support cannot be enabled as the Scheduler component is not installed. Try running "composer require symfony/scheduler".');
@@ -2940,7 +2940,7 @@ private function registerWebhookConfiguration(array $config, ContainerBuilder $c
         $controller->replaceArgument(1, new Reference($config['message_bus']));
     }
 
-    private function registerRemoteEventConfiguration(array $config, ContainerBuilder $container, PhpFileLoader $loader): void
+    private function registerRemoteEventConfiguration(PhpFileLoader $loader): void
     {
         if (!class_exists(RemoteEvent::class)) {
             throw new LogicException('RemoteEvent support cannot be enabled as the component is not installed. Try running "composer require symfony/remote-event".');
diff --git a/src/Symfony/Component/Cache/Adapter/AbstractTagAwareAdapter.php b/src/Symfony/Component/Cache/Adapter/AbstractTagAwareAdapter.php
@@ -186,7 +186,7 @@ public function commit(): bool
                 $e = $this->doSave($values, $lifetime, $addTagData, $removeTagData);
             } catch (\Exception $e) {
             }
-            if (true === $e || [] === $e) {
+            if ([] === $e) {
                 continue;
             }
             if (\is_array($e) || 1 === \count($values)) {
@@ -213,7 +213,7 @@ public function commit(): bool
                     $e = $this->doSave($values, $lifetime, $addTagData, $removeTagData);
                 } catch (\Exception $e) {
                 }
-                if (true === $e || [] === $e) {
+                if ([] === $e) {
                     continue;
                 }
                 $ok = false;
diff --git a/src/Symfony/Component/Config/Definition/Dumper/YamlReferenceDumper.php b/src/Symfony/Component/Config/Definition/Dumper/YamlReferenceDumper.php
@@ -193,7 +193,6 @@ private function writeArray(array $array, int $depth, bool $asComment = false):
             } else {
                 $val = $value;
             }
-            $prefix = $asComment ? '# ' : '';
 
             $prefix = $asComment ? '# ' : '';
 
diff --git a/src/Symfony/Component/Config/Definition/PrototypedArrayNode.php b/src/Symfony/Component/Config/Definition/PrototypedArrayNode.php
@@ -217,10 +217,8 @@ protected function normalizeValue(mixed $value): mixed
                             $valuePrototype = current($this->valuePrototypes) ?: clone $children['value'];
                             $valuePrototype->parent = $this;
                             $originalClosures = $this->prototype->normalizationClosures;
-                            if (\is_array($originalClosures)) {
-                                $valuePrototypeClosures = $valuePrototype->normalizationClosures;
-                                $valuePrototype->normalizationClosures = \is_array($valuePrototypeClosures) ? array_merge($originalClosures, $valuePrototypeClosures) : $originalClosures;
-                            }
+                            $valuePrototypeClosures = $valuePrototype->normalizationClosures;
+                            $valuePrototype->normalizationClosures = \is_array($valuePrototypeClosures) ? array_merge($originalClosures, $valuePrototypeClosures) : $originalClosures;
                             $this->valuePrototypes[$k] = $valuePrototype;
                         }
                     }
diff --git a/src/Symfony/Component/Config/Util/XmlUtils.php b/src/Symfony/Component/Config/Util/XmlUtils.php
@@ -80,7 +80,7 @@ public static function parse(string $content, string|callable|null $schemaOrCall
                     $valid = false;
                 }
             } elseif (is_file($schemaOrCallable)) {
-                $schemaSource = (new Filesystem())->readFile((string) $schemaOrCallable);
+                $schemaSource = (new Filesystem())->readFile($schemaOrCallable);
                 $valid = @$dom->schemaValidateSource($schemaSource);
             } else {
                 libxml_use_internal_errors($internalErrors);
@@ -156,7 +156,7 @@ public static function loadFile(string $file, string|callable|null $schemaOrCall
      */
     public static function convertDomElementToArray(\DOMElement $element, bool $checkPrefix = true): mixed
     {
-        $prefix = (string) $element->prefix;
+        $prefix = $element->prefix;
         $empty = true;
         $config = [];
         foreach ($element->attributes as $name => $node) {
@@ -174,7 +174,7 @@ public static function convertDomElementToArray(\DOMElement $element, bool $chec
                     $nodeValue = trim($node->nodeValue);
                     $empty = false;
                 }
-            } elseif ($checkPrefix && $prefix != (string) $node->prefix) {
+            } elseif ($checkPrefix && $prefix != $node->prefix) {
                 continue;
             } elseif (!$node instanceof \DOMComment) {
                 $value = static::convertDomElementToArray($node, $checkPrefix);
diff --git a/src/Symfony/Component/Console/Command/CompleteCommand.php b/src/Symfony/Component/Console/Command/CompleteCommand.php
@@ -98,13 +98,13 @@ protected function execute(InputInterface $input, OutputInterface $output): int
                 '',
                 '<comment>'.date('Y-m-d H:i:s').'</>',
                 '<info>Input:</> <comment>("|" indicates the cursor position)</>',
-                '  '.(string) $completionInput,
+                '  '.$completionInput,
                 '<info>Command:</>',
-                '  '.(string) implode(' ', $_SERVER['argv']),
+                '  '.implode(' ', $_SERVER['argv']),
                 '<info>Messages:</>',
             ]);
 
-            $command = $this->findCommand($completionInput, $output);
+            $command = $this->findCommand($completionInput);
             if (null === $command) {
                 $this->log('  No command found, completing using the Application class.');
 
@@ -185,7 +185,7 @@ private function createCompletionInput(InputInterface $input): CompletionInput
         return $completionInput;
     }
 
-    private function findCommand(CompletionInput $completionInput, OutputInterface $output): ?Command
+    private function findCommand(CompletionInput $completionInput): ?Command
     {
         try {
             $inputName = $completionInput->getFirstArgument();
diff --git a/src/Symfony/Component/Console/Descriptor/ReStructuredTextDescriptor.php b/src/Symfony/Component/Console/Descriptor/ReStructuredTextDescriptor.php
@@ -92,7 +92,7 @@ protected function describeInputOption(InputOption $option, array $options = [])
     protected function describeInputDefinition(InputDefinition $definition, array $options = []): void
     {
         if ($showArguments = ((bool) $definition->getArguments())) {
-            $this->write("Arguments\n".str_repeat($this->subsubsectionChar, 9))."\n\n";
+            $this->write("Arguments\n".str_repeat($this->subsubsectionChar, 9));
             foreach ($definition->getArguments() as $argument) {
                 $this->write("\n\n");
                 $this->describeInputArgument($argument);
diff --git a/src/Symfony/Component/Console/Descriptor/XmlDescriptor.php b/src/Symfony/Component/Console/Descriptor/XmlDescriptor.php
@@ -208,11 +208,9 @@ private function getInputOptionDocument(InputOption $option): \DOMDocument
             $defaults = \is_array($option->getDefault()) ? $option->getDefault() : (\is_bool($option->getDefault()) ? [var_export($option->getDefault(), true)] : ($option->getDefault() ? [$option->getDefault()] : []));
             $objectXML->appendChild($defaultsXML = $dom->createElement('defaults'));
 
-            if ($defaults) {
-                foreach ($defaults as $default) {
-                    $defaultsXML->appendChild($defaultXML = $dom->createElement('default'));
-                    $defaultXML->appendChild($dom->createTextNode($default));
-                }
+            foreach ($defaults as $default) {
+                $defaultsXML->appendChild($defaultXML = $dom->createElement('default'));
+                $defaultXML->appendChild($dom->createTextNode($default));
             }
         }
 
diff --git a/src/Symfony/Component/Console/Output/AnsiColorMode.php b/src/Symfony/Component/Console/Output/AnsiColorMode.php
@@ -62,7 +62,7 @@ public function convertFromHexToAnsiColorCode(string $hexColor): string
 
         return match ($this) {
             self::Ansi4 => (string) $this->convertFromRGB($r, $g, $b),
-            self::Ansi8 => '8;5;'.((string) $this->convertFromRGB($r, $g, $b)),
+            self::Ansi8 => '8;5;'.$this->convertFromRGB($r, $g, $b),
             self::Ansi24 => \sprintf('8;2;%d;%d;%d', $r, $g, $b),
         };
     }
diff --git a/src/Symfony/Component/Console/Output/TrimmedBufferOutput.php b/src/Symfony/Component/Console/Output/TrimmedBufferOutput.php
@@ -53,6 +53,6 @@ protected function doWrite(string $message, bool $newline): void
             $this->buffer .= \PHP_EOL;
         }
 
-        $this->buffer = substr($this->buffer, 0 - $this->maxLength);
+        $this->buffer = substr($this->buffer, -$this->maxLength);
     }
 }
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php b/src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php
@@ -689,9 +689,8 @@ private function getAliasesSuggestionForType(ContainerBuilder $container, string
             for ($i = 0, --$len; $i < $len; ++$i) {
                 $message .= \sprintf('%s "%s", ', class_exists($aliases[$i], false) ? 'class' : 'interface', $aliases[$i]);
             }
-            $message .= \sprintf('or %s "%s".', class_exists($aliases[$i], false) ? 'class' : 'interface', $aliases[$i]);
 
-            return $message;
+            return $message.\sprintf('or %s "%s".', class_exists($aliases[$i], false) ? 'class' : 'interface', $aliases[$i]);
         }
 
         if ($aliases) {
diff --git a/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php b/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
@@ -1020,7 +1020,7 @@ private function addInlineReference(string $id, Definition $definition, string $
             return $code;
         }
 
-        $code .= \sprintf(<<<'EOTXT'
+        return $code.\sprintf(<<<'EOTXT'
 
         if (isset($container->%s[%s])) {
             return $container->%1$s[%2$s];
@@ -1031,8 +1031,6 @@ private function addInlineReference(string $id, Definition $definition, string $
             $this->container->getDefinition($id)->isPublic() ? 'services' : 'privates',
             $this->doExport($id)
         );
-
-        return $code;
     }
 
     private function addInlineService(string $id, Definition $definition, ?Definition $inlineDef = null, bool $forConstructor = true): string
@@ -1670,7 +1668,7 @@ public function getParameterBag(): ParameterBagInterface
             $getDynamicParameter = str_repeat(' ', 8).'throw new ParameterNotFoundException($name);';
         }
 
-        $code .= <<<EOF
+        return $code.<<<EOF
 
     private \$loadedDynamicParameters = {$loadedDynamicParameters};
     private \$dynamicParameters = [];
@@ -1686,8 +1684,6 @@ protected function getDefaultParameters(): array
     }
 
 EOF;
-
-        return $code;
     }
 
     /**
@@ -1947,9 +1943,7 @@ private function dumpValue(mixed $value, bool $interpolate = true): string
             } else {
                 $replaceParameters = fn ($match) => "'.".$this->dumpParameter($match[2]).".'";
 
-                $code = str_replace('%%', '%', preg_replace_callback('/(?<!%)(%)([^%]+)\1/', $replaceParameters, $this->export($value)));
-
-                return $code;
+                return str_replace('%%', '%', preg_replace_callback('/(?<!%)(%)([^%]+)\1/', $replaceParameters, $this->export($value)));
             }
         } elseif ($value instanceof \UnitEnum) {
             return \sprintf('\%s::%s', $value::class, $value->name);
@@ -2102,11 +2096,8 @@ private function getNextVariableName(): string
         while (true) {
             $name = '';
             $i = $this->variableCount;
-
-            if ('' === $name) {
-                $name .= $firstChars[$i % $firstCharsLength];
-                $i = (int) ($i / $firstCharsLength);
-            }
+            $name .= $firstChars[$i % $firstCharsLength];
+            $i = (int) ($i / $firstCharsLength);
 
             while ($i > 0) {
                 --$i;
diff --git a/src/Symfony/Component/DependencyInjection/Loader/UndefinedExtensionHandler.php b/src/Symfony/Component/DependencyInjection/Loader/UndefinedExtensionHandler.php
@@ -39,8 +39,6 @@ public static function getErrorMessage(string $extensionName, ?string $loadingFi
             default => \sprintf('There is no extension able to load the configuration for "%s". ', $extensionName),
         };
 
-        $message .= \sprintf('Looked for namespace "%s", found "%s".', $namespaceOrAlias, $foundExtensionNamespaces ? implode('", "', $foundExtensionNamespaces) : 'none');
-
-        return $message;
+        return $message.\sprintf('Looked for namespace "%s", found "%s".', $namespaceOrAlias, $foundExtensionNamespaces ? implode('", "', $foundExtensionNamespaces) : 'none');
     }
 }
diff --git a/src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php b/src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php
@@ -347,10 +347,10 @@ private function parseDefinition(\DOMElement $service, string $file, Definition
         foreach ($tags as $tag) {
             $tagNameComesFromAttribute = $tag->childElementCount || '' === $tag->nodeValue;
             if ('' === $tagName = $tagNameComesFromAttribute ? $tag->getAttribute('name') : $tag->nodeValue) {
-                throw new InvalidArgumentException(\sprintf('The tag name for service "%s" in "%s" must be a non-empty string.', (string) $service->getAttribute('id'), $file));
+                throw new InvalidArgumentException(\sprintf('The tag name for service "%s" in "%s" must be a non-empty string.', $service->getAttribute('id'), $file));
             }
 
-            $parameters = $this->getTagAttributes($tag, \sprintf('The attribute name of tag "%s" for service "%s" in %s must be a non-empty string.', $tagName, (string) $service->getAttribute('id'), $file));
+            $parameters = $this->getTagAttributes($tag, \sprintf('The attribute name of tag "%s" for service "%s" in %s must be a non-empty string.', $tagName, $service->getAttribute('id'), $file));
             foreach ($tag->attributes as $name => $node) {
                 if ($tagNameComesFromAttribute && 'name' === $name) {
                     continue;
@@ -401,7 +401,7 @@ private function parseDefinition(\DOMElement $service, string $file, Definition
 
         if ($callable = $this->getChildren($service, 'from-callable')) {
             if ($definition instanceof ChildDefinition) {
-                throw new InvalidArgumentException(\sprintf('Attribute "parent" is unsupported when using "<from-callable>" on service "%s".', (string) $service->getAttribute('id')));
+                throw new InvalidArgumentException(\sprintf('Attribute "parent" is unsupported when using "<from-callable>" on service "%s".', $service->getAttribute('id')));
             }
 
             foreach ([
@@ -414,7 +414,7 @@ private function parseDefinition(\DOMElement $service, string $file, Definition
                 'Tag "<call>"' => 'getMethodCalls',
             ] as $key => $method) {
                 if ($definition->$method()) {
-                    throw new InvalidArgumentException($key.\sprintf(' is unsupported when using "<from-callable>" on service "%s".', (string) $service->getAttribute('id')));
+                    throw new InvalidArgumentException($key.\sprintf(' is unsupported when using "<from-callable>" on service "%s".', $service->getAttribute('id')));
                 }
             }
 

Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ public function warmUp(string $cacheDir, ?string $buildDir = null): array`
`58`	`58`	`*/`
`59`	`59`	`protected function warmUpPhpArrayAdapter(PhpArrayAdapter $phpArrayAdapter, array $values): array`
`60`	`60`	`{`
`61`		`- return (array) $phpArrayAdapter->warmUp($values);`
	`61`	`+ return $phpArrayAdapter->warmUp($values);`
`62`	`62`	`}`
`63`	`63`
`64`	`64`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,7 @@ protected function describeContainerService(object $service, array $options = []`
`64`	`64`
`65`	`65`	`protected function describeContainerServices(ContainerBuilder $container, array $options = []): void`
`66`	`66`	`{`
`67`		`- $this->writeDocument($this->getContainerServicesDocument($container, $options['tag'] ?? null, isset($options['show_hidden']) && $options['show_hidden'], isset($options['show_arguments']) && $options['show_arguments'], $options['filter'] ?? null, $options['id'] ?? null));`
	`67`	`+ $this->writeDocument($this->getContainerServicesDocument($container, $options['tag'] ?? null, isset($options['show_hidden']) && $options['show_hidden'], isset($options['show_arguments']) && $options['show_arguments'], $options['filter'] ?? null));`
`68`	`68`	`}`
`69`	`69`
`70`	`70`	`protected function describeContainerDefinition(Definition $definition, array $options = [], ?ContainerBuilder $container = null): void`
`@@ -288,7 +288,7 @@ private function getContainerServiceDocument(object $service, string $id, ?Conta`
`288`	`288`	`return $dom;`
`289`	`289`	`}`
`290`	`290`
`291`		`- private function getContainerServicesDocument(ContainerBuilder $container, ?string $tag = null, bool $showHidden = false, bool $showArguments = false, ?callable $filter = null, ?string $id = null): \DOMDocument`
	`291`	`+ private function getContainerServicesDocument(ContainerBuilder $container, ?string $tag = null, bool $showHidden = false, bool $showArguments = false, ?callable $filter = null): \DOMDocument`
`292`	`292`	`{`
`293`	`293`	`$dom = new \DOMDocument('1.0', 'UTF-8');`
`294`	`294`	`$dom->appendChild($containerXML = $dom->createElement('container'));`
Original file line number	Diff line number	Diff line change
`@@ -498,7 +498,7 @@ public function load(array $configs, ContainerBuilder $container): void`
`498`	`498`	`if (!$messengerEnabled) {`
`499`	`499`	`throw new LogicException('Scheduler support cannot be enabled as the Messenger component is not '.(interface_exists(MessageBusInterface::class) ? 'enabled.' : 'installed. Try running "composer require symfony/messenger".'));`
`500`	`500`	`}`
`501`		`- $this->registerSchedulerConfiguration($config['scheduler'], $container, $loader);`
	`501`	`+ $this->registerSchedulerConfiguration($container, $loader);`
`502`	`502`	`} else {`
`503`	`503`	`$container->removeDefinition('cache.scheduler');`
`504`	`504`	`$container->removeDefinition('console.command.scheduler_debug');`
`@@ -570,7 +570,7 @@ public function load(array $configs, ContainerBuilder $container): void`
`570`	`570`	`}`
`571`	`571`
`572`	`572`	`if ($this->readConfigEnabled('remote-event', $container, $config['remote-event'])) {`
`573`		`- $this->registerRemoteEventConfiguration($config['remote-event'], $container, $loader);`
	`573`	`+ $this->registerRemoteEventConfiguration($loader);`
`574`	`574`	`}`
`575`	`575`
`576`	`576`	`if ($this->readConfigEnabled('html_sanitizer', $container, $config['html_sanitizer'])) {`
`@@ -2073,7 +2073,7 @@ private function registerSemaphoreConfiguration(array $config, ContainerBuilder`
`2073`	`2073`	`}`
`2074`	`2074`	`}`
`2075`	`2075`
`2076`		`- private function registerSchedulerConfiguration(array $config, ContainerBuilder $container, PhpFileLoader $loader): void`
	`2076`	`+ private function registerSchedulerConfiguration(ContainerBuilder $container, PhpFileLoader $loader): void`
`2077`	`2077`	`{`
`2078`	`2078`	`if (!class_exists(SchedulerTransportFactory::class)) {`
`2079`	`2079`	`throw new LogicException('Scheduler support cannot be enabled as the Scheduler component is not installed. Try running "composer require symfony/scheduler".');`
`@@ -2940,7 +2940,7 @@ private function registerWebhookConfiguration(array $config, ContainerBuilder $c`
`2940`	`2940`	`$controller->replaceArgument(1, new Reference($config['message_bus']));`
`2941`	`2941`	`}`
`2942`	`2942`
`2943`		`- private function registerRemoteEventConfiguration(array $config, ContainerBuilder $container, PhpFileLoader $loader): void`
	`2943`	`+ private function registerRemoteEventConfiguration(PhpFileLoader $loader): void`
`2944`	`2944`	`{`
`2945`	`2945`	`if (!class_exists(RemoteEvent::class)) {`
`2946`	`2946`	`throw new LogicException('RemoteEvent support cannot be enabled as the component is not installed. Try running "composer require symfony/remote-event".');`
Original file line number	Diff line number	Diff line change
`@@ -186,7 +186,7 @@ public function commit(): bool`
`186`	`186`	`$e = $this->doSave($values, $lifetime, $addTagData, $removeTagData);`
`187`	`187`	`} catch (\Exception $e) {`
`188`	`188`	`}`
`189`		`- if (true === $e \|\| [] === $e) {`
	`189`	`+ if ([] === $e) {`
`190`	`190`	`continue;`
`191`	`191`	`}`
`192`	`192`	`if (\is_array($e) \|\| 1 === \count($values)) {`
`@@ -213,7 +213,7 @@ public function commit(): bool`
`213`	`213`	`$e = $this->doSave($values, $lifetime, $addTagData, $removeTagData);`
`214`	`214`	`} catch (\Exception $e) {`
`215`	`215`	`}`
`216`		`- if (true === $e \|\| [] === $e) {`
	`216`	`+ if ([] === $e) {`
`217`	`217`	`continue;`
`218`	`218`	`}`
`219`	`219`	`$ok = false;`
Original file line number	Diff line number	Diff line change
`@@ -193,7 +193,6 @@ private function writeArray(array $array, int $depth, bool $asComment = false):`
`193`	`193`	`} else {`
`194`	`194`	`$val = $value;`
`195`	`195`	`}`
`196`		`- $prefix = $asComment ? '# ' : '';`
`197`	`196`
`198`	`197`	`$prefix = $asComment ? '# ' : '';`
`199`	`198`
Original file line number	Diff line number	Diff line change
`@@ -217,10 +217,8 @@ protected function normalizeValue(mixed $value): mixed`
`217`	`217`	`$valuePrototype = current($this->valuePrototypes) ?: clone $children['value'];`
`218`	`218`	`$valuePrototype->parent = $this;`
`219`	`219`	`$originalClosures = $this->prototype->normalizationClosures;`
`220`		`- if (\is_array($originalClosures)) {`
`221`		`- $valuePrototypeClosures = $valuePrototype->normalizationClosures;`
`222`		`- $valuePrototype->normalizationClosures = \is_array($valuePrototypeClosures) ? array_merge($originalClosures, $valuePrototypeClosures) : $originalClosures;`
`223`		`- }`
	`220`	`+ $valuePrototypeClosures = $valuePrototype->normalizationClosures;`
	`221`	`+ $valuePrototype->normalizationClosures = \is_array($valuePrototypeClosures) ? array_merge($originalClosures, $valuePrototypeClosures) : $originalClosures;`
`224`	`222`	`$this->valuePrototypes[$k] = $valuePrototype;`
`225`	`223`	`}`
`226`	`224`	`}`
Original file line number	Diff line number	Diff line change
`@@ -92,7 +92,7 @@ protected function describeInputOption(InputOption $option, array $options = [])`
`92`	`92`	`protected function describeInputDefinition(InputDefinition $definition, array $options = []): void`
`93`	`93`	`{`
`94`	`94`	`if ($showArguments = ((bool) $definition->getArguments())) {`
`95`		`- $this->write("Arguments\n".str_repeat($this->subsubsectionChar, 9))."\n\n";`
	`95`	`+ $this->write("Arguments\n".str_repeat($this->subsubsectionChar, 9));`
`96`	`96`	`foreach ($definition->getArguments() as $argument) {`
`97`	`97`	`$this->write("\n\n");`
`98`	`98`	`$this->describeInputArgument($argument);`
Original file line number	Diff line number	Diff line change
`@@ -208,11 +208,9 @@ private function getInputOptionDocument(InputOption $option): \DOMDocument`
`208`	`208`	`$defaults = \is_array($option->getDefault()) ? $option->getDefault() : (\is_bool($option->getDefault()) ? [var_export($option->getDefault(), true)] : ($option->getDefault() ? [$option->getDefault()] : []));`
`209`	`209`	`$objectXML->appendChild($defaultsXML = $dom->createElement('defaults'));`
`210`	`210`
`211`		`- if ($defaults) {`
`212`		`- foreach ($defaults as $default) {`
`213`		`- $defaultsXML->appendChild($defaultXML = $dom->createElement('default'));`
`214`		`- $defaultXML->appendChild($dom->createTextNode($default));`
`215`		`- }`
	`211`	`+ foreach ($defaults as $default) {`
	`212`	`+ $defaultsXML->appendChild($defaultXML = $dom->createElement('default'));`
	`213`	`+ $defaultXML->appendChild($dom->createTextNode($default));`
`216`	`214`	`}`
`217`	`215`	`}`
`218`	`216`