Add more nullsafe operators

Author: nicolas-grekas

GenericRuntime.php

@@ -59,8 +59,8 @@ class GenericRuntime implements RuntimeInterface
      */
     public function __construct(array $options = [])
     {
-        $options['env_var_name'] ?? $options['env_var_name'] = 'APP_ENV';
-        $debugKey = $options['debug_var_name'] ?? $options['debug_var_name'] = 'APP_DEBUG';
+        $options['env_var_name'] ??= 'APP_ENV';
+        $debugKey = $options['debug_var_name'] ??= 'APP_DEBUG';
 
         $debug = $options['debug'] ?? $_SERVER[$debugKey] ?? $_ENV[$debugKey] ?? true;
 

SymfonyRuntime.php

@@ -90,8 +90,8 @@ class SymfonyRuntime extends GenericRuntime
      */
     public function __construct(array $options = [])
     {
-        $envKey = $options['env_var_name'] ?? $options['env_var_name'] = 'APP_ENV';
-        $debugKey = $options['debug_var_name'] ?? $options['debug_var_name'] = 'APP_DEBUG';
+        $envKey = $options['env_var_name'] ??= 'APP_ENV';
+        $debugKey = $options['debug_var_name'] ??= 'APP_DEBUG';
 
         if (isset($options['env'])) {
             $_SERVER[$envKey] = $options['env'];
@@ -105,14 +105,14 @@ public function __construct(array $options = [])
                 ->setProdEnvs((array) ($options['prod_envs'] ?? ['prod']))
                 ->usePutenv($options['use_putenv'] ?? false)
                 ->bootEnv($options['project_dir'].'/'.($options['dotenv_path'] ?? '.env'), 'dev', (array) ($options['test_envs'] ?? ['test']), $options['dotenv_overload'] ?? false);
-            $options['debug'] ?? $options['debug'] = '1' === $_SERVER[$debugKey];
+            $options['debug'] ??= '1' === $_SERVER[$debugKey];
             $options['disable_dotenv'] = true;
         } else {
-            $_SERVER[$envKey] ?? $_SERVER[$envKey] = $_ENV[$envKey] ?? 'dev';
-            $_SERVER[$debugKey] ?? $_SERVER[$debugKey] = $_ENV[$debugKey] ?? !\in_array($_SERVER[$envKey], (array) ($options['prod_envs'] ?? ['prod']), true);
+            $_SERVER[$envKey] ??= $_ENV[$envKey] ?? 'dev';
+            $_SERVER[$debugKey] ??= $_ENV[$debugKey] ?? !\in_array($_SERVER[$envKey], (array) ($options['prod_envs'] ?? ['prod']), true);
         }
 
-        $options['error_handler'] ?? $options['error_handler'] = SymfonyErrorHandler::class;
+        $options['error_handler'] ??= SymfonyErrorHandler::class;
 
         parent::__construct($options);
     }
@@ -128,7 +128,7 @@ public function getRunner(?object $application): RunnerInterface
         }
 
         if ($application instanceof Command) {
-            $console = $this->console ?? $this->console = new Application();
+            $console = $this->console ??= new Application();
             $console->setName($application->getName() ?: $console->getName());
 
             if (!$application->getName() || !$console->has($application->getName())) {
@@ -149,7 +149,7 @@ public function getRunner(?object $application): RunnerInterface
 
             set_time_limit(0);
             $defaultEnv = !isset($this->options['env']) ? ($_SERVER[$this->options['env_var_name']] ?? 'dev') : null;
-            $output = $this->output ?? $this->output = new ConsoleOutput();
+            $output = $this->output ??= new ConsoleOutput();
 
             return new ConsoleApplicationRunner($application, $defaultEnv, $this->getInput(), $output);
         }
@@ -171,13 +171,13 @@ protected function getArgument(\ReflectionParameter $parameter, ?string $type):
                 return $this->getInput();
 
             case OutputInterface::class:
-                return $this->output ?? $this->output = new ConsoleOutput();
+                return $this->output ??= new ConsoleOutput();
 
             case Application::class:
-                return $this->console ?? $this->console = new Application();
+                return $this->console ??= new Application();
 
             case Command::class:
-                return $this->command ?? $this->command = new Command();
+                return $this->command ??= new Command();
         }
 
         return parent::getArgument($parameter, $type);