minor #33825 [FrameworkBundle] encourage installing intl when String is available (nicolas-grekas)

nicolas-grekas · nicolas-grekas · commit d9ca86e7fd87 · 2019-10-04T09:50:57.000+02:00
This PR was merged into the 5.0-dev branch. Discussion ---------- [FrameworkBundle] encourage installing intl when String is available | Q | A | ------------- | --- | Branch? | master | Bug fix? | no | New feature? | no | Deprecations? | no | Tickets | - | License | MIT | Doc PR | - Commits ------- 215595b [FrameworkBundle] encourage installing intl when String is available
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
@@ -196,9 +196,18 @@ public function load(array $configs, ContainerBuilder $container)
         }
 
         // If the slugger is used but the String component is not available, we should throw an error
-        if (!class_exists(SluggerInterface::class)) {
+        if (!interface_exists(SluggerInterface::class)) {
             $container->register('slugger', 'stdClass')
-                ->addError('You cannot use the "slugger" since the String component is not installed. Try running "composer require symfony/string".');
+                ->addError('You cannot use the "slugger" service since the String component is not installed. Try running "composer require symfony/string".');
+        } else {
+            if (!interface_exists(LocaleAwareInterface::class)) {
+                $container->register('slugger', 'stdClass')
+                    ->addError('You cannot use the "slugger" service since the Translation contracts are not installed. Try running "composer require symfony/translation".');
+            }
+
+            if (!\extension_loaded('intl')) {
+                @trigger_error('Please install the "intl" PHP extension for best performance.', E_USER_DEPRECATED);
+            }
         }
 
         if (isset($config['secret'])) {
diff --git a/src/Symfony/Component/String/Slugger/AsciiSlugger.php b/src/Symfony/Component/String/Slugger/AsciiSlugger.php
@@ -107,7 +107,7 @@ public function slug(string $string, string $separator = '-', string $locale = n
 
     private function createTransliterator(string $locale): ?\Transliterator
     {
-        if (isset($this->transliterators[$locale])) {
+        if (\array_key_exists($locale, $this->transliterators)) {
             return $this->transliterators[$locale];
         }
 
@@ -118,19 +118,16 @@ private function createTransliterator(string $locale): ?\Transliterator
 
         // Locale not supported and no parent, fallback to any-latin
         if (false === $str = strrchr($locale, '_')) {
-            return null;
+            return $this->transliterators[$locale] = null;
         }
 
         // Try to use the parent locale (ie. try "de" for "de_AT") and cache both locales
         $parent = substr($locale, 0, -\strlen($str));
 
         if ($id = self::LOCALE_TO_TRANSLITERATOR_ID[$parent] ?? null) {
             $transliterator = \Transliterator::create($id.'/BGN') ?? \Transliterator::create($id);
-            $this->transliterators[$locale] = $this->transliterators[$parent] = $transliterator;
-
-            return $transliterator;
         }
 
-        return null;
+        return $this->transliterators[$locale] = $this->transliterators[$parent] = $transliterator ?? null;
     }
 }
diff --git a/src/Symfony/Component/String/composer.json b/src/Symfony/Component/String/composer.json
@@ -19,7 +19,8 @@
         "php": "^7.2.9",
         "symfony/polyfill-intl-grapheme": "~1.0",
         "symfony/polyfill-intl-normalizer": "~1.0",
-        "symfony/polyfill-mbstring": "~1.0"
+        "symfony/polyfill-mbstring": "~1.0",
+        "symfony/translation-contracts": "^1.1|^2.0"
     },
     "autoload": {
         "psr-4": { "Symfony\\Component\\String\\": "" },

Original file line number	Diff line number	Diff line change
`@@ -107,7 +107,7 @@ public function slug(string $string, string $separator = '-', string $locale = n`
`107`	`107`
`108`	`108`	`private function createTransliterator(string $locale): ?\Transliterator`
`109`	`109`	`{`
`110`		`- if (isset($this->transliterators[$locale])) {`
	`110`	`+ if (\array_key_exists($locale, $this->transliterators)) {`
`111`	`111`	`return $this->transliterators[$locale];`
`112`	`112`	`}`
`113`	`113`
`@@ -118,19 +118,16 @@ private function createTransliterator(string $locale): ?\Transliterator`
`118`	`118`
`119`	`119`	`// Locale not supported and no parent, fallback to any-latin`
`120`	`120`	`if (false === $str = strrchr($locale, '_')) {`
`121`		`- return null;`
	`121`	`+ return $this->transliterators[$locale] = null;`
`122`	`122`	`}`
`123`	`123`
`124`	`124`	`// Try to use the parent locale (ie. try "de" for "de_AT") and cache both locales`
`125`	`125`	`$parent = substr($locale, 0, -\strlen($str));`
`126`	`126`
`127`	`127`	`if ($id = self::LOCALE_TO_TRANSLITERATOR_ID[$parent] ?? null) {`
`128`	`128`	`$transliterator = \Transliterator::create($id.'/BGN') ?? \Transliterator::create($id);`
`129`		`- $this->transliterators[$locale] = $this->transliterators[$parent] = $transliterator;`
`130`		`-`
`131`		`- return $transliterator;`
`132`	`129`	`}`
`133`	`130`
`134`		`- return null;`
	`131`	`+ return $this->transliterators[$locale] = $this->transliterators[$parent] = $transliterator ?? null;`
`135`	`132`	`}`
`136`	`133`	`}`