CS: Apply ternary_to_null_coalescing fixer

derrabus · derrabus · commit 1e91712c2b30 · 2020-12-27T00:49:32.000+01:00
diff --git a/Console/Descriptor/JsonDescriptor.php b/Console/Descriptor/JsonDescriptor.php
@@ -144,7 +144,7 @@ protected function describeCallable($callable, array $options = [])
 
     protected function describeContainerParameter($parameter, array $options = [])
     {
-        $key = isset($options['parameter']) ? $options['parameter'] : '';
+        $key = $options['parameter'] ?? '';
 
         $this->writeData([$key => $parameter], $options);
     }
@@ -156,7 +156,7 @@ protected function describeContainerEnvVars(array $envs, 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 | \JSON_PRETTY_PRINT)."\n");
     }
diff --git a/Console/Descriptor/TextDescriptor.php b/Console/Descriptor/TextDescriptor.php
@@ -84,7 +84,7 @@ protected function describeRoute(Route $route, array $options = [])
     {
         $tableHeaders = ['Property', 'Value'];
         $tableRows = [
-            ['Route Name', isset($options['name']) ? $options['name'] : ''],
+            ['Route Name', $options['name'] ?? ''],
             ['Path', $route->getPath()],
             ['Path Regex', $route->compile()->getRegex()],
             ['Host', ('' !== $route->getHost() ? $route->getHost() : 'ANY')],
@@ -150,7 +150,7 @@ protected function describeContainerService($service, array $options = [], Conta
             $options['output']->table(
                 ['Service ID', 'Class'],
                 [
-                    [isset($options['id']) ? $options['id'] : '-', \get_class($service)],
+                    [$options['id'] ?? '-', \get_class($service)],
                 ]
             );
         }
@@ -159,7 +159,7 @@ protected function describeContainerService($service, array $options = [], Conta
     protected function describeContainerServices(ContainerBuilder $builder, array $options = [])
     {
         $showHidden = isset($options['show_hidden']) && $options['show_hidden'];
-        $showTag = isset($options['tag']) ? $options['tag'] : null;
+        $showTag = $options['tag'] ?? null;
 
         if ($showHidden) {
             $title = 'Symfony Container Hidden Services';
@@ -223,7 +223,7 @@ protected function describeContainerServices(ContainerBuilder $builder, array $o
                     foreach ($this->sortByPriority($definition->getTag($showTag)) as $key => $tag) {
                         $tagValues = [];
                         foreach ($tagsNames as $tagName) {
-                            $tagValues[] = isset($tag[$tagName]) ? $tag[$tagName] : '';
+                            $tagValues[] = $tag[$tagName] ?? '';
                         }
                         if (0 === $key) {
                             $tableRows[] = array_merge([$serviceId], $tagValues, [$definition->getClass()]);
@@ -257,7 +257,7 @@ protected function describeContainerDefinition(Definition $definition, array $op
 
         $tableHeaders = ['Option', 'Value'];
 
-        $tableRows[] = ['Service ID', isset($options['id']) ? $options['id'] : '-'];
+        $tableRows[] = ['Service ID', $options['id'] ?? '-'];
         $tableRows[] = ['Class', $definition->getClass() ?: '-'];
 
         $omitTags = isset($options['omit_tags']) && $options['omit_tags'];
diff --git a/Console/Descriptor/XmlDescriptor.php b/Console/Descriptor/XmlDescriptor.php
@@ -38,7 +38,7 @@ protected function describeRouteCollection(RouteCollection $routes, array $optio
 
     protected function describeRoute(Route $route, array $options = [])
     {
-        $this->writeDocument($this->getRouteDocument($route, isset($options['name']) ? $options['name'] : null));
+        $this->writeDocument($this->getRouteDocument($route, $options['name'] ?? null));
     }
 
     protected function describeContainerParameters(ParameterBag $parameters, array $options = [])
@@ -62,18 +62,18 @@ protected function describeContainerService($service, array $options = [], Conta
 
     protected function describeContainerServices(ContainerBuilder $builder, array $options = [])
     {
-        $this->writeDocument($this->getContainerServicesDocument($builder, isset($options['tag']) ? $options['tag'] : null, isset($options['show_hidden']) && $options['show_hidden'], isset($options['show_arguments']) && $options['show_arguments'], isset($options['filter']) ? $options['filter'] : null));
+        $this->writeDocument($this->getContainerServicesDocument($builder, $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 = [])
     {
-        $this->writeDocument($this->getContainerDefinitionDocument($definition, isset($options['id']) ? $options['id'] : null, isset($options['omit_tags']) && $options['omit_tags'], isset($options['show_arguments']) && $options['show_arguments']));
+        $this->writeDocument($this->getContainerDefinitionDocument($definition, $options['id'] ?? null, isset($options['omit_tags']) && $options['omit_tags'], isset($options['show_arguments']) && $options['show_arguments']));
     }
 
     protected function describeContainerAlias(Alias $alias, array $options = [], ContainerBuilder $builder = null)
     {
         $dom = new \DOMDocument('1.0', 'UTF-8');
-        $dom->appendChild($dom->importNode($this->getContainerAliasDocument($alias, isset($options['id']) ? $options['id'] : null)->childNodes->item(0), true));
+        $dom->appendChild($dom->importNode($this->getContainerAliasDocument($alias, $options['id'] ?? null)->childNodes->item(0), true));
 
         if (!$builder) {
             $this->writeDocument($dom);
diff --git a/DependencyInjection/Compiler/ProfilerPass.php b/DependencyInjection/Compiler/ProfilerPass.php
@@ -34,7 +34,7 @@ public function process(ContainerBuilder $container)
         $collectors = new \SplPriorityQueue();
         $order = \PHP_INT_MAX;
         foreach ($container->findTaggedServiceIds('data_collector', true) as $id => $attributes) {
-            $priority = isset($attributes[0]['priority']) ? $attributes[0]['priority'] : 0;
+            $priority = $attributes[0]['priority'] ?? 0;
             $template = null;
 
             if (isset($attributes[0]['template'])) {
diff --git a/DependencyInjection/FrameworkExtension.php b/DependencyInjection/FrameworkExtension.php
@@ -230,7 +230,7 @@ public function load(array $configs, ContainerBuilder $container)
                 // mark any env vars found in the ide setting as used
                 $container->resolveEnvPlaceholders($ide);
 
-                $container->setParameter('templating.helper.code.file_link_format', str_replace('%', '%%', ini_get('xdebug.file_link_format') ?: get_cfg_var('xdebug.file_link_format')) ?: (isset($links[$ide]) ? $links[$ide] : $ide));
+                $container->setParameter('templating.helper.code.file_link_format', str_replace('%', '%%', ini_get('xdebug.file_link_format') ?: get_cfg_var('xdebug.file_link_format')) ?: ($links[$ide] ?? $ide));
             }
             $container->setParameter('debug.file_link_format', '%templating.helper.code.file_link_format%');
         }
@@ -1083,7 +1083,7 @@ private function registerAssetsConfiguration(array $config, ContainerBuilder $co
             } else {
                 // let format fallback to main version_format
                 $format = $package['version_format'] ?: $config['version_format'];
-                $version = isset($package['version']) ? $package['version'] : null;
+                $version = $package['version'] ?? null;
                 $version = $this->createVersion($container, $version, $format, $package['json_manifest_path'], $name);
             }
 
diff --git a/Resources/views/Form/color_widget.html.php b/Resources/views/Form/color_widget.html.php
@@ -1 +1 @@
-<?php echo $view['form']->block($form, 'form_widget_simple', ['type' => isset($type) ? $type : 'color']);
+<?php echo $view['form']->block($form, 'form_widget_simple', ['type' => $type ?? 'color']);
diff --git a/Resources/views/Form/email_widget.html.php b/Resources/views/Form/email_widget.html.php
@@ -1 +1 @@
-<?php echo $view['form']->block($form, 'form_widget_simple', ['type' => isset($type) ? $type : 'email']) ?>
+<?php echo $view['form']->block($form, 'form_widget_simple', ['type' => $type ?? 'email']) ?>
diff --git a/Resources/views/Form/form_label.html.php b/Resources/views/Form/form_label.html.php
@@ -1,5 +1,5 @@
 <?php if (false !== $label): ?>
-<?php if ($required) { $label_attr['class'] = trim((isset($label_attr['class']) ? $label_attr['class'] : '').' required'); } ?>
+<?php if ($required) { $label_attr['class'] = trim(($label_attr['class'] ?? '').' required'); } ?>
 <?php if (!$compound) { $label_attr['for'] = $id; } ?>
 <?php if (!$label) { $label = isset($label_format)
     ? strtr($label_format, ['%name%' => $name, '%id%' => $id])
diff --git a/Resources/views/Form/hidden_widget.html.php b/Resources/views/Form/hidden_widget.html.php
@@ -1 +1 @@
-<?php echo $view['form']->block($form, 'form_widget_simple', ['type' => isset($type) ? $type : 'hidden']) ?>
+<?php echo $view['form']->block($form, 'form_widget_simple', ['type' => $type ?? 'hidden']) ?>
diff --git a/Resources/views/Form/integer_widget.html.php b/Resources/views/Form/integer_widget.html.php
@@ -1 +1 @@
-<?php echo $view['form']->block($form, 'form_widget_simple', ['type' => isset($type) ? $type : 'number']) ?>
+<?php echo $view['form']->block($form, 'form_widget_simple', ['type' => $type ?? 'number']) ?>
diff --git a/Resources/views/Form/number_widget.html.php b/Resources/views/Form/number_widget.html.php
@@ -1 +1 @@
-<?php echo $view['form']->block($form, 'form_widget_simple', ['type' => isset($type) ? $type : 'text']) ?>
+<?php echo $view['form']->block($form, 'form_widget_simple', ['type' => $type ?? 'text']) ?>
diff --git a/Resources/views/Form/password_widget.html.php b/Resources/views/Form/password_widget.html.php
@@ -1 +1 @@
-<?php echo $view['form']->block($form, 'form_widget_simple', ['type' => isset($type) ? $type : 'password']) ?>
+<?php echo $view['form']->block($form, 'form_widget_simple', ['type' => $type ?? 'password']) ?>
diff --git a/Resources/views/Form/percent_widget.html.php b/Resources/views/Form/percent_widget.html.php
@@ -1,2 +1,2 @@
 <?php $symbol = false !== $symbol ? ($symbol ? ' '.$symbol : ' %') : '' ?>
-<?php echo $view['form']->block($form, 'form_widget_simple', ['type' => isset($type) ? $type : 'text']).$view->escape($symbol) ?>
+<?php echo $view['form']->block($form, 'form_widget_simple', ['type' => $type ?? 'text']).$view->escape($symbol) ?>
diff --git a/Resources/views/Form/range_widget.html.php b/Resources/views/Form/range_widget.html.php
@@ -1 +1 @@
-<?php echo $view['form']->block($form, 'form_widget_simple', ['type' => isset($type) ? $type : 'range']);
+<?php echo $view['form']->block($form, 'form_widget_simple', ['type' => $type ?? 'range']);
diff --git a/Resources/views/Form/reset_widget.html.php b/Resources/views/Form/reset_widget.html.php
@@ -1 +1 @@
-<?php echo $view['form']->block($form, 'button_widget', ['type' => isset($type) ? $type : 'reset']) ?>
+<?php echo $view['form']->block($form, 'button_widget', ['type' => $type ?? 'reset']) ?>
diff --git a/Resources/views/Form/search_widget.html.php b/Resources/views/Form/search_widget.html.php
@@ -1 +1 @@
-<?php echo $view['form']->block($form, 'form_widget_simple', ['type' => isset($type) ? $type : 'search']) ?>
+<?php echo $view['form']->block($form, 'form_widget_simple', ['type' => $type ?? 'search']) ?>
diff --git a/Resources/views/Form/submit_widget.html.php b/Resources/views/Form/submit_widget.html.php
@@ -1 +1 @@
-<?php echo $view['form']->block($form, 'button_widget', ['type' => isset($type) ? $type : 'submit']) ?>
+<?php echo $view['form']->block($form, 'button_widget', ['type' => $type ?? 'submit']) ?>
diff --git a/Resources/views/Form/tel_widget.html.php b/Resources/views/Form/tel_widget.html.php
@@ -1 +1 @@
-<?php echo $view['form']->block($form, 'form_widget_simple', ['type' => isset($type) ? $type : 'tel']);
+<?php echo $view['form']->block($form, 'form_widget_simple', ['type' => $type ?? 'tel']);
diff --git a/Resources/views/Form/url_widget.html.php b/Resources/views/Form/url_widget.html.php
@@ -1 +1 @@
-<?php echo $view['form']->block($form, 'form_widget_simple', ['type' => isset($type) ? $type : 'url']) ?>
+<?php echo $view['form']->block($form, 'form_widget_simple', ['type' => $type ?? 'url']) ?>
diff --git a/Templating/Helper/ActionsHelper.php b/Templating/Helper/ActionsHelper.php
@@ -44,7 +44,7 @@ public function __construct(FragmentHandler $handler)
      */
     public function render($uri, array $options = [])
     {
-        $strategy = isset($options['strategy']) ? $options['strategy'] : 'inline';
+        $strategy = $options['strategy'] ?? 'inline';
         unset($options['strategy']);
 
         return $this->handler->render($uri, $strategy, $options);
diff --git a/Tests/Functional/AbstractWebTestCase.php b/Tests/Functional/AbstractWebTestCase.php
@@ -61,9 +61,9 @@ protected static function createKernel(array $options = []): KernelInterface
         return new $class(
             static::getVarDir(),
             $options['test_case'],
-            isset($options['root_config']) ? $options['root_config'] : 'config.yml',
-            isset($options['environment']) ? $options['environment'] : strtolower(static::getVarDir().$options['test_case']),
-            isset($options['debug']) ? $options['debug'] : false
+            $options['root_config'] ?? 'config.yml',
+            $options['environment'] ?? strtolower(static::getVarDir().$options['test_case']),
+            $options['debug'] ?? false
         );
     }
 
diff --git a/Tests/Routing/RouterTest.php b/Tests/Routing/RouterTest.php
@@ -551,7 +551,7 @@ private function getParameterBag(array $params = []): ContainerInterface
             ->expects($this->any())
             ->method('get')
             ->willReturnCallback(function ($key) use ($params) {
-                return isset($params[$key]) ? $params[$key] : null;
+                return $params[$key] ?? null;
             })
         ;
 
diff --git a/Tests/Templating/Helper/Resources/Parent/form_widget_simple.html.php b/Tests/Templating/Helper/Resources/Parent/form_widget_simple.html.php
@@ -1,2 +1,2 @@
-<?php $type = isset($type) ? $type : 'text'; ?>
+<?php $type = $type ?? 'text'; ?>
 <input type="<?php echo $type; ?>" <?php $view['form']->block($form, 'widget_attributes'); ?> value="<?php echo $value; ?>" rel="theme" />

Original file line number	Diff line number	Diff line change
`@@ -144,7 +144,7 @@ protected function describeCallable($callable, array $options = [])`
`144`	`144`
`145`	`145`	`protected function describeContainerParameter($parameter, array $options = [])`
`146`	`146`	`{`
`147`		`- $key = isset($options['parameter']) ? $options['parameter'] : '';`
	`147`	`+ $key = $options['parameter'] ?? '';`
`148`	`148`
`149`	`149`	`$this->writeData([$key => $parameter], $options);`
`150`	`150`	`}`
`@@ -156,7 +156,7 @@ protected function describeContainerEnvVars(array $envs, array $options = [])`
`156`	`156`
`157`	`157`	`private function writeData(array $data, array $options)`
`158`	`158`	`{`
`159`		`- $flags = isset($options['json_encoding']) ? $options['json_encoding'] : 0;`
	`159`	`+ $flags = $options['json_encoding'] ?? 0;`
`160`	`160`
`161`	`161`	`$this->write(json_encode($data, $flags \| \JSON_PRETTY_PRINT)."\n");`
`162`	`162`	`}`
Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ protected function describeRouteCollection(RouteCollection $routes, array $optio`
`38`	`38`
`39`	`39`	`protected function describeRoute(Route $route, array $options = [])`
`40`	`40`	`{`
`41`		`- $this->writeDocument($this->getRouteDocument($route, isset($options['name']) ? $options['name'] : null));`
	`41`	`+ $this->writeDocument($this->getRouteDocument($route, $options['name'] ?? null));`
`42`	`42`	`}`
`43`	`43`
`44`	`44`	`protected function describeContainerParameters(ParameterBag $parameters, array $options = [])`
`@@ -62,18 +62,18 @@ protected function describeContainerService($service, array $options = [], Conta`
`62`	`62`
`63`	`63`	`protected function describeContainerServices(ContainerBuilder $builder, array $options = [])`
`64`	`64`	`{`
`65`		`- $this->writeDocument($this->getContainerServicesDocument($builder, isset($options['tag']) ? $options['tag'] : null, isset($options['show_hidden']) && $options['show_hidden'], isset($options['show_arguments']) && $options['show_arguments'], isset($options['filter']) ? $options['filter'] : null));`
	`65`	`+ $this->writeDocument($this->getContainerServicesDocument($builder, $options['tag'] ?? null, isset($options['show_hidden']) && $options['show_hidden'], isset($options['show_arguments']) && $options['show_arguments'], $options['filter'] ?? null));`
`66`	`66`	`}`
`67`	`67`
`68`	`68`	`protected function describeContainerDefinition(Definition $definition, array $options = [])`
`69`	`69`	`{`
`70`		`- $this->writeDocument($this->getContainerDefinitionDocument($definition, isset($options['id']) ? $options['id'] : null, isset($options['omit_tags']) && $options['omit_tags'], isset($options['show_arguments']) && $options['show_arguments']));`
	`70`	`+ $this->writeDocument($this->getContainerDefinitionDocument($definition, $options['id'] ?? null, isset($options['omit_tags']) && $options['omit_tags'], isset($options['show_arguments']) && $options['show_arguments']));`
`71`	`71`	`}`
`72`	`72`
`73`	`73`	`protected function describeContainerAlias(Alias $alias, array $options = [], ContainerBuilder $builder = null)`
`74`	`74`	`{`
`75`	`75`	`$dom = new \DOMDocument('1.0', 'UTF-8');`
`76`		`- $dom->appendChild($dom->importNode($this->getContainerAliasDocument($alias, isset($options['id']) ? $options['id'] : null)->childNodes->item(0), true));`
	`76`	`+ $dom->appendChild($dom->importNode($this->getContainerAliasDocument($alias, $options['id'] ?? null)->childNodes->item(0), true));`
`77`	`77`
`78`	`78`	`if (!$builder) {`
`79`	`79`	`$this->writeDocument($dom);`
Original file line number	Diff line number	Diff line change
`@@ -230,7 +230,7 @@ public function load(array $configs, ContainerBuilder $container)`
`230`	`230`	`// mark any env vars found in the ide setting as used`
`231`	`231`	`$container->resolveEnvPlaceholders($ide);`
`232`	`232`
`233`		`- $container->setParameter('templating.helper.code.file_link_format', str_replace('%', '%%', ini_get('xdebug.file_link_format') ?: get_cfg_var('xdebug.file_link_format')) ?: (isset($links[$ide]) ? $links[$ide] : $ide));`
	`233`	`+ $container->setParameter('templating.helper.code.file_link_format', str_replace('%', '%%', ini_get('xdebug.file_link_format') ?: get_cfg_var('xdebug.file_link_format')) ?: ($links[$ide] ?? $ide));`
`234`	`234`	`}`
`235`	`235`	`$container->setParameter('debug.file_link_format', '%templating.helper.code.file_link_format%');`
`236`	`236`	`}`
`@@ -1083,7 +1083,7 @@ private function registerAssetsConfiguration(array $config, ContainerBuilder $co`
`1083`	`1083`	`} else {`
`1084`	`1084`	`// let format fallback to main version_format`
`1085`	`1085`	`$format = $package['version_format'] ?: $config['version_format'];`
`1086`		`- $version = isset($package['version']) ? $package['version'] : null;`
	`1086`	`+ $version = $package['version'] ?? null;`
`1087`	`1087`	`$version = $this->createVersion($container, $version, $format, $package['json_manifest_path'], $name);`
`1088`	`1088`	`}`
`1089`	`1089`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-<?php echo $view['form']->block($form, 'form_widget_simple', ['type' => isset($type) ? $type : 'color']);`
	`1`	`+<?php echo $view['form']->block($form, 'form_widget_simple', ['type' => $type ?? 'color']);`