Merge branch '4.3' into 4.4

* 4.3:
  cs fix
  Fix return statements
  [TwigBridge] add missing dep
  Add false type to ChoiceListFactoryInterface::createView $label argument
  Update UPGRADE guide of 4.3 for EventDispatcher
  [SecurityBundle] display the correct class name on the deprecated notice

Author: nicolas-grekas

Data/Generator/LocaleDataGenerator.php

@@ -79,7 +79,7 @@ protected function generateDataForLocale(BundleEntryReaderInterface $reader, $te
         // Don't generate aliases, as they are resolved during runtime
         // Unless an alias is needed as fallback for de-duplication purposes
         if (isset($this->localeAliases[$displayLocale]) && !$this->generatingFallback) {
-            return;
+            return null;
         }
 
         // Generate locale names for all locales that have translations in
@@ -124,7 +124,7 @@ protected function generateDataForLocale(BundleEntryReaderInterface $reader, $te
             $data['Names'] = array_diff($data['Names'], $fallbackData['Names']);
         }
         if (!$data['Names']) {
-            return;
+            return null;
         }
 
         return $data;

ResourceBundle/CurrencyBundle.php

@@ -42,7 +42,7 @@ public function getCurrencySymbol($currency, $displayLocale = null)
         try {
             return $this->getSymbol($currency, $displayLocale);
         } catch (MissingResourceException $e) {
-            return;
+            return null;
         }
     }
 
@@ -54,7 +54,7 @@ public function getCurrencyName($currency, $displayLocale = null)
         try {
             return $this->getName($currency, $displayLocale);
         } catch (MissingResourceException $e) {
-            return;
+            return null;
         }
     }
 

ResourceBundle/LanguageBundle.php

@@ -54,7 +54,7 @@ public function getLanguageName($language, $region = null, $displayLocale = null
         try {
             return $this->getName($language, $displayLocale);
         } catch (MissingResourceException $e) {
-            return;
+            return null;
         }
     }
 
@@ -78,7 +78,7 @@ public function getScriptName($script, $language = null, $displayLocale = null)
         try {
             return $this->scriptProvider->getName($script, $displayLocale);
         } catch (MissingResourceException $e) {
-            return;
+            return null;
         }
     }
 

ResourceBundle/LocaleBundle.php

@@ -43,7 +43,7 @@ public function getLocaleName($locale, $displayLocale = null)
         try {
             return $this->getName($locale, $displayLocale);
         } catch (MissingResourceException $e) {
-            return;
+            return null;
         }
     }
 

ResourceBundle/RegionBundle.php

@@ -42,7 +42,7 @@ public function getCountryName($country, $displayLocale = null)
         try {
             return $this->getName($country, $displayLocale);
         } catch (MissingResourceException $e) {
-            return;
+            return null;
         }
     }
 

Util/Version.php

@@ -83,7 +83,7 @@ public static function normalize($version, $precision)
         }
 
         if (!preg_match('/^'.$pattern.'/', $version, $matches)) {
-            return;
+            return null;
         }
 
         return $matches[0];