minor #41157 [Console] Fixes for PHP 8.1 deprecations (jrmajor)

nicolas-grekas · nicolas-grekas · commit 21bf85f802b8 · 2021-05-10T16:34:29.000+02:00
This PR was merged into the 4.4 branch. Discussion ---------- [Console] Fixes for PHP 8.1 deprecations | Q | A | ------------- | --- | Branch? | 4.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | - | License | MIT | Doc PR | - Fixes passing `null` to non-nullable arguments. Commits ------- 545f058 [Console] Fixes for PHP 8.1 deprecations
diff --git a/src/Symfony/Component/Console/Descriptor/TextDescriptor.php b/src/Symfony/Component/Console/Descriptor/TextDescriptor.php
@@ -117,7 +117,7 @@ protected function describeInputDefinition(InputDefinition $definition, array $o
 
             $this->writeText('<comment>Options:</comment>', $options);
             foreach ($definition->getOptions() as $option) {
-                if (\strlen($option->getShortcut()) > 1) {
+                if (\strlen($option->getShortcut() ?? '') > 1) {
                     $laterOptions[] = $option;
                     continue;
                 }
diff --git a/src/Symfony/Component/Console/Descriptor/XmlDescriptor.php b/src/Symfony/Component/Console/Descriptor/XmlDescriptor.php
@@ -201,7 +201,7 @@ private function getInputOptionDocument(InputOption $option): \DOMDocument
 
         $dom->appendChild($objectXML = $dom->createElement('option'));
         $objectXML->setAttribute('name', '--'.$option->getName());
-        $pos = strpos($option->getShortcut(), '|');
+        $pos = strpos($option->getShortcut() ?? '', '|');
         if (false !== $pos) {
             $objectXML->setAttribute('shortcut', '-'.substr($option->getShortcut(), 0, $pos));
             $objectXML->setAttribute('shortcuts', '-'.str_replace('|', '|-', $option->getShortcut()));
diff --git a/src/Symfony/Component/Console/Helper/ProgressIndicator.php b/src/Symfony/Component/Console/Helper/ProgressIndicator.php
@@ -197,7 +197,7 @@ private function display()
             }
 
             return $matches[0];
-        }, $this->format));
+        }, $this->format ?? ''));
     }
 
     private function determineBestFormat(): string
diff --git a/src/Symfony/Component/Console/Helper/Table.php b/src/Symfony/Component/Console/Helper/Table.php
@@ -561,7 +561,7 @@ private function buildTableRows(array $rows): TableRows
                 if (isset($this->columnMaxWidths[$column]) && Helper::strlenWithoutDecoration($formatter, $cell) > $this->columnMaxWidths[$column]) {
                     $cell = $formatter->formatAndWrap($cell, $this->columnMaxWidths[$column] * $colspan);
                 }
-                if (!strstr($cell, "\n")) {
+                if (!strstr($cell ?? '', "\n")) {
                     continue;
                 }
                 $escaped = implode("\n", array_map([OutputFormatter::class, 'escapeTrailingBackslash'], explode("\n", $cell)));

Original file line number	Diff line number	Diff line change
`@@ -117,7 +117,7 @@ protected function describeInputDefinition(InputDefinition $definition, array $o`
`117`	`117`
`118`	`118`	`$this->writeText('<comment>Options:</comment>', $options);`
`119`	`119`	`foreach ($definition->getOptions() as $option) {`
`120`		`- if (\strlen($option->getShortcut()) > 1) {`
	`120`	`+ if (\strlen($option->getShortcut() ?? '') > 1) {`
`121`	`121`	`$laterOptions[] = $option;`
`122`	`122`	`continue;`
`123`	`123`	`}`
Original file line number	Diff line number	Diff line change
`@@ -197,7 +197,7 @@ private function display()`
`197`	`197`	`}`
`198`	`198`
`199`	`199`	`return $matches[0];`
`200`		`- }, $this->format));`
	`200`	`+ }, $this->format ?? ''));`
`201`	`201`	`}`
`202`	`202`
`203`	`203`	`private function determineBestFormat(): string`
Original file line number	Diff line number	Diff line change
`@@ -561,7 +561,7 @@ private function buildTableRows(array $rows): TableRows`
`561`	`561`	`if (isset($this->columnMaxWidths[$column]) && Helper::strlenWithoutDecoration($formatter, $cell) > $this->columnMaxWidths[$column]) {`
`562`	`562`	`$cell = $formatter->formatAndWrap($cell, $this->columnMaxWidths[$column] * $colspan);`
`563`	`563`	`}`
`564`		`- if (!strstr($cell, "\n")) {`
	`564`	`+ if (!strstr($cell ?? '', "\n")) {`
`565`	`565`	`continue;`
`566`	`566`	`}`
`567`	`567`	`$escaped = implode("\n", array_map([OutputFormatter::class, 'escapeTrailingBackslash'], explode("\n", $cell)));`