Skip to content

Commit a1c063c

Browse files
Merge branch '4.4'
* 4.4: Import return annotations from vendors [ErrorHandler] Handle return types in DebugClassLoader cs fix
2 parents 2f4d0e9 + dc69c66 commit a1c063c

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

Data/Generator/TimezoneDataGenerator.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -84,13 +84,13 @@ protected function generateDataForLocale(BundleEntryReaderInterface $reader, str
8484
// Don't generate aliases, as they are resolved during runtime
8585
// Unless an alias is needed as fallback for de-duplication purposes
8686
if (isset($this->localeAliases[$displayLocale]) && !$this->generatingFallback) {
87-
return;
87+
return null;
8888
}
8989

9090
$localeBundle = $reader->read($tempDir, $displayLocale);
9191

9292
if (!isset($localeBundle['zoneStrings']) || null === $localeBundle['zoneStrings']) {
93-
return;
93+
return null;
9494
}
9595

9696
$data = [
@@ -115,7 +115,7 @@ protected function generateDataForLocale(BundleEntryReaderInterface $reader, str
115115
$data['Meta'] = array_diff($data['Meta'], $fallback['Meta']);
116116
}
117117
if (!$data['Names'] && !$data['Meta']) {
118-
return;
118+
return null;
119119
}
120120

121121
$this->zoneIds = array_merge($this->zoneIds, array_keys($data['Names']));

0 commit comments

Comments
 (0)