minor symfony#53119 Code updates (javiereguiluz)

nicolas-grekas · nicolas-grekas · commit 0239634f0c8e · 2023-12-18T18:36:04.000+01:00
This PR was squashed before being merged into the 7.1 branch. Discussion ---------- Code updates | Q | A | ------------- | --- | Branch? | 7.1 | Bug fix? | no | New feature? | no | Deprecations? | no | Issues | - | License | MIT For your consideration, this PR includes several simplifications/improvements to code as suggested by PHPStorm inspection tools. Commits ------- e290334 Code updates
diff --git a/.github/get-modified-packages.php b/.github/get-modified-packages.php
@@ -19,31 +19,15 @@
 
 function getPackageType(string $packageDir): string
 {
-    if (preg_match('@Symfony/Bridge/@', $packageDir)) {
-        return 'bridge';
-    }
-
-    if (preg_match('@Symfony/Bundle/@', $packageDir)) {
-        return 'bundle';
-    }
-
-    if (preg_match('@Symfony/Component/[^/]+/Bridge/@', $packageDir)) {
-        return 'component_bridge';
-    }
-
-    if (preg_match('@Symfony/Component/@', $packageDir)) {
-        return 'component';
-    }
-
-    if (preg_match('@Symfony/Contracts/@', $packageDir)) {
-        return 'contract';
-    }
-
-    if (preg_match('@Symfony/Contracts$@', $packageDir)) {
-        return 'contracts';
-    }
-
-    throw new \LogicException();
+    return match (true) {
+        str_contains($packageDir, 'Symfony/Bridge/') => 'bridge',
+        str_contains($packageDir, 'Symfony/Bundle/') => 'bundle',
+        preg_match('@Symfony/Component/[^/]+/Bridge/@', $packageDir) => 'component_bridge',
+        str_contains($packageDir, 'Symfony/Component/') => 'component',
+        str_contains($packageDir, 'Symfony/Contracts/') => 'contract',
+        str_ends_with($packageDir, 'Symfony/Contracts') => 'contracts',
+        default => throw new \LogicException(),
+    };
 }
 
 $newPackage = [];
diff --git a/src/Symfony/Bridge/Doctrine/DataCollector/DoctrineDataCollector.php b/src/Symfony/Bridge/Doctrine/DataCollector/DoctrineDataCollector.php
@@ -163,8 +163,7 @@ private function sanitizeQuery(string $connectionName, array $query): array
                     $query['types'][$j] = $type->getBindingType();
                     try {
                         $param = $type->convertToDatabaseValue($param, $this->registry->getConnection($connectionName)->getDatabasePlatform());
-                    } catch (\TypeError $e) {
-                    } catch (ConversionException $e) {
+                    } catch (\TypeError|ConversionException) {
                     }
                 }
             }
diff --git a/src/Symfony/Bridge/Twig/Command/DebugCommand.php b/src/Symfony/Bridge/Twig/Command/DebugCommand.php
@@ -587,11 +587,7 @@ private function getFilesystemLoaders(): array
 
     private function getFileLink(string $absolutePath): string
     {
-        if (null === $this->fileLinkFormatter) {
-            return '';
-        }
-
-        return (string) $this->fileLinkFormatter->format($absolutePath, 1);
+        return (string) $this->fileLinkFormatter?->format($absolutePath, 1);
     }
 
     private function getAvailableFormatOptions(): array
diff --git a/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/JsonDescriptor.php b/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/JsonDescriptor.php
@@ -323,7 +323,7 @@ private function getContainerAliasData(Alias $alias): array
     private function getEventDispatcherListenersData(EventDispatcherInterface $eventDispatcher, array $options): array
     {
         $data = [];
-        $event = \array_key_exists('event', $options) ? $options['event'] : null;
+        $event = $options['event'] ?? null;
 
         if (null !== $event) {
             foreach ($eventDispatcher->getListeners($event) as $listener) {
diff --git a/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/XmlDescriptor.php b/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/XmlDescriptor.php
@@ -501,7 +501,7 @@ private function getContainerParameterDocument(mixed $parameter, ?array $depreca
 
     private function getEventDispatcherListenersDocument(EventDispatcherInterface $eventDispatcher, array $options): \DOMDocument
     {
-        $event = \array_key_exists('event', $options) ? $options['event'] : null;
+        $event = $options['event'] ?? null;
         $dom = new \DOMDocument('1.0', 'UTF-8');
         $dom->appendChild($eventDispatcherXML = $dom->createElement('event-dispatcher'));
 
diff --git a/src/Symfony/Bundle/SecurityBundle/Security/FirewallMap.php b/src/Symfony/Bundle/SecurityBundle/Security/FirewallMap.php
@@ -46,13 +46,7 @@ public function getListeners(Request $request): array
 
     public function getFirewallConfig(Request $request): ?FirewallConfig
     {
-        $context = $this->getFirewallContext($request);
-
-        if (null === $context) {
-            return null;
-        }
-
-        return $context->getConfig();
+        return $this->getFirewallContext($request)?->getConfig();
     }
 
     private function getFirewallContext(Request $request): ?FirewallContext
diff --git a/src/Symfony/Component/Console/Helper/Table.php b/src/Symfony/Component/Console/Helper/Table.php
@@ -717,7 +717,7 @@ private function fillNextRows(array $rows, int $line): array
 
         foreach ($unmergedRows as $unmergedRowKey => $unmergedRow) {
             // we need to know if $unmergedRow will be merged or inserted into $rows
-            if (isset($rows[$unmergedRowKey]) && \is_array($rows[$unmergedRowKey]) && ($this->getNumberOfColumns($rows[$unmergedRowKey]) + $this->getNumberOfColumns($unmergedRows[$unmergedRowKey]) <= $this->numberOfColumns)) {
+            if (isset($rows[$unmergedRowKey]) && \is_array($rows[$unmergedRowKey]) && ($this->getNumberOfColumns($rows[$unmergedRowKey]) + $this->getNumberOfColumns($unmergedRow) <= $this->numberOfColumns)) {
                 foreach ($unmergedRow as $cellKey => $cell) {
                     // insert cell into row at cellKey position
                     array_splice($rows[$unmergedRowKey], $cellKey, 0, [$cell]);
@@ -726,7 +726,7 @@ private function fillNextRows(array $rows, int $line): array
                 $row = $this->copyRow($rows, $unmergedRowKey - 1);
                 foreach ($unmergedRow as $column => $cell) {
                     if (!empty($cell)) {
-                        $row[$column] = $unmergedRow[$column];
+                        $row[$column] = $cell;
                     }
                 }
                 array_splice($rows, $unmergedRowKey, 0, [$row]);
diff --git a/src/Symfony/Component/Dotenv/Dotenv.php b/src/Symfony/Component/Dotenv/Dotenv.php
@@ -463,7 +463,7 @@ private function resolveCommands(string $value, array $loadedVars): string
                 throw $this->createFormatException(sprintf('Issue expanding a command (%s)', $process->getErrorOutput()));
             }
 
-            return preg_replace('/[\r\n]+$/', '', $process->getOutput());
+            return rtrim($process->getOutput(), "\n\r");
         }, $value);
     }
 
diff --git a/src/Symfony/Component/Filesystem/Path.php b/src/Symfony/Component/Filesystem/Path.php
@@ -346,13 +346,13 @@ public static function changeExtension(string $path, string $extension): string
         $extension = ltrim($extension, '.');
 
         // No extension for paths
-        if ('/' === substr($path, -1)) {
+        if (str_ends_with($path, '/')) {
             return $path;
         }
 
         // No actual extension in path
         if (empty($actualExtension)) {
-            return $path.('.' === substr($path, -1) ? '' : '.').$extension;
+            return $path.(str_ends_with($path, '.') ? '' : '.').$extension;
         }
 
         return substr($path, 0, -\strlen($actualExtension)).$extension;
diff --git a/src/Symfony/Component/Form/Console/Descriptor/Descriptor.php b/src/Symfony/Component/Form/Console/Descriptor/Descriptor.php
@@ -128,7 +128,7 @@ protected function getOptionDefinition(OptionsResolver $optionsResolver, string
             }
         }
 
-        if (isset($definition['deprecation']) && isset($definition['deprecation']['message']) && \is_string($definition['deprecation']['message'])) {
+        if (isset($definition['deprecation']['message']) && \is_string($definition['deprecation']['message'])) {
             $definition['deprecationMessage'] = strtr($definition['deprecation']['message'], ['%name%' => $option]);
             $definition['deprecationPackage'] = $definition['deprecation']['package'];
             $definition['deprecationVersion'] = $definition['deprecation']['version'];
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/ChoiceType.php b/src/Symfony/Component/Form/Extension/Core/Type/ChoiceType.php
@@ -437,7 +437,7 @@ private function createChoiceList(array $options): ChoiceListInterface
         }
 
         // Harden against NULL values (like in EntityType and ModelType)
-        $choices = null !== $options['choices'] ? $options['choices'] : [];
+        $choices = $options['choices'] ?? [];
 
         return $this->choiceListFactory->createListFromChoices(
             $choices,
diff --git a/src/Symfony/Component/Form/Util/OrderedHashMapIterator.php b/src/Symfony/Component/Form/Util/OrderedHashMapIterator.php
@@ -98,10 +98,6 @@ public function next(): void
 
     public function key(): mixed
     {
-        if (null === $this->key) {
-            return null;
-        }
-
         return $this->key;
     }
 
diff --git a/src/Symfony/Component/HttpClient/CurlHttpClient.php b/src/Symfony/Component/HttpClient/CurlHttpClient.php
@@ -106,7 +106,7 @@ public function request(string $method, string $url, array $options = []): Respo
             \CURLOPT_PROTOCOLS => \CURLPROTO_HTTP | \CURLPROTO_HTTPS,
             \CURLOPT_REDIR_PROTOCOLS => \CURLPROTO_HTTP | \CURLPROTO_HTTPS,
             \CURLOPT_FOLLOWLOCATION => true,
-            \CURLOPT_MAXREDIRS => 0 < $options['max_redirects'] ? $options['max_redirects'] : 0,
+            \CURLOPT_MAXREDIRS => max(0, $options['max_redirects']),
             \CURLOPT_COOKIEFILE => '', // Keep track of cookies during redirects
             \CURLOPT_TIMEOUT => 0,
             \CURLOPT_PROXY => $proxy,
diff --git a/src/Symfony/Component/HttpFoundation/Cookie.php b/src/Symfony/Component/HttpFoundation/Cookie.php
@@ -340,7 +340,7 @@ public function getMaxAge(): int
     {
         $maxAge = $this->expire - time();
 
-        return 0 >= $maxAge ? 0 : $maxAge;
+        return max(0, $maxAge);
     }
 
     /**
diff --git a/src/Symfony/Component/Messenger/Bridge/AmazonSqs/Transport/Connection.php b/src/Symfony/Component/Messenger/Bridge/AmazonSqs/Transport/Connection.php
@@ -358,8 +358,8 @@ public function send(string $body, array $headers, int $delay = 0, string $messa
         }
 
         if (self::isFifoQueue($this->configuration['queue_name'])) {
-            $parameters['MessageGroupId'] = null !== $messageGroupId ? $messageGroupId : __METHOD__;
-            $parameters['MessageDeduplicationId'] = null !== $messageDeduplicationId ? $messageDeduplicationId : sha1(json_encode(['body' => $body, 'headers' => $headers]));
+            $parameters['MessageGroupId'] = $messageGroupId ?? __METHOD__;
+            $parameters['MessageDeduplicationId'] = $messageDeduplicationId ?? sha1(json_encode(['body' => $body, 'headers' => $headers]));
             unset($parameters['DelaySeconds']);
         }
 
diff --git a/src/Symfony/Component/Messenger/DependencyInjection/MessengerPass.php b/src/Symfony/Component/Messenger/DependencyInjection/MessengerPass.php
@@ -138,7 +138,7 @@ private function registerHandlers(ContainerBuilder $container, array $busIds): v
                 }
 
                 if (null === $message) {
-                    throw new RuntimeException(sprintf('Invalid handler service "%s": the list of messages to handle is empty.', $serviceId, $r->getName()));
+                    throw new RuntimeException(sprintf('Invalid handler service "%s": the list of messages to handle is empty.', $serviceId));
                 }
             }
         }
diff --git a/src/Symfony/Component/Mime/CharacterStream.php b/src/Symfony/Component/Mime/CharacterStream.php
@@ -111,7 +111,7 @@ public function read(int $length): ?string
             $this->currentPos += $length;
         } else {
             $end = $this->currentPos + $length;
-            $end = $end > $this->charCount ? $this->charCount : $end;
+            $end = min($end, $this->charCount);
             $ret = '';
             $start = 0;
             if ($this->currentPos > 0) {
diff --git a/src/Symfony/Component/Notifier/Bridge/Ntfy/NtfyOptions.php b/src/Symfony/Component/Notifier/Bridge/Ntfy/NtfyOptions.php
@@ -67,16 +67,12 @@ public function setTitle(string $title): self
 
     public function setStringPriority(string $priority): self
     {
-        switch ($priority) {
-            case Notification::IMPORTANCE_URGENT:
-                return $this->setPriority(self::PRIORITY_URGENT);
-            case Notification::IMPORTANCE_HIGH:
-                return $this->setPriority(self::PRIORITY_HIGH);
-            case Notification::IMPORTANCE_LOW:
-                return $this->setPriority(self::PRIORITY_LOW);
-            default:
-                return $this->setPriority(self::PRIORITY_DEFAULT);
-        }
+        return match ($priority) {
+            Notification::IMPORTANCE_URGENT => $this->setPriority(self::PRIORITY_URGENT),
+            Notification::IMPORTANCE_HIGH => $this->setPriority(self::PRIORITY_HIGH),
+            Notification::IMPORTANCE_LOW => $this->setPriority(self::PRIORITY_LOW),
+            default => $this->setPriority(self::PRIORITY_DEFAULT),
+        };
     }
 
     public function setPriority(int $priority): self
diff --git a/src/Symfony/Component/PropertyAccess/PropertyAccessor.php b/src/Symfony/Component/PropertyAccess/PropertyAccessor.php
@@ -214,9 +214,7 @@ public function isReadable(object|array $objectOrArray, string|PropertyPathInter
             $this->readPropertiesUntil($zval, $propertyPath, $propertyPath->getLength(), $this->ignoreInvalidIndices);
 
             return true;
-        } catch (AccessException) {
-            return false;
-        } catch (UnexpectedTypeException) {
+        } catch (AccessException|UnexpectedTypeException) {
             return false;
         }
     }
@@ -249,9 +247,7 @@ public function isWritable(object|array $objectOrArray, string|PropertyPathInter
             }
 
             return true;
-        } catch (AccessException) {
-            return false;
-        } catch (UnexpectedTypeException) {
+        } catch (AccessException|UnexpectedTypeException) {
             return false;
         }
     }
diff --git a/src/Symfony/Component/Security/Core/Authorization/Voter/RoleVoter.php b/src/Symfony/Component/Security/Core/Authorization/Voter/RoleVoter.php
@@ -38,10 +38,8 @@ public function vote(TokenInterface $token, mixed $subject, array $attributes):
             }
 
             $result = VoterInterface::ACCESS_DENIED;
-            foreach ($roles as $role) {
-                if ($attribute === $role) {
-                    return VoterInterface::ACCESS_GRANTED;
-                }
+            if (\in_array($attribute, $roles, true)) {
+                return VoterInterface::ACCESS_GRANTED;
             }
         }
 
diff --git a/src/Symfony/Component/Security/Http/Firewall/ContextListener.php b/src/Symfony/Component/Security/Http/Firewall/ContextListener.php
@@ -283,7 +283,7 @@ private static function hasUserChanged(UserInterface $originalUser, TokenInterfa
         $refreshedUser = $refreshedToken->getUser();
 
         if ($originalUser instanceof EquatableInterface) {
-            return !(bool) $originalUser->isEqualTo($refreshedUser);
+            return !$originalUser->isEqualTo($refreshedUser);
         }
 
         if ($originalUser instanceof PasswordAuthenticatedUserInterface || $refreshedUser instanceof PasswordAuthenticatedUserInterface) {
diff --git a/src/Symfony/Component/Security/Http/HttpUtils.php b/src/Symfony/Component/Security/Http/HttpUtils.php
@@ -121,9 +121,7 @@ public function checkRequestPath(Request $request, string $path): bool
                 }
 
                 return isset($parameters['_route']) && $path === $parameters['_route'];
-            } catch (MethodNotAllowedException) {
-                return false;
-            } catch (ResourceNotFoundException) {
+            } catch (MethodNotAllowedException|ResourceNotFoundException) {
                 return false;
             }
         }
diff --git a/src/Symfony/Component/Security/Http/Session/SessionAuthenticationStrategy.php b/src/Symfony/Component/Security/Http/Session/SessionAuthenticationStrategy.php
@@ -51,10 +51,7 @@ public function onAuthentication(Request $request, TokenInterface $token): void
 
             case self::MIGRATE:
                 $request->getSession()->migrate(true);
-
-                if ($this->csrfTokenStorage) {
-                    $this->csrfTokenStorage->clear();
-                }
+                $this->csrfTokenStorage?->clear();
 
                 return;
 
diff --git a/src/Symfony/Component/Serializer/Normalizer/DataUriNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/DataUriNormalizer.php
@@ -89,7 +89,7 @@ public function supportsNormalization(mixed $data, string $format = null, array
      */
     public function denormalize(mixed $data, string $type, string $format = null, array $context = []): \SplFileInfo
     {
-        if (null === $data || !preg_match('/^data:([a-z0-9][a-z0-9\!\#\$\&\-\^\_\+\.]{0,126}\/[a-z0-9][a-z0-9\!\#\$\&\-\^\_\+\.]{0,126}(;[a-z0-9\-]+\=[a-z0-9\-]+)?)?(;base64)?,[a-z0-9\!\$\&\\\'\,\(\)\*\+\,\;\=\-\.\_\~\:\@\/\?\%\s]*\s*$/i', $data)) {
+        if (null === $data || !preg_match('/^data:([a-z0-9][a-z0-9\!\#\$\&\-\^\_\+\.]{0,126}\/[a-z0-9][a-z0-9\!\#\$\&\-\^\_\+\.]{0,126}(;[a-z0-9\-]+\=[a-z0-9\-]+)?)?(;base64)?,[a-z0-9\!\$\&\\\'\,\(\)\*\+\;\=\-\.\_\~\:\@\/\?\%\s]*\s*$/i', $data)) {
             throw NotNormalizableValueException::createForUnexpectedDataType('The provided "data:" URI is not valid.', $data, ['string'], $context['deserialization_path'] ?? null, true);
         }
 
diff --git a/src/Symfony/Component/Validator/Constraints/UniqueValidator.php b/src/Symfony/Component/Validator/Constraints/UniqueValidator.php
@@ -60,11 +60,7 @@ public function validate(mixed $value, Constraint $constraint): void
 
     private function getNormalizer(Unique $unique): callable
     {
-        if (null === $unique->normalizer) {
-            return static fn ($value) => $value;
-        }
-
-        return $unique->normalizer;
+        return $unique->normalizer ?? static fn ($value) => $value;
     }
 
     private function reduceElementKeys(array $fields, array $element): array
diff --git a/src/Symfony/Component/VarDumper/Dumper/AbstractDumper.php b/src/Symfony/Component/VarDumper/Dumper/AbstractDumper.php
@@ -90,7 +90,7 @@ public function setCharset(string $charset): string
         $prev = $this->charset;
 
         $charset = strtoupper($charset);
-        $charset = null === $charset || 'UTF-8' === $charset || 'UTF8' === $charset ? 'CP1252' : $charset;
+        $charset = 'UTF-8' === $charset || 'UTF8' === $charset ? 'CP1252' : $charset;
 
         $this->charset = $charset;
 
diff --git a/src/Symfony/Component/Yaml/Dumper.php b/src/Symfony/Component/Yaml/Dumper.php
@@ -169,7 +169,7 @@ private function getBlockIndentationIndicator(string $value): string
         // http://www.yaml.org/spec/1.2/spec.html#id2793979
         foreach ($lines as $line) {
             if ('' !== trim($line, ' ')) {
-                return (' ' === substr($line, 0, 1)) ? (string) $this->indentation : '';
+                return str_starts_with($line, ' ') ? (string) $this->indentation : '';
             }
         }
 
diff --git a/src/Symfony/Component/Yaml/Escaper.php b/src/Symfony/Component/Yaml/Escaper.php
@@ -80,7 +80,7 @@ public static function requiresSingleQuoting(string $value): bool
 
         // Determines if the PHP value contains any single characters that would
         // cause it to require single quoting in YAML.
-        return 0 < preg_match('/[ \s \' " \: \{ \} \[ \] , & \* \# \?] | \A[ \- ? | < > = ! % @ ` \p{Zs}]/xu', $value);
+        return 0 < preg_match('/[\s\'"\:\{\}\[\],&\*\#\?] | \A[\-?|<>=!%@`\p{Zs}]/xu', $value);
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -163,8 +163,7 @@ private function sanitizeQuery(string $connectionName, array $query): array`
`163`	`163`	`$query['types'][$j] = $type->getBindingType();`
`164`	`164`	`try {`
`165`	`165`	`$param = $type->convertToDatabaseValue($param, $this->registry->getConnection($connectionName)->getDatabasePlatform());`
`166`		`- } catch (\TypeError $e) {`
`167`		`- } catch (ConversionException $e) {`
	`166`	`+ } catch (\TypeError\|ConversionException) {`
`168`	`167`	`}`
`169`	`168`	`}`
`170`	`169`	`}`
Original file line number	Diff line number	Diff line change
`@@ -587,11 +587,7 @@ private function getFilesystemLoaders(): array`
`587`	`587`
`588`	`588`	`private function getFileLink(string $absolutePath): string`
`589`	`589`	`{`
`590`		`- if (null === $this->fileLinkFormatter) {`
`591`		`- return '';`
`592`		`- }`
`593`		`-`
`594`		`- return (string) $this->fileLinkFormatter->format($absolutePath, 1);`
	`590`	`+ return (string) $this->fileLinkFormatter?->format($absolutePath, 1);`
`595`	`591`	`}`
`596`	`592`
`597`	`593`	`private function getAvailableFormatOptions(): array`
Original file line number	Diff line number	Diff line change
`@@ -323,7 +323,7 @@ private function getContainerAliasData(Alias $alias): array`
`323`	`323`	`private function getEventDispatcherListenersData(EventDispatcherInterface $eventDispatcher, array $options): array`
`324`	`324`	`{`
`325`	`325`	`$data = [];`
`326`		`- $event = \array_key_exists('event', $options) ? $options['event'] : null;`
	`326`	`+ $event = $options['event'] ?? null;`
`327`	`327`
`328`	`328`	`if (null !== $event) {`
`329`	`329`	`foreach ($eventDispatcher->getListeners($event) as $listener) {`
Original file line number	Diff line number	Diff line change
`@@ -501,7 +501,7 @@ private function getContainerParameterDocument(mixed $parameter, ?array $depreca`
`501`	`501`
`502`	`502`	`private function getEventDispatcherListenersDocument(EventDispatcherInterface $eventDispatcher, array $options): \DOMDocument`
`503`	`503`	`{`
`504`		`- $event = \array_key_exists('event', $options) ? $options['event'] : null;`
	`504`	`+ $event = $options['event'] ?? null;`
`505`	`505`	`$dom = new \DOMDocument('1.0', 'UTF-8');`
`506`	`506`	`$dom->appendChild($eventDispatcherXML = $dom->createElement('event-dispatcher'));`
`507`	`507`
Original file line number	Diff line number	Diff line change
`@@ -46,13 +46,7 @@ public function getListeners(Request $request): array`
`46`	`46`
`47`	`47`	`public function getFirewallConfig(Request $request): ?FirewallConfig`
`48`	`48`	`{`
`49`		`- $context = $this->getFirewallContext($request);`
`50`		`-`
`51`		`- if (null === $context) {`
`52`		`- return null;`
`53`		`- }`
`54`		`-`
`55`		`- return $context->getConfig();`
	`49`	`+ return $this->getFirewallContext($request)?->getConfig();`
`56`	`50`	`}`
`57`	`51`
`58`	`52`	`private function getFirewallContext(Request $request): ?FirewallContext`
Original file line number	Diff line number	Diff line change
`@@ -463,7 +463,7 @@ private function resolveCommands(string $value, array $loadedVars): string`
`463`	`463`	`throw $this->createFormatException(sprintf('Issue expanding a command (%s)', $process->getErrorOutput()));`
`464`	`464`	`}`
`465`	`465`
`466`		`- return preg_replace('/[\r\n]+$/', '', $process->getOutput());`
	`466`	`+ return rtrim($process->getOutput(), "\n\r");`
`467`	`467`	`}, $value);`
`468`	`468`	`}`
`469`	`469`
Original file line number	Diff line number	Diff line change
`@@ -346,13 +346,13 @@ public static function changeExtension(string $path, string $extension): string`
`346`	`346`	`$extension = ltrim($extension, '.');`
`347`	`347`
`348`	`348`	`// No extension for paths`
`349`		`- if ('/' === substr($path, -1)) {`
	`349`	`+ if (str_ends_with($path, '/')) {`
`350`	`350`	`return $path;`
`351`	`351`	`}`
`352`	`352`
`353`	`353`	`// No actual extension in path`
`354`	`354`	`if (empty($actualExtension)) {`
`355`		`- return $path.('.' === substr($path, -1) ? '' : '.').$extension;`
	`355`	`+ return $path.(str_ends_with($path, '.') ? '' : '.').$extension;`
`356`	`356`	`}`
`357`	`357`
`358`	`358`	`return substr($path, 0, -\strlen($actualExtension)).$extension;`
Original file line number	Diff line number	Diff line change
`@@ -128,7 +128,7 @@ protected function getOptionDefinition(OptionsResolver $optionsResolver, string`
`128`	`128`	`}`
`129`	`129`	`}`
`130`	`130`
`131`		`- if (isset($definition['deprecation']) && isset($definition['deprecation']['message']) && \is_string($definition['deprecation']['message'])) {`
	`131`	`+ if (isset($definition['deprecation']['message']) && \is_string($definition['deprecation']['message'])) {`
`132`	`132`	`$definition['deprecationMessage'] = strtr($definition['deprecation']['message'], ['%name%' => $option]);`
`133`	`133`	`$definition['deprecationPackage'] = $definition['deprecation']['package'];`
`134`	`134`	`$definition['deprecationVersion'] = $definition['deprecation']['version'];`