Merge branch '3.4' into 4.3

* 3.4:
  Fix inconsistent return points.
  [Security/Core] UserInterface::getPassword() can return null
  [Router] Fix TraceableUrlMatcher behaviour with trailing slash

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

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

Data/Generator/RegionDataGenerator.php

@@ -110,6 +110,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

@@ -101,7 +101,7 @@ public function format(\DateTime $dateTime)
      * @param string    $dateChars The date characters to be replaced with a formatted ICU value
      * @param \DateTime $dateTime  A DateTime object to be used to generate the formatted value
      *
-     * @return string The formatted value
+     * @return string|null The formatted value
      *
      * @throws NotImplementedException When it encounters a not implemented date character
      */
@@ -123,6 +123,8 @@ public function formatReplace($dateChars, $dateTime)
         if (false !== strpos($this->notImplementedChars, $dateChars[0])) {
             throw new NotImplementedException(sprintf('Unimplemented date character "%s" in format "%s"', $dateChars[0], $this->pattern));
         }
+
+        return null;
     }
 
     /**
@@ -196,6 +198,8 @@ public function getReverseMatchingRegExp($pattern)
 
                 return "(?P<$captureName>".$transformer->getReverseMatchingRegExp($length).')';
             }
+
+            return null;
         }, $escapedPattern);
 
         return $reverseMatchingRegExp;

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];