some backports from master

nicolas-grekas · nicolas-grekas · commit 9bf6aac05b8e · 2019-08-20T18:35:28.000+02:00
diff --git a/Data/Generator/CurrencyDataGenerator.php b/Data/Generator/CurrencyDataGenerator.php
@@ -51,15 +51,15 @@ class CurrencyDataGenerator extends AbstractDataGenerator
     /**
      * {@inheritdoc}
      */
-    protected function scanLocales(LocaleScanner $scanner, $sourceDir): array
+    protected function scanLocales(LocaleScanner $scanner, string $sourceDir): array
     {
         return $scanner->scanLocales($sourceDir.'/curr');
     }
 
     /**
      * {@inheritdoc}
      */
-    protected function compileTemporaryBundles(BundleCompilerInterface $compiler, $sourceDir, $tempDir)
+    protected function compileTemporaryBundles(BundleCompilerInterface $compiler, string $sourceDir, string $tempDir)
     {
         $compiler->compile($sourceDir.'/curr', $tempDir);
         $compiler->compile($sourceDir.'/misc/currencyNumericCodes.txt', $tempDir);
@@ -76,7 +76,7 @@ protected function preGenerate()
     /**
      * {@inheritdoc}
      */
-    protected function generateDataForLocale(BundleEntryReaderInterface $reader, $tempDir, $displayLocale): ?array
+    protected function generateDataForLocale(BundleEntryReaderInterface $reader, string $tempDir, string $displayLocale): ?array
     {
         $localeBundle = $reader->read($tempDir, $displayLocale);
 
@@ -97,7 +97,7 @@ protected function generateDataForLocale(BundleEntryReaderInterface $reader, $te
     /**
      * {@inheritdoc}
      */
-    protected function generateDataForRoot(BundleEntryReaderInterface $reader, $tempDir): ?array
+    protected function generateDataForRoot(BundleEntryReaderInterface $reader, string $tempDir): ?array
     {
         $rootBundle = $reader->read($tempDir, 'root');
 
@@ -110,7 +110,7 @@ protected function generateDataForRoot(BundleEntryReaderInterface $reader, $temp
     /**
      * {@inheritdoc}
      */
-    protected function generateDataForMeta(BundleEntryReaderInterface $reader, $tempDir): ?array
+    protected function generateDataForMeta(BundleEntryReaderInterface $reader, string $tempDir): ?array
     {
         $rootBundle = $reader->read($tempDir, 'root');
         $supplementalDataBundle = $reader->read($tempDir, 'supplementalData');
diff --git a/Data/Generator/LanguageDataGenerator.php b/Data/Generator/LanguageDataGenerator.php
@@ -101,15 +101,15 @@ class LanguageDataGenerator extends AbstractDataGenerator
     /**
      * {@inheritdoc}
      */
-    protected function scanLocales(LocaleScanner $scanner, $sourceDir): array
+    protected function scanLocales(LocaleScanner $scanner, string $sourceDir): array
     {
         return $scanner->scanLocales($sourceDir.'/lang');
     }
 
     /**
      * {@inheritdoc}
      */
-    protected function compileTemporaryBundles(BundleCompilerInterface $compiler, $sourceDir, $tempDir)
+    protected function compileTemporaryBundles(BundleCompilerInterface $compiler, string $sourceDir, string $tempDir)
     {
         $compiler->compile($sourceDir.'/lang', $tempDir);
         $compiler->compile($sourceDir.'/misc/metadata.txt', $tempDir);
@@ -126,7 +126,7 @@ protected function preGenerate()
     /**
      * {@inheritdoc}
      */
-    protected function generateDataForLocale(BundleEntryReaderInterface $reader, $tempDir, $displayLocale): ?array
+    protected function generateDataForLocale(BundleEntryReaderInterface $reader, string $tempDir, string $displayLocale): ?array
     {
         $localeBundle = $reader->read($tempDir, $displayLocale);
 
@@ -148,14 +148,14 @@ protected function generateDataForLocale(BundleEntryReaderInterface $reader, $te
     /**
      * {@inheritdoc}
      */
-    protected function generateDataForRoot(BundleEntryReaderInterface $reader, $tempDir): ?array
+    protected function generateDataForRoot(BundleEntryReaderInterface $reader, string $tempDir): ?array
     {
     }
 
     /**
      * {@inheritdoc}
      */
-    protected function generateDataForMeta(BundleEntryReaderInterface $reader, $tempDir): ?array
+    protected function generateDataForMeta(BundleEntryReaderInterface $reader, string $tempDir): ?array
     {
         $rootBundle = $reader->read($tempDir, 'root');
         $metadataBundle = $reader->read($tempDir, 'metadata');
diff --git a/Data/Generator/LocaleDataGenerator.php b/Data/Generator/LocaleDataGenerator.php
@@ -36,7 +36,7 @@ class LocaleDataGenerator extends AbstractDataGenerator
     /**
      * {@inheritdoc}
      */
-    protected function scanLocales(LocaleScanner $scanner, $sourceDir): array
+    protected function scanLocales(LocaleScanner $scanner, string $sourceDir): array
     {
         $this->locales = $scanner->scanLocales($sourceDir.'/locales');
         $this->localeAliases = $scanner->scanAliases($sourceDir.'/locales');
@@ -48,7 +48,7 @@ protected function scanLocales(LocaleScanner $scanner, $sourceDir): array
     /**
      * {@inheritdoc}
      */
-    protected function compileTemporaryBundles(BundleCompilerInterface $compiler, $sourceDir, $tempDir)
+    protected function compileTemporaryBundles(BundleCompilerInterface $compiler, string $sourceDir, string $tempDir)
     {
         $filesystem = new Filesystem();
         $filesystem->mkdir([
@@ -74,7 +74,7 @@ protected function preGenerate()
     /**
      * {@inheritdoc}
      */
-    protected function generateDataForLocale(BundleEntryReaderInterface $reader, $tempDir, $displayLocale): ?array
+    protected function generateDataForLocale(BundleEntryReaderInterface $reader, string $tempDir, string $displayLocale): ?array
     {
         // Don't generate aliases, as they are resolved during runtime
         // Unless an alias is needed as fallback for de-duplication purposes
@@ -133,14 +133,14 @@ protected function generateDataForLocale(BundleEntryReaderInterface $reader, $te
     /**
      * {@inheritdoc}
      */
-    protected function generateDataForRoot(BundleEntryReaderInterface $reader, $tempDir): ?array
+    protected function generateDataForRoot(BundleEntryReaderInterface $reader, string $tempDir): ?array
     {
     }
 
     /**
      * {@inheritdoc}
      */
-    protected function generateDataForMeta(BundleEntryReaderInterface $reader, $tempDir): ?array
+    protected function generateDataForMeta(BundleEntryReaderInterface $reader, string $tempDir): ?array
     {
         return [
             'Locales' => $this->locales,
diff --git a/Data/Generator/RegionDataGenerator.php b/Data/Generator/RegionDataGenerator.php
@@ -84,15 +84,15 @@ public static function isValidCountryCode($region)
     /**
      * {@inheritdoc}
      */
-    protected function scanLocales(LocaleScanner $scanner, $sourceDir): array
+    protected function scanLocales(LocaleScanner $scanner, string $sourceDir): array
     {
         return $scanner->scanLocales($sourceDir.'/region');
     }
 
     /**
      * {@inheritdoc}
      */
-    protected function compileTemporaryBundles(BundleCompilerInterface $compiler, $sourceDir, $tempDir)
+    protected function compileTemporaryBundles(BundleCompilerInterface $compiler, string $sourceDir, string $tempDir)
     {
         $compiler->compile($sourceDir.'/region', $tempDir);
         $compiler->compile($sourceDir.'/misc/metadata.txt', $tempDir);
@@ -109,7 +109,7 @@ protected function preGenerate()
     /**
      * {@inheritdoc}
      */
-    protected function generateDataForLocale(BundleEntryReaderInterface $reader, $tempDir, $displayLocale): ?array
+    protected function generateDataForLocale(BundleEntryReaderInterface $reader, string $tempDir, string $displayLocale): ?array
     {
         $localeBundle = $reader->read($tempDir, $displayLocale);
 
@@ -131,14 +131,14 @@ protected function generateDataForLocale(BundleEntryReaderInterface $reader, $te
     /**
      * {@inheritdoc}
      */
-    protected function generateDataForRoot(BundleEntryReaderInterface $reader, $tempDir): ?array
+    protected function generateDataForRoot(BundleEntryReaderInterface $reader, string $tempDir): ?array
     {
     }
 
     /**
      * {@inheritdoc}
      */
-    protected function generateDataForMeta(BundleEntryReaderInterface $reader, $tempDir): ?array
+    protected function generateDataForMeta(BundleEntryReaderInterface $reader, string $tempDir): ?array
     {
         $rootBundle = $reader->read($tempDir, 'root');
         $metadataBundle = $reader->read($tempDir, 'metadata');
diff --git a/Data/Generator/ScriptDataGenerator.php b/Data/Generator/ScriptDataGenerator.php
@@ -38,15 +38,15 @@ class ScriptDataGenerator extends AbstractDataGenerator
     /**
      * {@inheritdoc}
      */
-    protected function scanLocales(LocaleScanner $scanner, $sourceDir): array
+    protected function scanLocales(LocaleScanner $scanner, string $sourceDir): array
     {
         return $scanner->scanLocales($sourceDir.'/lang');
     }
 
     /**
      * {@inheritdoc}
      */
-    protected function compileTemporaryBundles(BundleCompilerInterface $compiler, $sourceDir, $tempDir)
+    protected function compileTemporaryBundles(BundleCompilerInterface $compiler, string $sourceDir, string $tempDir)
     {
         $compiler->compile($sourceDir.'/lang', $tempDir);
     }
@@ -62,7 +62,7 @@ protected function preGenerate()
     /**
      * {@inheritdoc}
      */
-    protected function generateDataForLocale(BundleEntryReaderInterface $reader, $tempDir, $displayLocale): ?array
+    protected function generateDataForLocale(BundleEntryReaderInterface $reader, string $tempDir, string $displayLocale): ?array
     {
         $localeBundle = $reader->read($tempDir, $displayLocale);
 
@@ -84,14 +84,14 @@ protected function generateDataForLocale(BundleEntryReaderInterface $reader, $te
     /**
      * {@inheritdoc}
      */
-    protected function generateDataForRoot(BundleEntryReaderInterface $reader, $tempDir): ?array
+    protected function generateDataForRoot(BundleEntryReaderInterface $reader, string $tempDir): ?array
     {
     }
 
     /**
      * {@inheritdoc}
      */
-    protected function generateDataForMeta(BundleEntryReaderInterface $reader, $tempDir): ?array
+    protected function generateDataForMeta(BundleEntryReaderInterface $reader, string $tempDir): ?array
     {
         $rootBundle = $reader->read($tempDir, 'root');
 
diff --git a/Data/Generator/TimezoneDataGenerator.php b/Data/Generator/TimezoneDataGenerator.php
@@ -42,7 +42,7 @@ class TimezoneDataGenerator extends AbstractDataGenerator
     /**
      * {@inheritdoc}
      */
-    protected function scanLocales(LocaleScanner $scanner, $sourceDir): array
+    protected function scanLocales(LocaleScanner $scanner, string $sourceDir): array
     {
         $this->localeAliases = $scanner->scanAliases($sourceDir.'/locales');
 
@@ -52,7 +52,7 @@ protected function scanLocales(LocaleScanner $scanner, $sourceDir): array
     /**
      * {@inheritdoc}
      */
-    protected function compileTemporaryBundles(BundleCompilerInterface $compiler, $sourceDir, $tempDir)
+    protected function compileTemporaryBundles(BundleCompilerInterface $compiler, string $sourceDir, string $tempDir)
     {
         $filesystem = new Filesystem();
         $filesystem->mkdir($tempDir.'/region');
@@ -75,7 +75,7 @@ protected function preGenerate()
     /**
      * {@inheritdoc}
      */
-    protected function generateDataForLocale(BundleEntryReaderInterface $reader, $tempDir, $displayLocale): ?array
+    protected function generateDataForLocale(BundleEntryReaderInterface $reader, string $tempDir, string $displayLocale): ?array
     {
         if (!$this->zoneToCountryMapping) {
             $this->zoneToCountryMapping = self::generateZoneToCountryMapping($reader->read($tempDir, 'windowsZones'));
@@ -126,7 +126,7 @@ protected function generateDataForLocale(BundleEntryReaderInterface $reader, $te
     /**
      * {@inheritdoc}
      */
-    protected function generateDataForRoot(BundleEntryReaderInterface $reader, $tempDir): ?array
+    protected function generateDataForRoot(BundleEntryReaderInterface $reader, string $tempDir): ?array
     {
         $rootBundle = $reader->read($tempDir, 'root');
 
@@ -139,7 +139,7 @@ protected function generateDataForRoot(BundleEntryReaderInterface $reader, $temp
     /**
      * {@inheritdoc}
      */
-    protected function generateDataForMeta(BundleEntryReaderInterface $reader, $tempDir): ?array
+    protected function generateDataForMeta(BundleEntryReaderInterface $reader, string $tempDir): ?array
     {
         $rootBundle = $reader->read($tempDir, 'root');
 

Original file line number	Diff line number	Diff line change
`@@ -101,15 +101,15 @@ class LanguageDataGenerator extends AbstractDataGenerator`
`101`	`101`	`/**`
`102`	`102`	`* {@inheritdoc}`
`103`	`103`	`*/`
`104`		`- protected function scanLocales(LocaleScanner $scanner, $sourceDir): array`
	`104`	`+ protected function scanLocales(LocaleScanner $scanner, string $sourceDir): array`
`105`	`105`	`{`
`106`	`106`	`return $scanner->scanLocales($sourceDir.'/lang');`
`107`	`107`	`}`
`108`	`108`
`109`	`109`	`/**`
`110`	`110`	`* {@inheritdoc}`
`111`	`111`	`*/`
`112`		`- protected function compileTemporaryBundles(BundleCompilerInterface $compiler, $sourceDir, $tempDir)`
	`112`	`+ protected function compileTemporaryBundles(BundleCompilerInterface $compiler, string $sourceDir, string $tempDir)`
`113`	`113`	`{`
`114`	`114`	`$compiler->compile($sourceDir.'/lang', $tempDir);`
`115`	`115`	`$compiler->compile($sourceDir.'/misc/metadata.txt', $tempDir);`
`@@ -126,7 +126,7 @@ protected function preGenerate()`
`126`	`126`	`/**`
`127`	`127`	`* {@inheritdoc}`
`128`	`128`	`*/`
`129`		`- protected function generateDataForLocale(BundleEntryReaderInterface $reader, $tempDir, $displayLocale): ?array`
	`129`	`+ protected function generateDataForLocale(BundleEntryReaderInterface $reader, string $tempDir, string $displayLocale): ?array`
`130`	`130`	`{`
`131`	`131`	`$localeBundle = $reader->read($tempDir, $displayLocale);`
`132`	`132`
`@@ -148,14 +148,14 @@ protected function generateDataForLocale(BundleEntryReaderInterface $reader, $te`
`148`	`148`	`/**`
`149`	`149`	`* {@inheritdoc}`
`150`	`150`	`*/`
`151`		`- protected function generateDataForRoot(BundleEntryReaderInterface $reader, $tempDir): ?array`
	`151`	`+ protected function generateDataForRoot(BundleEntryReaderInterface $reader, string $tempDir): ?array`
`152`	`152`	`{`
`153`	`153`	`}`
`154`	`154`
`155`	`155`	`/**`
`156`	`156`	`* {@inheritdoc}`
`157`	`157`	`*/`
`158`		`- protected function generateDataForMeta(BundleEntryReaderInterface $reader, $tempDir): ?array`
	`158`	`+ protected function generateDataForMeta(BundleEntryReaderInterface $reader, string $tempDir): ?array`
`159`	`159`	`{`
`160`	`160`	`$rootBundle = $reader->read($tempDir, 'root');`
`161`	`161`	`$metadataBundle = $reader->read($tempDir, 'metadata');`
Original file line number	Diff line number	Diff line change
`@@ -84,15 +84,15 @@ public static function isValidCountryCode($region)`
`84`	`84`	`/**`
`85`	`85`	`* {@inheritdoc}`
`86`	`86`	`*/`
`87`		`- protected function scanLocales(LocaleScanner $scanner, $sourceDir): array`
	`87`	`+ protected function scanLocales(LocaleScanner $scanner, string $sourceDir): array`
`88`	`88`	`{`
`89`	`89`	`return $scanner->scanLocales($sourceDir.'/region');`
`90`	`90`	`}`
`91`	`91`
`92`	`92`	`/**`
`93`	`93`	`* {@inheritdoc}`
`94`	`94`	`*/`
`95`		`- protected function compileTemporaryBundles(BundleCompilerInterface $compiler, $sourceDir, $tempDir)`
	`95`	`+ protected function compileTemporaryBundles(BundleCompilerInterface $compiler, string $sourceDir, string $tempDir)`
`96`	`96`	`{`
`97`	`97`	`$compiler->compile($sourceDir.'/region', $tempDir);`
`98`	`98`	`$compiler->compile($sourceDir.'/misc/metadata.txt', $tempDir);`
`@@ -109,7 +109,7 @@ protected function preGenerate()`
`109`	`109`	`/**`
`110`	`110`	`* {@inheritdoc}`
`111`	`111`	`*/`
`112`		`- protected function generateDataForLocale(BundleEntryReaderInterface $reader, $tempDir, $displayLocale): ?array`
	`112`	`+ protected function generateDataForLocale(BundleEntryReaderInterface $reader, string $tempDir, string $displayLocale): ?array`
`113`	`113`	`{`
`114`	`114`	`$localeBundle = $reader->read($tempDir, $displayLocale);`
`115`	`115`
`@@ -131,14 +131,14 @@ protected function generateDataForLocale(BundleEntryReaderInterface $reader, $te`
`131`	`131`	`/**`
`132`	`132`	`* {@inheritdoc}`
`133`	`133`	`*/`
`134`		`- protected function generateDataForRoot(BundleEntryReaderInterface $reader, $tempDir): ?array`
	`134`	`+ protected function generateDataForRoot(BundleEntryReaderInterface $reader, string $tempDir): ?array`
`135`	`135`	`{`
`136`	`136`	`}`
`137`	`137`
`138`	`138`	`/**`
`139`	`139`	`* {@inheritdoc}`
`140`	`140`	`*/`
`141`		`- protected function generateDataForMeta(BundleEntryReaderInterface $reader, $tempDir): ?array`
	`141`	`+ protected function generateDataForMeta(BundleEntryReaderInterface $reader, string $tempDir): ?array`
`142`	`142`	`{`
`143`	`143`	`$rootBundle = $reader->read($tempDir, 'root');`
`144`	`144`	`$metadataBundle = $reader->read($tempDir, 'metadata');`
Original file line number	Diff line number	Diff line change
`@@ -38,15 +38,15 @@ class ScriptDataGenerator extends AbstractDataGenerator`
`38`	`38`	`/**`
`39`	`39`	`* {@inheritdoc}`
`40`	`40`	`*/`
`41`		`- protected function scanLocales(LocaleScanner $scanner, $sourceDir): array`
	`41`	`+ protected function scanLocales(LocaleScanner $scanner, string $sourceDir): array`
`42`	`42`	`{`
`43`	`43`	`return $scanner->scanLocales($sourceDir.'/lang');`
`44`	`44`	`}`
`45`	`45`
`46`	`46`	`/**`
`47`	`47`	`* {@inheritdoc}`
`48`	`48`	`*/`
`49`		`- protected function compileTemporaryBundles(BundleCompilerInterface $compiler, $sourceDir, $tempDir)`
	`49`	`+ protected function compileTemporaryBundles(BundleCompilerInterface $compiler, string $sourceDir, string $tempDir)`
`50`	`50`	`{`
`51`	`51`	`$compiler->compile($sourceDir.'/lang', $tempDir);`
`52`	`52`	`}`
`@@ -62,7 +62,7 @@ protected function preGenerate()`
`62`	`62`	`/**`
`63`	`63`	`* {@inheritdoc}`
`64`	`64`	`*/`
`65`		`- protected function generateDataForLocale(BundleEntryReaderInterface $reader, $tempDir, $displayLocale): ?array`
	`65`	`+ protected function generateDataForLocale(BundleEntryReaderInterface $reader, string $tempDir, string $displayLocale): ?array`
`66`	`66`	`{`
`67`	`67`	`$localeBundle = $reader->read($tempDir, $displayLocale);`
`68`	`68`
`@@ -84,14 +84,14 @@ protected function generateDataForLocale(BundleEntryReaderInterface $reader, $te`
`84`	`84`	`/**`
`85`	`85`	`* {@inheritdoc}`
`86`	`86`	`*/`
`87`		`- protected function generateDataForRoot(BundleEntryReaderInterface $reader, $tempDir): ?array`
	`87`	`+ protected function generateDataForRoot(BundleEntryReaderInterface $reader, string $tempDir): ?array`
`88`	`88`	`{`
`89`	`89`	`}`
`90`	`90`
`91`	`91`	`/**`
`92`	`92`	`* {@inheritdoc}`
`93`	`93`	`*/`
`94`		`- protected function generateDataForMeta(BundleEntryReaderInterface $reader, $tempDir): ?array`
	`94`	`+ protected function generateDataForMeta(BundleEntryReaderInterface $reader, string $tempDir): ?array`
`95`	`95`	`{`
`96`	`96`	`$rootBundle = $reader->read($tempDir, 'root');`
`97`	`97`