From 96fae635bee7e7f7db44ccec8badca24ace4ea95 Mon Sep 17 00:00:00 2001 From: Roland Franssen Date: Fri, 27 Sep 2019 11:54:15 +0200 Subject: [PATCH] [Intl] Fix compile type errors --- .../Component/Intl/Data/Generator/FallbackTrait.php | 13 ++----------- .../Intl/Data/Generator/LanguageDataGenerator.php | 1 + .../Intl/Data/Generator/LocaleDataGenerator.php | 1 + .../Intl/Data/Generator/RegionDataGenerator.php | 1 + .../Intl/Data/Generator/ScriptDataGenerator.php | 1 + 5 files changed, 6 insertions(+), 11 deletions(-) diff --git a/src/Symfony/Component/Intl/Data/Generator/FallbackTrait.php b/src/Symfony/Component/Intl/Data/Generator/FallbackTrait.php index a937e85b54..30709d9595 100644 --- a/src/Symfony/Component/Intl/Data/Generator/FallbackTrait.php +++ b/src/Symfony/Component/Intl/Data/Generator/FallbackTrait.php @@ -25,23 +25,14 @@ trait FallbackTrait private $generatingFallback = false; /** - * @param string $tempDir - * @param string $displayLocale - * - * @return array|null - * * @see AbstractDataGenerator::generateDataForLocale() */ - abstract protected function generateDataForLocale(BundleEntryReaderInterface $reader, $tempDir, $displayLocale); + abstract protected function generateDataForLocale(BundleEntryReaderInterface $reader, string $tempDir, string $displayLocale): ?array; /** - * @param string $tempDir - * - * @return array|null - * * @see AbstractDataGenerator::generateDataForRoot() */ - abstract protected function generateDataForRoot(BundleEntryReaderInterface $reader, $tempDir); + abstract protected function generateDataForRoot(BundleEntryReaderInterface $reader, string $tempDir): ?array; private function generateFallbackData(BundleEntryReaderInterface $reader, string $tempDir, string $displayLocale): array { diff --git a/src/Symfony/Component/Intl/Data/Generator/LanguageDataGenerator.php b/src/Symfony/Component/Intl/Data/Generator/LanguageDataGenerator.php index 140a7e9c22..017ead8ab6 100644 --- a/src/Symfony/Component/Intl/Data/Generator/LanguageDataGenerator.php +++ b/src/Symfony/Component/Intl/Data/Generator/LanguageDataGenerator.php @@ -150,6 +150,7 @@ class LanguageDataGenerator extends AbstractDataGenerator */ protected function generateDataForRoot(BundleEntryReaderInterface $reader, string $tempDir): ?array { + return null; } /** diff --git a/src/Symfony/Component/Intl/Data/Generator/LocaleDataGenerator.php b/src/Symfony/Component/Intl/Data/Generator/LocaleDataGenerator.php index 92f5dfc10e..25d35d2850 100644 --- a/src/Symfony/Component/Intl/Data/Generator/LocaleDataGenerator.php +++ b/src/Symfony/Component/Intl/Data/Generator/LocaleDataGenerator.php @@ -135,6 +135,7 @@ class LocaleDataGenerator extends AbstractDataGenerator */ protected function generateDataForRoot(BundleEntryReaderInterface $reader, string $tempDir): ?array { + return null; } /** diff --git a/src/Symfony/Component/Intl/Data/Generator/RegionDataGenerator.php b/src/Symfony/Component/Intl/Data/Generator/RegionDataGenerator.php index ac5652cdc4..87d64c5f43 100644 --- a/src/Symfony/Component/Intl/Data/Generator/RegionDataGenerator.php +++ b/src/Symfony/Component/Intl/Data/Generator/RegionDataGenerator.php @@ -133,6 +133,7 @@ class RegionDataGenerator extends AbstractDataGenerator */ protected function generateDataForRoot(BundleEntryReaderInterface $reader, string $tempDir): ?array { + return null; } /** diff --git a/src/Symfony/Component/Intl/Data/Generator/ScriptDataGenerator.php b/src/Symfony/Component/Intl/Data/Generator/ScriptDataGenerator.php index efbbfe8b23..33424f0853 100644 --- a/src/Symfony/Component/Intl/Data/Generator/ScriptDataGenerator.php +++ b/src/Symfony/Component/Intl/Data/Generator/ScriptDataGenerator.php @@ -86,6 +86,7 @@ class ScriptDataGenerator extends AbstractDataGenerator */ protected function generateDataForRoot(BundleEntryReaderInterface $reader, string $tempDir): ?array { + return null; } /**