diff vendor/symfony/translation/DependencyInjection/TranslatorPass.php @ 4:a9cd425dd02b

Update, including to Drupal core 8.6.10
author Chris Cannam
date Thu, 28 Feb 2019 13:11:55 +0000
parents c75dbcec494b
children
line wrap: on
line diff
--- a/vendor/symfony/translation/DependencyInjection/TranslatorPass.php	Thu Feb 28 11:14:44 2019 +0000
+++ b/vendor/symfony/translation/DependencyInjection/TranslatorPass.php	Thu Feb 28 13:11:55 2019 +0000
@@ -11,10 +11,10 @@
 
 namespace Symfony\Component\Translation\DependencyInjection;
 
-use Symfony\Component\DependencyInjection\Reference;
-use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
 use Symfony\Component\DependencyInjection\Compiler\ServiceLocatorTagPass;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Reference;
 
 class TranslatorPass implements CompilerPassInterface
 {
@@ -26,8 +26,8 @@
 
     public function __construct($translatorServiceId = 'translator.default', $readerServiceId = 'translation.loader', $loaderTag = 'translation.loader', $debugCommandServiceId = 'console.command.translation_debug', $updateCommandServiceId = 'console.command.translation_update')
     {
-        if ('translation.loader' === $readerServiceId && 2 > func_num_args()) {
-            @trigger_error('The default value for $readerServiceId will change in 4.0 to "translation.reader".', E_USER_DEPRECATED);
+        if ('translation.loader' === $readerServiceId && 2 > \func_num_args()) {
+            @trigger_error(sprintf('The default value for $readerServiceId in "%s()" will change in 4.0 to "translation.reader".', __METHOD__), E_USER_DEPRECATED);
         }
 
         $this->translatorServiceId = $translatorServiceId;
@@ -43,8 +43,8 @@
             return;
         }
 
-        $loaders = array();
-        $loaderRefs = array();
+        $loaders = [];
+        $loaderRefs = [];
         foreach ($container->findTaggedServiceIds($this->loaderTag, true) as $id => $attributes) {
             $loaderRefs[$id] = new Reference($id);
             $loaders[$id][] = $attributes[0]['alias'];
@@ -57,7 +57,7 @@
             $definition = $container->getDefinition($this->readerServiceId);
             foreach ($loaders as $id => $formats) {
                 foreach ($formats as $format) {
-                    $definition->addMethodCall('addLoader', array($format, $loaderRefs[$id]));
+                    $definition->addMethodCall('addLoader', [$format, $loaderRefs[$id]]);
                 }
             }
         }
@@ -68,7 +68,7 @@
                 $definition = $container->getDefinition('translation.reader');
                 foreach ($loaders as $id => $formats) {
                     foreach ($formats as $format) {
-                        $definition->addMethodCall('addLoader', array($format, $loaderRefs[$id]));
+                        $definition->addMethodCall('addLoader', [$format, $loaderRefs[$id]]);
                     }
                 }
             }