Merge branch '4.3' into 4.4

* 4.3:
  cs fix
  Fix inconsistent return points.
  [Config] Add handling for ignored keys in ArrayNode::mergeValues.
  Fix inconsistent return points.
  [Security/Core] UserInterface::getPassword() can return null
  [Router] Fix TraceableUrlMatcher behaviour with trailing slash
  Revert "bug #33092 [DependencyInjection] Improve an exception message (fabpot)"

Author: nicolas-grekas

Data/Generator/CurrencyDataGenerator.php

@@ -90,6 +90,8 @@ protected function generateDataForLocale(BundleEntryReaderInterface $reader, $te
 
             return $data;
         }
+
+        return null;
     }
 
     /**

Data/Generator/LanguageDataGenerator.php

@@ -141,6 +141,8 @@ protected function generateDataForLocale(BundleEntryReaderInterface $reader, $te
 
             return $data;
         }
+
+        return null;
     }
 
     /**

Data/Generator/RegionDataGenerator.php

@@ -124,6 +124,8 @@ protected function generateDataForLocale(BundleEntryReaderInterface $reader, $te
 
             return $data;
         }
+
+        return null;
     }
 
     /**

Data/Generator/ScriptDataGenerator.php

@@ -77,6 +77,8 @@ protected function generateDataForLocale(BundleEntryReaderInterface $reader, $te
 
             return $data;
         }
+
+        return null;
     }
 
     /**

DateFormatter/DateFormat/FullTransformer.php

@@ -106,6 +106,8 @@ private function formatReplace(string $dateChars, \DateTime $dateTime): string
         if (false !== strpos($this->notImplementedChars, $dateChars[0])) {
             throw new NotImplementedException(sprintf('Unimplemented date character "%s" in format "%s"', $dateChars[0], $this->pattern));
         }
+
+        return '';
     }
 
     /**
@@ -176,6 +178,8 @@ private function getReverseMatchingRegExp(string $pattern): string
 
                 return "(?P<$captureName>".$transformer->getReverseMatchingRegExp($length).')';
             }
+
+            return null;
         }, $escapedPattern);
 
         return $reverseMatchingRegExp;

Locale.php

@@ -104,11 +104,7 @@ public static function getFallback($locale): ?string
 
         // Don't return default fallback for "root", "meta" or others
         // Normal locales have two or three letters
-        if (\strlen($locale) < 4) {
-            return self::$defaultFallback;
-        }
-
-        return null;
+        return \strlen($locale) < 4 ? self::$defaultFallback : null;
     }
 
     /**

ResourceBundle/CurrencyBundle.php

@@ -78,7 +78,7 @@ public function getFractionDigits($currency)
         try {
             return parent::getFractionDigits($currency);
         } catch (MissingResourceException $e) {
-            return;
+            return null;
         }
     }
 
@@ -90,7 +90,7 @@ public function getRoundingIncrement($currency)
         try {
             return parent::getRoundingIncrement($currency);
         } catch (MissingResourceException $e) {
-            return;
+            return null;
         }
     }
 

Resources/bin/common.php

@@ -62,7 +62,7 @@ function get_icu_version_from_genrb($genrb)
     }
 
     if (!preg_match('/ICU version ([\d\.]+)/', implode('', $output), $matches)) {
-        return;
+        return null;
     }
 
     return $matches[1];