Merge branch '4.4' into 5.1

derrabus · derrabus · commit a620674d62bd · 2020-12-27T14:04:50.000+01:00
* 4.4:
  CS: Apply ternary_to_null_coalescing fixer
diff --git a/Application.php b/Application.php
@@ -836,11 +836,11 @@ protected function doRenderThrowable(\Throwable $e, OutputInterface $output): vo
                 ]);
 
                 for ($i = 0, $count = \count($trace); $i < $count; ++$i) {
-                    $class = isset($trace[$i]['class']) ? $trace[$i]['class'] : '';
-                    $type = isset($trace[$i]['type']) ? $trace[$i]['type'] : '';
-                    $function = isset($trace[$i]['function']) ? $trace[$i]['function'] : '';
-                    $file = isset($trace[$i]['file']) ? $trace[$i]['file'] : 'n/a';
-                    $line = isset($trace[$i]['line']) ? $trace[$i]['line'] : 'n/a';
+                    $class = $trace[$i]['class'] ?? '';
+                    $type = $trace[$i]['type'] ?? '';
+                    $function = $trace[$i]['function'] ?? '';
+                    $file = $trace[$i]['file'] ?? 'n/a';
+                    $line = $trace[$i]['line'] ?? 'n/a';
 
                     $output->writeln(sprintf(' %s%s at <info>%s:%s</info>', $class, $function ? $type.$function.'()' : '', $file, $line), OutputInterface::VERBOSITY_QUIET);
                 }
diff --git a/Descriptor/ApplicationDescription.php b/Descriptor/ApplicationDescription.php
@@ -80,7 +80,7 @@ public function getCommand(string $name): Command
             throw new CommandNotFoundException(sprintf('Command "%s" does not exist.', $name));
         }
 
-        return isset($this->commands[$name]) ? $this->commands[$name] : $this->aliases[$name];
+        return $this->commands[$name] ?? $this->aliases[$name];
     }
 
     private function inspectApplication()
diff --git a/Descriptor/JsonDescriptor.php b/Descriptor/JsonDescriptor.php
@@ -63,7 +63,7 @@ protected function describeCommand(Command $command, array $options = [])
      */
     protected function describeApplication(Application $application, array $options = [])
     {
-        $describedNamespace = isset($options['namespace']) ? $options['namespace'] : null;
+        $describedNamespace = $options['namespace'] ?? null;
         $description = new ApplicationDescription($application, $describedNamespace, true);
         $commands = [];
 
@@ -95,7 +95,7 @@ protected function describeApplication(Application $application, array $options
      */
     private function writeData(array $data, array $options)
     {
-        $flags = isset($options['json_encoding']) ? $options['json_encoding'] : 0;
+        $flags = $options['json_encoding'] ?? 0;
 
         $this->write(json_encode($data, $flags));
     }
diff --git a/Descriptor/MarkdownDescriptor.php b/Descriptor/MarkdownDescriptor.php
@@ -147,7 +147,7 @@ protected function describeCommand(Command $command, array $options = [])
      */
     protected function describeApplication(Application $application, array $options = [])
     {
-        $describedNamespace = isset($options['namespace']) ? $options['namespace'] : null;
+        $describedNamespace = $options['namespace'] ?? null;
         $description = new ApplicationDescription($application, $describedNamespace);
         $title = $this->getApplicationTitle($application);
 
diff --git a/Descriptor/TextDescriptor.php b/Descriptor/TextDescriptor.php
@@ -39,7 +39,7 @@ protected function describeInputArgument(InputArgument $argument, array $options
             $default = '';
         }
 
-        $totalWidth = isset($options['total_width']) ? $options['total_width'] : Helper::strlen($argument->getName());
+        $totalWidth = $options['total_width'] ?? Helper::strlen($argument->getName());
         $spacingWidth = $totalWidth - \strlen($argument->getName());
 
         $this->writeText(sprintf('  <info>%s</info>  %s%s%s',
@@ -71,7 +71,7 @@ protected function describeInputOption(InputOption $option, array $options = [])
             }
         }
 
-        $totalWidth = isset($options['total_width']) ? $options['total_width'] : $this->calculateTotalWidthForOptions([$option]);
+        $totalWidth = $options['total_width'] ?? $this->calculateTotalWidthForOptions([$option]);
         $synopsis = sprintf('%s%s',
             $option->getShortcut() ? sprintf('-%s, ', $option->getShortcut()) : '    ',
             sprintf('--%s%s', $option->getName(), $value)
@@ -176,7 +176,7 @@ protected function describeCommand(Command $command, array $options = [])
      */
     protected function describeApplication(Application $application, array $options = [])
     {
-        $describedNamespace = isset($options['namespace']) ? $options['namespace'] : null;
+        $describedNamespace = $options['namespace'] ?? null;
         $description = new ApplicationDescription($application, $describedNamespace);
 
         if (isset($options['raw_text']) && $options['raw_text']) {
diff --git a/Descriptor/XmlDescriptor.php b/Descriptor/XmlDescriptor.php
@@ -152,7 +152,7 @@ protected function describeCommand(Command $command, array $options = [])
      */
     protected function describeApplication(Application $application, array $options = [])
     {
-        $this->writeDocument($this->getApplicationDocument($application, isset($options['namespace']) ? $options['namespace'] : null));
+        $this->writeDocument($this->getApplicationDocument($application, $options['namespace'] ?? null));
     }
 
     /**
diff --git a/Formatter/OutputFormatter.php b/Formatter/OutputFormatter.php
@@ -161,7 +161,7 @@ public function formatAndWrap(?string $message, int $width)
             if ($open = '/' != $text[1]) {
                 $tag = $matches[1][$i][0];
             } else {
-                $tag = isset($matches[3][$i][0]) ? $matches[3][$i][0] : '';
+                $tag = $matches[3][$i][0] ?? '';
             }
 
             if (!$open && !$tag) {
diff --git a/Helper/ProgressBar.php b/Helper/ProgressBar.php
@@ -113,7 +113,7 @@ public static function getPlaceholderFormatterDefinition(string $name): ?callabl
             self::$formatters = self::initPlaceholderFormatters();
         }
 
-        return isset(self::$formatters[$name]) ? self::$formatters[$name] : null;
+        return self::$formatters[$name] ?? null;
     }
 
     /**
@@ -146,7 +146,7 @@ public static function getFormatDefinition(string $name): ?string
             self::$formats = self::initFormats();
         }
 
-        return isset(self::$formats[$name]) ? self::$formats[$name] : null;
+        return self::$formats[$name] ?? null;
     }
 
     /**
diff --git a/Helper/ProgressIndicator.php b/Helper/ProgressIndicator.php
@@ -142,7 +142,7 @@ public static function getFormatDefinition(string $name)
             self::$formats = self::initFormats();
         }
 
-        return isset(self::$formats[$name]) ? self::$formats[$name] : null;
+        return self::$formats[$name] ?? null;
     }
 
     /**
@@ -170,7 +170,7 @@ public static function getPlaceholderFormatterDefinition(string $name)
             self::$formatters = self::initPlaceholderFormatters();
         }
 
-        return isset(self::$formatters[$name]) ? self::$formatters[$name] : null;
+        return self::$formatters[$name] ?? null;
     }
 
     private function display()
diff --git a/Helper/QuestionHelper.php b/Helper/QuestionHelper.php
@@ -172,13 +172,13 @@ private function getDefaultAnswer(Question $question)
             $choices = $question->getChoices();
 
             if (!$question->isMultiselect()) {
-                return isset($choices[$default]) ? $choices[$default] : $default;
+                return $choices[$default] ?? $default;
             }
 
             $default = explode(',', $default);
             foreach ($default as $k => $v) {
                 $v = $question->isTrimmable() ? trim($v) : $v;
-                $default[$k] = isset($choices[$v]) ? $choices[$v] : $v;
+                $default[$k] = $choices[$v] ?? $v;
             }
         }
 
diff --git a/Helper/SymfonyQuestionHelper.php b/Helper/SymfonyQuestionHelper.php
@@ -58,7 +58,7 @@ protected function writePrompt(OutputInterface $output, Question $question)
 
             case $question instanceof ChoiceQuestion:
                 $choices = $question->getChoices();
-                $text = sprintf(' <info>%s</info> [<comment>%s</comment>]:', $text, OutputFormatter::escape(isset($choices[$default]) ? $choices[$default] : $default));
+                $text = sprintf(' <info>%s</info> [<comment>%s</comment>]:', $text, OutputFormatter::escape($choices[$default] ?? $default));
 
                 break;
 
diff --git a/Helper/Table.php b/Helper/Table.php
@@ -491,7 +491,7 @@ private function renderRow(array $row, string $cellFormat, string $firstCellForm
      */
     private function renderCell(array $row, int $column, string $cellFormat): string
     {
-        $cell = isset($row[$column]) ? $row[$column] : '';
+        $cell = $row[$column] ?? '';
         $width = $this->effectiveColumnWidths[$column];
         if ($cell instanceof TableCell && $cell->getColspan() > 1) {
             // add the width of the following columns(numbers of colspan).
@@ -625,7 +625,7 @@ private function fillNextRows(array $rows, int $line): array
                 // create a two dimensional array (rowspan x colspan)
                 $unmergedRows = array_replace_recursive(array_fill($line + 1, $nbLines, []), $unmergedRows);
                 foreach ($unmergedRows as $unmergedRowKey => $unmergedRow) {
-                    $value = isset($lines[$unmergedRowKey - $line]) ? $lines[$unmergedRowKey - $line] : '';
+                    $value = $lines[$unmergedRowKey - $line] ?? '';
                     $unmergedRows[$unmergedRowKey][$column] = new TableCell($value, ['colspan' => $cell->getColspan()]);
                     if ($nbLines === $unmergedRowKey - $line) {
                         break;
@@ -763,7 +763,7 @@ private function getCellWidth(array $row, int $column): int
             $cellWidth = Helper::strlenWithoutDecoration($this->output->getFormatter(), $cell);
         }
 
-        $columnWidth = isset($this->columnWidths[$column]) ? $this->columnWidths[$column] : 0;
+        $columnWidth = $this->columnWidths[$column] ?? 0;
         $cellWidth = max($cellWidth, $columnWidth);
 
         return isset($this->columnMaxWidths[$column]) ? min($this->columnMaxWidths[$column], $cellWidth) : $cellWidth;
diff --git a/Input/Input.php b/Input/Input.php
@@ -110,7 +110,7 @@ public function getArgument(string $name)
             throw new InvalidArgumentException(sprintf('The "%s" argument does not exist.', $name));
         }
 
-        return isset($this->arguments[$name]) ? $this->arguments[$name] : $this->definition->getArgument($name)->getDefault();
+        return $this->arguments[$name] ?? $this->definition->getArgument($name)->getDefault();
     }
 
     /**
diff --git a/Style/SymfonyStyle.php b/Style/SymfonyStyle.php
@@ -290,7 +290,7 @@ public function choice(string $question, array $choices, $default = null)
     {
         if (null !== $default) {
             $values = array_flip($choices);
-            $default = isset($values[$default]) ? $values[$default] : $default;
+            $default = $values[$default] ?? $default;
         }
 
         return $this->askQuestion(new ChoiceQuestion($question, $choices, $default));
diff --git a/Tester/TesterTrait.php b/Tester/TesterTrait.php
@@ -139,8 +139,8 @@ private function initOutput(array $options)
             }
         } else {
             $this->output = new ConsoleOutput(
-                isset($options['verbosity']) ? $options['verbosity'] : ConsoleOutput::VERBOSITY_NORMAL,
-                isset($options['decorated']) ? $options['decorated'] : null
+                $options['verbosity'] ?? ConsoleOutput::VERBOSITY_NORMAL,
+                $options['decorated'] ?? null
             );
 
             $errorOutput = new StreamOutput(fopen('php://memory', 'w', false));

Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,7 @@ public function getCommand(string $name): Command`
`80`	`80`	`throw new CommandNotFoundException(sprintf('Command "%s" does not exist.', $name));`
`81`	`81`	`}`
`82`	`82`
`83`		`- return isset($this->commands[$name]) ? $this->commands[$name] : $this->aliases[$name];`
	`83`	`+ return $this->commands[$name] ?? $this->aliases[$name];`
`84`	`84`	`}`
`85`	`85`
`86`	`86`	`private function inspectApplication()`
Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ protected function describeCommand(Command $command, array $options = [])`
`63`	`63`	`*/`
`64`	`64`	`protected function describeApplication(Application $application, array $options = [])`
`65`	`65`	`{`
`66`		`- $describedNamespace = isset($options['namespace']) ? $options['namespace'] : null;`
	`66`	`+ $describedNamespace = $options['namespace'] ?? null;`
`67`	`67`	`$description = new ApplicationDescription($application, $describedNamespace, true);`
`68`	`68`	`$commands = [];`
`69`	`69`
`@@ -95,7 +95,7 @@ protected function describeApplication(Application $application, array $options`
`95`	`95`	`*/`
`96`	`96`	`private function writeData(array $data, array $options)`
`97`	`97`	`{`
`98`		`- $flags = isset($options['json_encoding']) ? $options['json_encoding'] : 0;`
	`98`	`+ $flags = $options['json_encoding'] ?? 0;`
`99`	`99`
`100`	`100`	`$this->write(json_encode($data, $flags));`
`101`	`101`	`}`
Original file line number	Diff line number	Diff line change
`@@ -147,7 +147,7 @@ protected function describeCommand(Command $command, array $options = [])`
`147`	`147`	`*/`
`148`	`148`	`protected function describeApplication(Application $application, array $options = [])`
`149`	`149`	`{`
`150`		`- $describedNamespace = isset($options['namespace']) ? $options['namespace'] : null;`
	`150`	`+ $describedNamespace = $options['namespace'] ?? null;`
`151`	`151`	`$description = new ApplicationDescription($application, $describedNamespace);`
`152`	`152`	`$title = $this->getApplicationTitle($application);`
`153`	`153`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ protected function describeInputArgument(InputArgument $argument, array $options`
`39`	`39`	`$default = '';`
`40`	`40`	`}`
`41`	`41`
`42`		`- $totalWidth = isset($options['total_width']) ? $options['total_width'] : Helper::strlen($argument->getName());`
	`42`	`+ $totalWidth = $options['total_width'] ?? Helper::strlen($argument->getName());`
`43`	`43`	`$spacingWidth = $totalWidth - \strlen($argument->getName());`
`44`	`44`
`45`	`45`	`$this->writeText(sprintf(' <info>%s</info> %s%s%s',`
`@@ -71,7 +71,7 @@ protected function describeInputOption(InputOption $option, array $options = [])`
`71`	`71`	`}`
`72`	`72`	`}`
`73`	`73`
`74`		`- $totalWidth = isset($options['total_width']) ? $options['total_width'] : $this->calculateTotalWidthForOptions([$option]);`
	`74`	`+ $totalWidth = $options['total_width'] ?? $this->calculateTotalWidthForOptions([$option]);`
`75`	`75`	`$synopsis = sprintf('%s%s',`
`76`	`76`	`$option->getShortcut() ? sprintf('-%s, ', $option->getShortcut()) : ' ',`
`77`	`77`	`sprintf('--%s%s', $option->getName(), $value)`
`@@ -176,7 +176,7 @@ protected function describeCommand(Command $command, array $options = [])`
`176`	`176`	`*/`
`177`	`177`	`protected function describeApplication(Application $application, array $options = [])`
`178`	`178`	`{`
`179`		`- $describedNamespace = isset($options['namespace']) ? $options['namespace'] : null;`
	`179`	`+ $describedNamespace = $options['namespace'] ?? null;`
`180`	`180`	`$description = new ApplicationDescription($application, $describedNamespace);`
`181`	`181`
`182`	`182`	`if (isset($options['raw_text']) && $options['raw_text']) {`
Original file line number	Diff line number	Diff line change
`@@ -152,7 +152,7 @@ protected function describeCommand(Command $command, array $options = [])`
`152`	`152`	`*/`
`153`	`153`	`protected function describeApplication(Application $application, array $options = [])`
`154`	`154`	`{`
`155`		`- $this->writeDocument($this->getApplicationDocument($application, isset($options['namespace']) ? $options['namespace'] : null));`
	`155`	`+ $this->writeDocument($this->getApplicationDocument($application, $options['namespace'] ?? null));`
`156`	`156`	`}`
`157`	`157`
`158`	`158`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -161,7 +161,7 @@ public function formatAndWrap(?string $message, int $width)`
`161`	`161`	`if ($open = '/' != $text[1]) {`
`162`	`162`	`$tag = $matches[1][$i][0];`
`163`	`163`	`} else {`
`164`		`- $tag = isset($matches[3][$i][0]) ? $matches[3][$i][0] : '';`
	`164`	`+ $tag = $matches[3][$i][0] ?? '';`
`165`	`165`	`}`
`166`	`166`
`167`	`167`	`if (!$open && !$tag) {`
Original file line number	Diff line number	Diff line change
`@@ -113,7 +113,7 @@ public static function getPlaceholderFormatterDefinition(string $name): ?callabl`
`113`	`113`	`self::$formatters = self::initPlaceholderFormatters();`
`114`	`114`	`}`
`115`	`115`
`116`		`- return isset(self::$formatters[$name]) ? self::$formatters[$name] : null;`
	`116`	`+ return self::$formatters[$name] ?? null;`
`117`	`117`	`}`
`118`	`118`
`119`	`119`	`/**`
`@@ -146,7 +146,7 @@ public static function getFormatDefinition(string $name): ?string`
`146`	`146`	`self::$formats = self::initFormats();`
`147`	`147`	`}`
`148`	`148`
`149`		`- return isset(self::$formats[$name]) ? self::$formats[$name] : null;`
	`149`	`+ return self::$formats[$name] ?? null;`
`150`	`150`	`}`
`151`	`151`
`152`	`152`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -142,7 +142,7 @@ public static function getFormatDefinition(string $name)`
`142`	`142`	`self::$formats = self::initFormats();`
`143`	`143`	`}`
`144`	`144`
`145`		`- return isset(self::$formats[$name]) ? self::$formats[$name] : null;`
	`145`	`+ return self::$formats[$name] ?? null;`
`146`	`146`	`}`
`147`	`147`
`148`	`148`	`/**`
`@@ -170,7 +170,7 @@ public static function getPlaceholderFormatterDefinition(string $name)`
`170`	`170`	`self::$formatters = self::initPlaceholderFormatters();`
`171`	`171`	`}`
`172`	`172`
`173`		`- return isset(self::$formatters[$name]) ? self::$formatters[$name] : null;`
	`173`	`+ return self::$formatters[$name] ?? null;`
`174`	`174`	`}`
`175`	`175`
`176`	`176`	`private function display()`
Original file line number	Diff line number	Diff line change
`@@ -172,13 +172,13 @@ private function getDefaultAnswer(Question $question)`
`172`	`172`	`$choices = $question->getChoices();`
`173`	`173`
`174`	`174`	`if (!$question->isMultiselect()) {`
`175`		`- return isset($choices[$default]) ? $choices[$default] : $default;`
	`175`	`+ return $choices[$default] ?? $default;`
`176`	`176`	`}`
`177`	`177`
`178`	`178`	`$default = explode(',', $default);`
`179`	`179`	`foreach ($default as $k => $v) {`
`180`	`180`	`$v = $question->isTrimmable() ? trim($v) : $v;`
`181`		`- $default[$k] = isset($choices[$v]) ? $choices[$v] : $v;`
	`181`	`+ $default[$k] = $choices[$v] ?? $v;`
`182`	`182`	`}`
`183`	`183`	`}`
`184`	`184`