Skip to content

Commit d6349de

Browse files
Merge branch '4.4'
* 4.4: cs fix Fix return statements [TwigBridge] add missing dep Add type declarations to private DefaultChoiceListFactory methods 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
2 parents 98ea096 + ae71eb4 commit d6349de

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

Data/Generator/LocaleDataGenerator.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ protected function generateDataForLocale(BundleEntryReaderInterface $reader, str
7979
// Don't generate aliases, as they are resolved during runtime
8080
// Unless an alias is needed as fallback for de-duplication purposes
8181
if (isset($this->localeAliases[$displayLocale]) && !$this->generatingFallback) {
82-
return;
82+
return null;
8383
}
8484

8585
// Generate locale names for all locales that have translations in
@@ -124,7 +124,7 @@ protected function generateDataForLocale(BundleEntryReaderInterface $reader, str
124124
$data['Names'] = array_diff($data['Names'], $fallbackData['Names']);
125125
}
126126
if (!$data['Names']) {
127-
return;
127+
return null;
128128
}
129129

130130
return $data;

Util/Version.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ public static function normalize(string $version, ?int $precision)
7979
}
8080

8181
if (!preg_match('/^'.$pattern.'/', $version, $matches)) {
82-
return;
82+
return null;
8383
}
8484

8585
return $matches[0];

0 commit comments

Comments
 (0)