Merge branch '4.4' into 5.2

* 4.4:
  Simplify some code with null coalesce operator

Author: derrabus

Command/AssetsInstallCommand.php

@@ -274,10 +274,6 @@ private function getPublicDirectory(ContainerInterface $container): string
 
         $composerConfig = json_decode(file_get_contents($composerFilePath), true);
 
-        if (isset($composerConfig['extra']['public-dir'])) {
-            return $composerConfig['extra']['public-dir'];
-        }
-
-        return $defaultPublicDir;
+        return $composerConfig['extra']['public-dir'] ?? $defaultPublicDir;
     }
 }

Console/Descriptor/JsonDescriptor.php

@@ -136,7 +136,7 @@ protected function describeContainerAlias(Alias $alias, array $options = [], Con
 
     protected function describeEventDispatcherListeners(EventDispatcherInterface $eventDispatcher, array $options = [])
     {
-        $this->writeData($this->getEventDispatcherListenersData($eventDispatcher, \array_key_exists('event', $options) ? $options['event'] : null), $options);
+        $this->writeData($this->getEventDispatcherListenersData($eventDispatcher, $options['event'] ?? null), $options);
     }
 
     protected function describeCallable($callable, array $options = [])

Console/Descriptor/MarkdownDescriptor.php

@@ -286,7 +286,7 @@ protected function describeContainerEnvVars(array $envs, array $options = [])
 
     protected function describeEventDispatcherListeners(EventDispatcherInterface $eventDispatcher, array $options = [])
     {
-        $event = \array_key_exists('event', $options) ? $options['event'] : null;
+        $event = $options['event'] ?? null;
 
         $title = 'Registered listeners';
         if (null !== $event) {

Console/Descriptor/TextDescriptor.php

@@ -476,7 +476,7 @@ protected function describeContainerEnvVars(array $envs, array $options = [])
 
     protected function describeEventDispatcherListeners(EventDispatcherInterface $eventDispatcher, array $options = [])
     {
-        $event = \array_key_exists('event', $options) ? $options['event'] : null;
+        $event = $options['event'] ?? null;
 
         if (null !== $event) {
             $title = sprintf('Registered Listeners for "%s" Event', $event);

Console/Descriptor/XmlDescriptor.php

@@ -90,7 +90,7 @@ protected function describeContainerAlias(Alias $alias, array $options = [], Con
 
     protected function describeEventDispatcherListeners(EventDispatcherInterface $eventDispatcher, array $options = [])
     {
-        $this->writeDocument($this->getEventDispatcherListenersDocument($eventDispatcher, \array_key_exists('event', $options) ? $options['event'] : null));
+        $this->writeDocument($this->getEventDispatcherListenersDocument($eventDispatcher, $options['event'] ?? null));
     }
 
     protected function describeCallable($callable, array $options = [])