Add a few more ??=

tigitz · tigitz · commit e681bd50210e · 2022-09-21T20:43:34.000+02:00
diff --git a/src/Symfony/Bridge/Twig/Extension/DumpExtension.php b/src/Symfony/Bridge/Twig/Extension/DumpExtension.php
@@ -68,7 +68,7 @@ public function dump(Environment $env, array $context): ?string
         }
 
         $dump = fopen('php://memory', 'r+');
-        $this->dumper = $this->dumper ?? new HtmlDumper();
+        $this->dumper ??= new HtmlDumper();
         $this->dumper->setCharset($env->getCharset());
 
         foreach ($vars as $value) {
diff --git a/src/Symfony/Component/Cache/Adapter/AbstractAdapter.php b/src/Symfony/Component/Cache/Adapter/AbstractAdapter.php
@@ -94,7 +94,7 @@ public static function createSystemCache(string $namespace, int $defaultLifetime
             $opcache->setLogger($logger);
         }
 
-        if (!self::$apcuSupported = self::$apcuSupported ?? ApcuAdapter::isSupported()) {
+        if (!self::$apcuSupported ??= ApcuAdapter::isSupported()) {
             return $opcache;
         }
 
diff --git a/src/Symfony/Component/Cache/Adapter/CouchbaseBucketAdapter.php b/src/Symfony/Component/Cache/Adapter/CouchbaseBucketAdapter.php
@@ -141,17 +141,17 @@ private static function getOptions(string $options): array
 
     private static function initOptions(array $options): array
     {
-        $options['username'] = $options['username'] ?? '';
-        $options['password'] = $options['password'] ?? '';
-        $options['operationTimeout'] = $options['operationTimeout'] ?? 0;
-        $options['configTimeout'] = $options['configTimeout'] ?? 0;
-        $options['configNodeTimeout'] = $options['configNodeTimeout'] ?? 0;
-        $options['n1qlTimeout'] = $options['n1qlTimeout'] ?? 0;
-        $options['httpTimeout'] = $options['httpTimeout'] ?? 0;
-        $options['configDelay'] = $options['configDelay'] ?? 0;
-        $options['htconfigIdleTimeout'] = $options['htconfigIdleTimeout'] ?? 0;
-        $options['durabilityInterval'] = $options['durabilityInterval'] ?? 0;
-        $options['durabilityTimeout'] = $options['durabilityTimeout'] ?? 0;
+        $options['username'] ??= '';
+        $options['password'] ??= '';
+        $options['operationTimeout'] ??= 0;
+        $options['configTimeout'] ??= 0;
+        $options['configNodeTimeout'] ??= 0;
+        $options['n1qlTimeout'] ??= 0;
+        $options['httpTimeout'] ??= 0;
+        $options['configDelay'] ??= 0;
+        $options['htconfigIdleTimeout'] ??= 0;
+        $options['durabilityInterval'] ??= 0;
+        $options['durabilityTimeout'] ??= 0;
 
         return $options;
     }
diff --git a/src/Symfony/Component/Cache/Adapter/PhpFilesAdapter.php b/src/Symfony/Component/Cache/Adapter/PhpFilesAdapter.php
@@ -46,7 +46,7 @@ class PhpFilesAdapter extends AbstractAdapter implements PruneableInterface
     public function __construct(string $namespace = '', int $defaultLifetime = 0, string $directory = null, bool $appendOnly = false)
     {
         $this->appendOnly = $appendOnly;
-        self::$startTime = self::$startTime ?? $_SERVER['REQUEST_TIME'] ?? time();
+        self::$startTime ??= $_SERVER['REQUEST_TIME'] ?? time();
         parent::__construct('', $defaultLifetime);
         $this->init($namespace, $directory);
         $this->includeHandler = static function ($type, $msg, $file, $line) {
@@ -56,7 +56,7 @@ public function __construct(string $namespace = '', int $defaultLifetime = 0, st
 
     public static function isSupported()
     {
-        self::$startTime = self::$startTime ?? $_SERVER['REQUEST_TIME'] ?? time();
+        self::$startTime ??= $_SERVER['REQUEST_TIME'] ?? time();
 
         return \function_exists('opcache_invalidate') && filter_var(\ini_get('opcache.enable'), \FILTER_VALIDATE_BOOL) && (!\in_array(\PHP_SAPI, ['cli', 'phpdbg'], true) || filter_var(\ini_get('opcache.enable_cli'), \FILTER_VALIDATE_BOOL));
     }
diff --git a/src/Symfony/Component/Config/Definition/Builder/ArrayNodeDefinition.php b/src/Symfony/Component/Config/Definition/Builder/ArrayNodeDefinition.php
@@ -246,7 +246,7 @@ public function canBeEnabled(): static
             ->beforeNormalization()
                 ->ifArray()
                 ->then(function (array $v) {
-                    $v['enabled'] = $v['enabled'] ?? true;
+                    $v['enabled'] ??= true;
 
                     return $v;
                 })
diff --git a/src/Symfony/Component/EventDispatcher/DependencyInjection/RegisterListenersPass.php b/src/Symfony/Component/EventDispatcher/DependencyInjection/RegisterListenersPass.php
@@ -73,7 +73,7 @@ public function process(ContainerBuilder $container)
                         continue;
                     }
 
-                    $event['method'] = $event['method'] ?? '__invoke';
+                    $event['method'] ??= '__invoke';
                     $event['event'] = $this->getEventFromTypeDeclaration($container, $id, $event['method']);
                 }
 
diff --git a/src/Symfony/Component/HttpClient/Internal/AmpListener.php b/src/Symfony/Component/HttpClient/Internal/AmpListener.php
@@ -50,7 +50,7 @@ public function __construct(array &$info, array $pinSha256, \Closure $onProgress
 
     public function startRequest(Request $request): Promise
     {
-        $this->info['start_time'] = $this->info['start_time'] ?? microtime(true);
+        $this->info['start_time'] ??= microtime(true);
         ($this->onProgress)();
 
         return new Success();
diff --git a/src/Symfony/Component/HttpClient/Internal/CurlClientState.php b/src/Symfony/Component/HttpClient/Internal/CurlClientState.php
@@ -38,7 +38,7 @@ final class CurlClientState extends ClientState
 
     public function __construct(int $maxHostConnections, int $maxPendingPushes)
     {
-        self::$curlVersion = self::$curlVersion ?? curl_version();
+        self::$curlVersion ??= curl_version();
 
         $this->handle = curl_multi_init();
         $this->dnsCache = new DnsCache();
diff --git a/src/Symfony/Component/HttpClient/Response/CurlResponse.php b/src/Symfony/Component/HttpClient/Response/CurlResponse.php
@@ -68,7 +68,7 @@ public function __construct(CurlClientState $multi, \CurlHandle|string $ch, arra
         $this->info['http_method'] = $method;
         $this->info['user_data'] = $options['user_data'] ?? null;
         $this->info['max_duration'] = $options['max_duration'] ?? null;
-        $this->info['start_time'] = $this->info['start_time'] ?? microtime(true);
+        $this->info['start_time'] ??= microtime(true);
         $this->info['original_url'] = $originalUrl ?? $this->info['url'] ?? curl_getinfo($ch, \CURLINFO_EFFECTIVE_URL);
         $info = &$this->info;
         $headers = &$this->headers;
diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/MockArraySessionStorage.php b/src/Symfony/Component/HttpFoundation/Session/Storage/MockArraySessionStorage.php
@@ -208,7 +208,7 @@ protected function loadSession()
 
         foreach ($bags as $bag) {
             $key = $bag->getStorageKey();
-            $this->data[$key] = $this->data[$key] ?? [];
+            $this->data[$key] ??= [];
             $bag->initialize($this->data[$key]);
         }
 
diff --git a/src/Symfony/Component/Mailer/Transport/Smtp/Stream/SocketStream.php b/src/Symfony/Component/Mailer/Transport/Smtp/Stream/SocketStream.php
@@ -146,7 +146,7 @@ public function initialize(): void
             $options = array_merge($options, $this->streamContextOptions);
         }
         // do it unconditionnally as it will be used by STARTTLS as well if supported
-        $options['ssl']['crypto_method'] = $options['ssl']['crypto_method'] ?? \STREAM_CRYPTO_METHOD_TLS_CLIENT | \STREAM_CRYPTO_METHOD_TLSv1_2_CLIENT | \STREAM_CRYPTO_METHOD_TLSv1_1_CLIENT;
+        $options['ssl']['crypto_method'] ??= \STREAM_CRYPTO_METHOD_TLS_CLIENT | \STREAM_CRYPTO_METHOD_TLSv1_2_CLIENT | \STREAM_CRYPTO_METHOD_TLSv1_1_CLIENT;
         $streamContext = stream_context_create($options);
 
         $timeout = $this->getTimeout();
diff --git a/src/Symfony/Component/Messenger/Bridge/Amqp/Transport/Connection.php b/src/Symfony/Component/Messenger/Bridge/Amqp/Transport/Connection.php
@@ -329,8 +329,8 @@ private function publishOnExchange(\AMQPExchange $exchange, string $body, string
     {
         $attributes = $amqpStamp ? $amqpStamp->getAttributes() : [];
         $attributes['headers'] = array_merge($attributes['headers'] ?? [], $headers);
-        $attributes['delivery_mode'] = $attributes['delivery_mode'] ?? 2;
-        $attributes['timestamp'] = $attributes['timestamp'] ?? time();
+        $attributes['delivery_mode'] ??= 2;
+        $attributes['timestamp'] ??= time();
 
         $exchange->publish(
             $body,
diff --git a/src/Symfony/Component/Messenger/Bridge/Redis/Transport/Connection.php b/src/Symfony/Component/Messenger/Bridge/Redis/Transport/Connection.php
@@ -209,7 +209,7 @@ public static function fromDsn(string $dsn, array $options = [], \Redis|\RedisCl
             $options['host'] = $parsedUrl['host'] ?? $options['host'];
             $options['port'] = $parsedUrl['port'] ?? $options['port'];
             // See: https://github.com/phpredis/phpredis/#auth
-            $options['auth'] = $options['auth'] ?? (null !== $pass && null !== $user ? [$user, $pass] : ($pass ?? $user));
+            $options['auth'] ??= null !== $pass && null !== $user ? [$user, $pass] : ($pass ?? $user);
 
             $pathParts = explode('/', rtrim($parsedUrl['path'] ?? '', '/'));
             $options['stream'] = $pathParts[1] ?? $options['stream'];
diff --git a/src/Symfony/Component/Notifier/Bridge/Expo/ExpoTransport.php b/src/Symfony/Component/Notifier/Bridge/Expo/ExpoTransport.php
@@ -67,7 +67,7 @@ protected function doSend(MessageInterface $message): SentMessage
 
         $options['title'] = $message->getSubject();
         $options['body'] = $message->getContent();
-        $options['data'] = $options['data'] ?? [];
+        $options['data'] ??= [];
 
         $response = $this->client->request('POST', $endpoint, [
             'headers' => [
diff --git a/src/Symfony/Component/Notifier/Bridge/Firebase/FirebaseTransport.php b/src/Symfony/Component/Notifier/Bridge/Firebase/FirebaseTransport.php
@@ -63,9 +63,9 @@ protected function doSend(MessageInterface $message): SentMessage
         if (null === $options['to']) {
             throw new InvalidArgumentException(sprintf('The "%s" transport required the "to" option to be set.', __CLASS__));
         }
-        $options['notification'] = $options['notification'] ?? [];
+        $options['notification'] ??= [];
         $options['notification']['body'] = $message->getSubject();
-        $options['data'] = $options['data'] ?? [];
+        $options['data'] ??= [];
 
         $response = $this->client->request('POST', $endpoint, [
             'headers' => [
diff --git a/src/Symfony/Component/Notifier/Bridge/MicrosoftTeams/MicrosoftTeamsTransport.php b/src/Symfony/Component/Notifier/Bridge/MicrosoftTeams/MicrosoftTeamsTransport.php
@@ -64,7 +64,7 @@ protected function doSend(MessageInterface $message): SentMessage
 
         $options = ($opts = $message->getOptions()) ? $opts->toArray() : [];
 
-        $options['text'] = $options['text'] ?? $message->getSubject();
+        $options['text'] ??= $message->getSubject();
 
         $path = $message->getRecipientId() ?? $this->path;
         $endpoint = sprintf('https://%s%s', $this->getEndpoint(), $path);
diff --git a/src/Symfony/Component/OptionsResolver/OptionsResolver.php b/src/Symfony/Component/OptionsResolver/OptionsResolver.php
@@ -537,7 +537,7 @@ public function addNormalizer(string $option, \Closure $normalizer, bool $forceP
         }
 
         if ($forcePrepend) {
-            $this->normalizers[$option] = $this->normalizers[$option] ?? [];
+            $this->normalizers[$option] ??= [];
             array_unshift($this->normalizers[$option], $normalizer);
         } else {
             $this->normalizers[$option][] = $normalizer;
diff --git a/src/Symfony/Component/PropertyInfo/PhpStan/NameScopeFactory.php b/src/Symfony/Component/PropertyInfo/PhpStan/NameScopeFactory.php
@@ -22,7 +22,7 @@ final class NameScopeFactory
 {
     public function create(string $calledClassName, string $declaringClassName = null): NameScope
     {
-        $declaringClassName = $declaringClassName ?? $calledClassName;
+        $declaringClassName ??= $calledClassName;
 
         $path = explode('\\', $calledClassName);
         $calledClassName = array_pop($path);
diff --git a/src/Symfony/Component/Runtime/Tests/phpt/autoload.php b/src/Symfony/Component/Runtime/Tests/phpt/autoload.php
@@ -11,7 +11,7 @@
 
 use Symfony\Component\Runtime\SymfonyRuntime;
 
-$_SERVER['APP_RUNTIME_OPTIONS'] = $_SERVER['APP_RUNTIME_OPTIONS'] ?? [];
+$_SERVER['APP_RUNTIME_OPTIONS'] ??= [];
 $_SERVER['APP_RUNTIME_OPTIONS'] += [
     'project_dir' => __DIR__,
 ] + ($_SERVER['APP_RUNTIME_OPTIONS'] ?? []);
diff --git a/src/Symfony/Component/String/LazyString.php b/src/Symfony/Component/String/LazyString.php
@@ -34,7 +34,7 @@ public static function fromCallable(callable|array $callback, mixed ...$argument
             if (null !== $arguments) {
                 if (!\is_callable($callback)) {
                     $callback[0] = $callback[0]();
-                    $callback[1] = $callback[1] ?? '__invoke';
+                    $callback[1] ??= '__invoke';
                 }
                 $value = $callback(...$arguments);
                 $callback = self::getPrettyName($callback);
diff --git a/src/Symfony/Component/Validator/Constraints/File.php b/src/Symfony/Component/Validator/Constraints/File.php
@@ -152,10 +152,10 @@ private function normalizeBinaryFormat(int|string $maxSize)
         ];
         if (ctype_digit((string) $maxSize)) {
             $this->maxSize = (int) $maxSize;
-            $this->binaryFormat = $this->binaryFormat ?? false;
+            $this->binaryFormat ??= false;
         } elseif (preg_match('/^(\d++)('.implode('|', array_keys($factors)).')$/i', $maxSize, $matches)) {
             $this->maxSize = $matches[1] * $factors[$unit = strtolower($matches[2])];
-            $this->binaryFormat = $this->binaryFormat ?? (2 === \strlen($unit));
+            $this->binaryFormat ??= 2 === \strlen($unit);
         } else {
             throw new ConstraintDefinitionException(sprintf('"%s" is not a valid maximum size.', $maxSize));
         }
diff --git a/src/Symfony/Component/VarDumper/Caster/MemcachedCaster.php b/src/Symfony/Component/VarDumper/Caster/MemcachedCaster.php
@@ -37,8 +37,8 @@ public static function castMemcached(\Memcached $c, array $a, Stub $stub, bool $
 
     private static function getNonDefaultOptions(\Memcached $c): array
     {
-        self::$defaultOptions = self::$defaultOptions ?? self::discoverDefaultOptions();
-        self::$optionConstants = self::$optionConstants ?? self::getOptionConstants();
+        self::$defaultOptions ??= self::discoverDefaultOptions();
+        self::$optionConstants ??= self::getOptionConstants();
 
         $nonDefaultOptions = [];
         foreach (self::$optionConstants as $constantKey => $value) {
@@ -56,7 +56,7 @@ private static function discoverDefaultOptions(): array
         $defaultMemcached->addServer('127.0.0.1', 11211);
 
         $defaultOptions = [];
-        self::$optionConstants = self::$optionConstants ?? self::getOptionConstants();
+        self::$optionConstants ??= self::getOptionConstants();
 
         foreach (self::$optionConstants as $constantKey => $value) {
             $defaultOptions[$constantKey] = $defaultMemcached->getOption($value);

Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ public function dump(Environment $env, array $context): ?string`
`68`	`68`	`}`
`69`	`69`
`70`	`70`	`$dump = fopen('php://memory', 'r+');`
`71`		`- $this->dumper = $this->dumper ?? new HtmlDumper();`
	`71`	`+ $this->dumper ??= new HtmlDumper();`
`72`	`72`	`$this->dumper->setCharset($env->getCharset());`
`73`	`73`
`74`	`74`	`foreach ($vars as $value) {`
Original file line number	Diff line number	Diff line change
`@@ -94,7 +94,7 @@ public static function createSystemCache(string $namespace, int $defaultLifetime`
`94`	`94`	`$opcache->setLogger($logger);`
`95`	`95`	`}`
`96`	`96`
`97`		`- if (!self::$apcuSupported = self::$apcuSupported ?? ApcuAdapter::isSupported()) {`
	`97`	`+ if (!self::$apcuSupported ??= ApcuAdapter::isSupported()) {`
`98`	`98`	`return $opcache;`
`99`	`99`	`}`
`100`	`100`
Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ class PhpFilesAdapter extends AbstractAdapter implements PruneableInterface`
`46`	`46`	`public function __construct(string $namespace = '', int $defaultLifetime = 0, string $directory = null, bool $appendOnly = false)`
`47`	`47`	`{`
`48`	`48`	`$this->appendOnly = $appendOnly;`
`49`		`- self::$startTime = self::$startTime ?? $_SERVER['REQUEST_TIME'] ?? time();`
	`49`	`+ self::$startTime ??= $_SERVER['REQUEST_TIME'] ?? time();`
`50`	`50`	`parent::__construct('', $defaultLifetime);`
`51`	`51`	`$this->init($namespace, $directory);`
`52`	`52`	`$this->includeHandler = static function ($type, $msg, $file, $line) {`
`@@ -56,7 +56,7 @@ public function __construct(string $namespace = '', int $defaultLifetime = 0, st`
`56`	`56`
`57`	`57`	`public static function isSupported()`
`58`	`58`	`{`
`59`		`- self::$startTime = self::$startTime ?? $_SERVER['REQUEST_TIME'] ?? time();`
	`59`	`+ self::$startTime ??= $_SERVER['REQUEST_TIME'] ?? time();`
`60`	`60`
`61`	`61`	`return \function_exists('opcache_invalidate') && filter_var(\ini_get('opcache.enable'), \FILTER_VALIDATE_BOOL) && (!\in_array(\PHP_SAPI, ['cli', 'phpdbg'], true) \|\| filter_var(\ini_get('opcache.enable_cli'), \FILTER_VALIDATE_BOOL));`
`62`	`62`	`}`
Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,7 @@ public function process(ContainerBuilder $container)`
`73`	`73`	`continue;`
`74`	`74`	`}`
`75`	`75`
`76`		`- $event['method'] = $event['method'] ?? '__invoke';`
	`76`	`+ $event['method'] ??= '__invoke';`
`77`	`77`	`$event['event'] = $this->getEventFromTypeDeclaration($container, $id, $event['method']);`
`78`	`78`	`}`
`79`	`79`
Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ public function __construct(array &$info, array $pinSha256, \Closure $onProgress`
`50`	`50`
`51`	`51`	`public function startRequest(Request $request): Promise`
`52`	`52`	`{`
`53`		`- $this->info['start_time'] = $this->info['start_time'] ?? microtime(true);`
	`53`	`+ $this->info['start_time'] ??= microtime(true);`
`54`	`54`	`($this->onProgress)();`
`55`	`55`
`56`	`56`	`return new Success();`
Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ final class CurlClientState extends ClientState`
`38`	`38`
`39`	`39`	`public function __construct(int $maxHostConnections, int $maxPendingPushes)`
`40`	`40`	`{`
`41`		`- self::$curlVersion = self::$curlVersion ?? curl_version();`
	`41`	`+ self::$curlVersion ??= curl_version();`
`42`	`42`
`43`	`43`	`$this->handle = curl_multi_init();`
`44`	`44`	`$this->dnsCache = new DnsCache();`
Original file line number	Diff line number	Diff line change
`@@ -208,7 +208,7 @@ protected function loadSession()`
`208`	`208`
`209`	`209`	`foreach ($bags as $bag) {`
`210`	`210`	`$key = $bag->getStorageKey();`
`211`		`- $this->data[$key] = $this->data[$key] ?? [];`
	`211`	`+ $this->data[$key] ??= [];`
`212`	`212`	`$bag->initialize($this->data[$key]);`
`213`	`213`	`}`
`214`	`214`