Skip to content

Commit

Permalink
Merge branch '4.4'
Browse files Browse the repository at this point in the history
* 4.4:
  Import return annotations from vendors
  [ErrorHandler] Handle return types in DebugClassLoader
  cs fix
  • Loading branch information
nicolas-grekas committed Aug 14, 2019
2 parents 2f4d0e9 + dc69c66 commit a1c063c
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions Data/Generator/TimezoneDataGenerator.php
Expand Up @@ -84,13 +84,13 @@ protected function generateDataForLocale(BundleEntryReaderInterface $reader, str
// 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;
}

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

if (!isset($localeBundle['zoneStrings']) || null === $localeBundle['zoneStrings']) {
return;
return null;
}

$data = [
Expand All @@ -115,7 +115,7 @@ protected function generateDataForLocale(BundleEntryReaderInterface $reader, str
$data['Meta'] = array_diff($data['Meta'], $fallback['Meta']);
}
if (!$data['Names'] && !$data['Meta']) {
return;
return null;
}

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

0 comments on commit a1c063c

Please sign in to comment.