bug #33734 [Intl] Fix compile type errors (ro0NL)
This PR was merged into the 4.4 branch.
Discussion
----------
[Intl] Fix compile type errors
| Q | A
| ------------- | ---
| Branch? | 4.4
| Bug fix? | yes
| New feature? | no
| Deprecations? | no
| Tickets | Fix #... <!-- prefix each issue number with "Fix #", if any -->
| License | MIT
| Doc PR | symfony/symfony-docs#... <!-- required for new features -->
Fixes e.g. `TypeError: Return value of Symfony\Component\Intl\Data\Generator\LanguageDataGenerator::generateDataForRoot() must be of the type array or null, none returned`
Adding typehints in `FallbackTrait` seems forgotten, now added as all generator stuff is `@internal` anyway ran on latest PHP.
Commits
-------
96fae635be
[Intl] Fix compile type errors
This commit is contained in:
commit
86d7efad2b
@ -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
|
||||
{
|
||||
|
@ -150,6 +150,7 @@ class LanguageDataGenerator extends AbstractDataGenerator
|
||||
*/
|
||||
protected function generateDataForRoot(BundleEntryReaderInterface $reader, string $tempDir): ?array
|
||||
{
|
||||
return null;
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -135,6 +135,7 @@ class LocaleDataGenerator extends AbstractDataGenerator
|
||||
*/
|
||||
protected function generateDataForRoot(BundleEntryReaderInterface $reader, string $tempDir): ?array
|
||||
{
|
||||
return null;
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -133,6 +133,7 @@ class RegionDataGenerator extends AbstractDataGenerator
|
||||
*/
|
||||
protected function generateDataForRoot(BundleEntryReaderInterface $reader, string $tempDir): ?array
|
||||
{
|
||||
return null;
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -86,6 +86,7 @@ class ScriptDataGenerator extends AbstractDataGenerator
|
||||
*/
|
||||
protected function generateDataForRoot(BundleEntryReaderInterface $reader, string $tempDir): ?array
|
||||
{
|
||||
return null;
|
||||
}
|
||||
|
||||
/**
|
||||
|
Reference in New Issue
Block a user