inline strings

jschaedl · jschaedl · commit 1844f005ff6d · 2021-05-23T10:02:24.000+02:00
diff --git a/src/Symfony/Component/Console/DependencyInjection/AddConsoleCommandPass.php b/src/Symfony/Component/Console/DependencyInjection/AddConsoleCommandPass.php
@@ -29,21 +29,16 @@
  */
 class AddConsoleCommandPass implements CompilerPassInterface
 {
-    private const COMMAND_LOADER_SERVICE_ID = 'console.command_loader';
-    private const COMMAND_TAG = 'console.command';
-    private const NO_PRELOAD_TAG = 'container.no_preload';
-    private const PRIVATE_TAG_NAME = 'container.private';
-
     public function process(ContainerBuilder $container)
     {
-        $commandServices = $container->findTaggedServiceIds(self::COMMAND_TAG, true);
+        $commandServices = $container->findTaggedServiceIds('console.command', true);
         $lazyCommandMap = [];
         $lazyCommandRefs = [];
         $serviceIds = [];
 
         foreach ($commandServices as $id => $tags) {
             $definition = $container->getDefinition($id);
-            $definition->addTag(self::NO_PRELOAD_TAG);
+            $definition->addTag('container.no_preload');
             $class = $container->getParameterBag()->resolveValue($definition->getClass());
 
             if (isset($tags[0]['command'])) {
@@ -53,7 +48,7 @@ public function process(ContainerBuilder $container)
                     throw new InvalidArgumentException(sprintf('Class "%s" used for service "%s" cannot be found.', $class, $id));
                 }
                 if (!$r->isSubclassOf(Command::class)) {
-                    throw new InvalidArgumentException(sprintf('The service "%s" tagged "%s" must be a subclass of "%s".', $id, self::COMMAND_TAG, Command::class));
+                    throw new InvalidArgumentException(sprintf('The service "%s" tagged "%s" must be a subclass of "%s".', $id, 'console.command', Command::class));
                 }
                 $aliases = $class::getDefaultName();
             }
@@ -66,7 +61,7 @@ public function process(ContainerBuilder $container)
             }
 
             if (null === $commandName) {
-                if (!$definition->isPublic() || $definition->isPrivate() || $definition->hasTag(self::PRIVATE_TAG_NAME)) {
+                if (!$definition->isPublic() || $definition->isPrivate() || $definition->hasTag('container.private')) {
                     $commandId = 'console.command.public_alias.'.$id;
                     $container->setAlias($commandId, $id)->setPublic(true);
                     $id = $commandId;
@@ -110,7 +105,7 @@ public function process(ContainerBuilder $container)
                     throw new InvalidArgumentException(sprintf('Class "%s" used for service "%s" cannot be found.', $class, $id));
                 }
                 if (!$r->isSubclassOf(Command::class)) {
-                    throw new InvalidArgumentException(sprintf('The service "%s" tagged "%s" must be a subclass of "%s".', $id, self::COMMAND_TAG, Command::class));
+                    throw new InvalidArgumentException(sprintf('The service "%s" tagged "%s" must be a subclass of "%s".', $id, 'console.command', Command::class));
                 }
                 $description = $class::getDefaultDescription();
             }
@@ -126,9 +121,9 @@ public function process(ContainerBuilder $container)
         }
 
         $container
-            ->register(self::COMMAND_LOADER_SERVICE_ID, ContainerCommandLoader::class)
+            ->register('console.command_loader', ContainerCommandLoader::class)
             ->setPublic(true)
-            ->addTag(self::NO_PRELOAD_TAG)
+            ->addTag('container.no_preload')
             ->setArguments([ServiceLocatorTagPass::register($container, $lazyCommandRefs), $lazyCommandMap]);
 
         $container->setParameter('console.command.ids', $serviceIds);

Original file line number	Diff line number	Diff line change
`@@ -29,21 +29,16 @@`
`29`	`29`	`*/`
`30`	`30`	`class AddConsoleCommandPass implements CompilerPassInterface`
`31`	`31`	`{`
`32`		`- private const COMMAND_LOADER_SERVICE_ID = 'console.command_loader';`
`33`		`- private const COMMAND_TAG = 'console.command';`
`34`		`- private const NO_PRELOAD_TAG = 'container.no_preload';`
`35`		`- private const PRIVATE_TAG_NAME = 'container.private';`
`36`		`-`
`37`	`32`	`public function process(ContainerBuilder $container)`
`38`	`33`	`{`
`39`		`- $commandServices = $container->findTaggedServiceIds(self::COMMAND_TAG, true);`
	`34`	`+ $commandServices = $container->findTaggedServiceIds('console.command', true);`
`40`	`35`	`$lazyCommandMap = [];`
`41`	`36`	`$lazyCommandRefs = [];`
`42`	`37`	`$serviceIds = [];`
`43`	`38`
`44`	`39`	`foreach ($commandServices as $id => $tags) {`
`45`	`40`	`$definition = $container->getDefinition($id);`
`46`		`- $definition->addTag(self::NO_PRELOAD_TAG);`
	`41`	`+ $definition->addTag('container.no_preload');`
`47`	`42`	`$class = $container->getParameterBag()->resolveValue($definition->getClass());`
`48`	`43`
`49`	`44`	`if (isset($tags[0]['command'])) {`
`@@ -53,7 +48,7 @@ public function process(ContainerBuilder $container)`
`53`	`48`	`throw new InvalidArgumentException(sprintf('Class "%s" used for service "%s" cannot be found.', $class, $id));`
`54`	`49`	`}`
`55`	`50`	`if (!$r->isSubclassOf(Command::class)) {`
`56`		`- throw new InvalidArgumentException(sprintf('The service "%s" tagged "%s" must be a subclass of "%s".', $id, self::COMMAND_TAG, Command::class));`
	`51`	`+ throw new InvalidArgumentException(sprintf('The service "%s" tagged "%s" must be a subclass of "%s".', $id, 'console.command', Command::class));`
`57`	`52`	`}`
`58`	`53`	`$aliases = $class::getDefaultName();`
`59`	`54`	`}`
`@@ -66,7 +61,7 @@ public function process(ContainerBuilder $container)`
`66`	`61`	`}`
`67`	`62`
`68`	`63`	`if (null === $commandName) {`
`69`		`- if (!$definition->isPublic() \|\| $definition->isPrivate() \|\| $definition->hasTag(self::PRIVATE_TAG_NAME)) {`
	`64`	`+ if (!$definition->isPublic() \|\| $definition->isPrivate() \|\| $definition->hasTag('container.private')) {`
`70`	`65`	`$commandId = 'console.command.public_alias.'.$id;`
`71`	`66`	`$container->setAlias($commandId, $id)->setPublic(true);`
`72`	`67`	`$id = $commandId;`
`@@ -110,7 +105,7 @@ public function process(ContainerBuilder $container)`
`110`	`105`	`throw new InvalidArgumentException(sprintf('Class "%s" used for service "%s" cannot be found.', $class, $id));`
`111`	`106`	`}`
`112`	`107`	`if (!$r->isSubclassOf(Command::class)) {`
`113`		`- throw new InvalidArgumentException(sprintf('The service "%s" tagged "%s" must be a subclass of "%s".', $id, self::COMMAND_TAG, Command::class));`
	`108`	`+ throw new InvalidArgumentException(sprintf('The service "%s" tagged "%s" must be a subclass of "%s".', $id, 'console.command', Command::class));`
`114`	`109`	`}`
`115`	`110`	`$description = $class::getDefaultDescription();`
`116`	`111`	`}`
`@@ -126,9 +121,9 @@ public function process(ContainerBuilder $container)`
`126`	`121`	`}`
`127`	`122`
`128`	`123`	`$container`
`129`		`- ->register(self::COMMAND_LOADER_SERVICE_ID, ContainerCommandLoader::class)`
	`124`	`+ ->register('console.command_loader', ContainerCommandLoader::class)`
`130`	`125`	`->setPublic(true)`
`131`		`- ->addTag(self::NO_PRELOAD_TAG)`
	`126`	`+ ->addTag('container.no_preload')`
`132`	`127`	`->setArguments([ServiceLocatorTagPass::register($container, $lazyCommandRefs), $lazyCommandMap]);`
`133`	`128`
`134`	`129`	`$container->setParameter('console.command.ids', $serviceIds);`