revert "avoid returning useless null"

this reverts commit f733111 due to symfony/symfony-docs#6614
craue · Jun 30, 2016 · 93acf16 · 93acf16
1 parent 8ff4029
commit 93acf16
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/Twig/Extension/ChangeLanguageExtension.php b/Twig/Extension/ChangeLanguageExtension.php
@@ -119,7 +119,7 @@ public function getName() {
 	 */
 	public function getLanguageName($locale, $forceLocaleForDisplay = null) {
 		if (empty($locale)) {
-			return;
+			return null;
 		}
 
 		$localeToUse = !empty($forceLocaleForDisplay) ? $forceLocaleForDisplay :

diff --git a/Twig/Extension/FormatDateTimeExtension.php b/Twig/Extension/FormatDateTimeExtension.php
@@ -166,7 +166,7 @@ public function formatDateTime($value, $locale = null, $dateType = null, $timeTy
 	 */
 	protected function getFormattedDateTime($value, $locale, $dateType, $timeType, $timeZone = null) {
 		if ($value === null) {
-			return;
+			return null;
 		}
 
 		$valueToUse = $value;

diff --git a/Twig/Extension/FormatNumberExtension.php b/Twig/Extension/FormatNumberExtension.php
@@ -113,7 +113,7 @@ public function formatSpelledOutNumber($value, $locale = null) {
 	 */
 	protected function getFormattedNumber($value, $locale, $style) {
 		if ($value === null) {
-			return;
+			return null;
 		}
 
 		$localeToUse = !empty($locale) ? $locale : $this->getLocale();
@@ -138,7 +138,7 @@ protected function getFormattedNumber($value, $locale, $style) {
 	 */
 	protected function getFormattedCurrency($value, $locale = null, $currency = null) {
 		if ($value === null) {
-			return;
+			return null;
 		}
 
 		$localeToUse = !empty($locale) ? $locale : $this->getLocale();