Merge branch '4.4' into 5.3

* 4.4: [DependencyInjection] only allow `ReflectionNamedType` for `ServiceSubscriberTrait` Fix CS
symfony · Nov 4, 2021 · 9523e73 · 9523e73
2 parents e003460 + 329b3a7
commit 9523e73
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/Input/ArgvInput.php b/Input/ArgvInput.php
@@ -134,7 +134,7 @@ private function parseLongOption(string $token)
         $name = substr($token, 2);
 
         if (false !== $pos = strpos($name, '=')) {
-            if (0 === \strlen($value = substr($name, $pos + 1))) {
+            if ('' === $value = substr($name, $pos + 1)) {
                 array_unshift($this->parsed, $value);
             }
             $this->addLongOption(substr($name, 0, $pos), $value);

diff --git a/Output/TrimmedBufferOutput.php b/Output/TrimmedBufferOutput.php
@@ -24,7 +24,8 @@ class TrimmedBufferOutput extends Output
     private $maxLength;
     private $buffer = '';
 
-    public function __construct(int $maxLength, ?int $verbosity = self::VERBOSITY_NORMAL, bool $decorated = false, OutputFormatterInterface $formatter = null) {
+    public function __construct(int $maxLength, ?int $verbosity = self::VERBOSITY_NORMAL, bool $decorated = false, OutputFormatterInterface $formatter = null)
+    {
         if ($maxLength <= 0) {
             throw new InvalidArgumentException(sprintf('"%s()" expects a strictly positive maxLength. Got %d.', __METHOD__, $maxLength));
         }