CS fixes

Author: nicolas-grekas

Command/ContainerLintCommand.php

@@ -25,7 +25,6 @@
 use Symfony\Component\DependencyInjection\Compiler\PassConfig;
 use Symfony\Component\DependencyInjection\Compiler\ResolveFactoryClassPass;
 use Symfony\Component\DependencyInjection\Compiler\ResolveParameterPlaceHoldersPass;
-use Symfony\Component\DependencyInjection\Container;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Exception\InvalidArgumentException;
 use Symfony\Component\DependencyInjection\Loader\XmlFileLoader;

DependencyInjection/FrameworkExtension.php

@@ -33,6 +33,7 @@
 use Symfony\Bundle\FrameworkBundle\Routing\RouteLoaderInterface;
 use Symfony\Bundle\FullStack;
 use Symfony\Bundle\MercureBundle\MercureBundle;
+use Symfony\Component\Asset\Package;
 use Symfony\Component\Asset\PackageInterface;
 use Symfony\Component\AssetMapper\AssetMapper;
 use Symfony\Component\AssetMapper\Compiler\AssetCompilerInterface;
@@ -133,6 +134,8 @@
 use Symfony\Component\Messenger\MessageBusInterface;
 use Symfony\Component\Messenger\Middleware\DeduplicateMiddleware;
 use Symfony\Component\Messenger\Middleware\RouterContextMiddleware;
+use Symfony\Component\Messenger\Transport\AmqpExt\AmqpTransportFactory;
+use Symfony\Component\Messenger\Transport\RedisExt\RedisTransportFactory;
 use Symfony\Component\Messenger\Transport\Serialization\SerializerInterface;
 use Symfony\Component\Messenger\Transport\TransportFactoryInterface as MessengerTransportFactoryInterface;
 use Symfony\Component\Messenger\Transport\TransportInterface;
@@ -176,6 +179,7 @@
 use Symfony\Component\Scheduler\Messenger\Serializer\Normalizer\SchedulerTriggerNormalizer;
 use Symfony\Component\Security\Core\AuthenticationEvents;
 use Symfony\Component\Security\Core\Exception\AuthenticationException;
+use Symfony\Component\Security\Csrf\CsrfToken;
 use Symfony\Component\Security\Csrf\CsrfTokenManagerInterface;
 use Symfony\Component\Semaphore\PersistingStoreInterface as SemaphoreStoreInterface;
 use Symfony\Component\Semaphore\Semaphore;
@@ -389,7 +393,7 @@ public function load(array $configs, ContainerBuilder $container): void
         }
 
         if ($this->readConfigEnabled('assets', $container, $config['assets'])) {
-            if (!class_exists(\Symfony\Component\Asset\Package::class)) {
+            if (!class_exists(Package::class)) {
                 throw new LogicException('Asset support cannot be enabled as the Asset component is not installed. Try running "composer require symfony/asset".');
             }
 
@@ -594,19 +598,19 @@ public function load(array $configs, ContainerBuilder $container): void
             $container->removeDefinition('cache.messenger.restart_workers_signal');
 
             if ($container->hasDefinition('messenger.transport.amqp.factory') && !class_exists(MessengerBridge\Amqp\Transport\AmqpTransportFactory::class)) {
-                if (class_exists(\Symfony\Component\Messenger\Transport\AmqpExt\AmqpTransportFactory::class)) {
+                if (class_exists(AmqpTransportFactory::class)) {
                     $container->getDefinition('messenger.transport.amqp.factory')
-                        ->setClass(\Symfony\Component\Messenger\Transport\AmqpExt\AmqpTransportFactory::class)
+                        ->setClass(AmqpTransportFactory::class)
                         ->addTag('messenger.transport_factory');
                 } else {
                     $container->removeDefinition('messenger.transport.amqp.factory');
                 }
             }
 
             if ($container->hasDefinition('messenger.transport.redis.factory') && !class_exists(MessengerBridge\Redis\Transport\RedisTransportFactory::class)) {
-                if (class_exists(\Symfony\Component\Messenger\Transport\RedisExt\RedisTransportFactory::class)) {
+                if (class_exists(RedisTransportFactory::class)) {
                     $container->getDefinition('messenger.transport.redis.factory')
-                        ->setClass(\Symfony\Component\Messenger\Transport\RedisExt\RedisTransportFactory::class)
+                        ->setClass(RedisTransportFactory::class)
                         ->addTag('messenger.transport_factory');
                 } else {
                     $container->removeDefinition('messenger.transport.redis.factory');
@@ -1971,7 +1975,7 @@ private function registerSecurityCsrfConfiguration(array $config, ContainerBuild
             return;
         }
 
-        if (!class_exists(\Symfony\Component\Security\Csrf\CsrfToken::class)) {
+        if (!class_exists(CsrfToken::class)) {
             throw new LogicException('CSRF support cannot be enabled as the Security CSRF component is not installed. Try running "composer require symfony/security-csrf".');
         }
         if (!$config['stateless_token_ids'] && !$this->isInitializedConfigEnabled('session')) {

Resources/config/console.php

@@ -45,6 +45,7 @@
 use Symfony\Component\Console\Messenger\RunCommandMessageHandler;
 use Symfony\Component\Dotenv\Command\DebugCommand as DotenvDebugCommand;
 use Symfony\Component\ErrorHandler\Command\ErrorDumpCommand;
+use Symfony\Component\Form\Command\DebugCommand;
 use Symfony\Component\Messenger\Command\ConsumeMessagesCommand;
 use Symfony\Component\Messenger\Command\DebugCommand as MessengerDebugCommand;
 use Symfony\Component\Messenger\Command\FailedMessagesRemoveCommand;
@@ -327,7 +328,7 @@
             ])
             ->tag('console.command')
 
-        ->set('console.command.form_debug', \Symfony\Component\Form\Command\DebugCommand::class)
+        ->set('console.command.form_debug', DebugCommand::class)
             ->args([
                 service('form.registry'),
                 [], // All form types namespaces are stored here by FormPass

Tests/DependencyInjection/FrameworkExtensionTestCase.php

@@ -14,6 +14,7 @@
 use PHPUnit\Framework\Attributes\DataProvider;
 use Psr\Cache\CacheItemPoolInterface;
 use Psr\Log\LoggerAwareInterface;
+use Psr\Log\LogLevel;
 use Symfony\Bundle\FrameworkBundle\DependencyInjection\FrameworkExtension;
 use Symfony\Bundle\FrameworkBundle\FrameworkBundle;
 use Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection\Fixtures\Workflow\Validator\DefinitionValidator;
@@ -59,6 +60,10 @@
 use Symfony\Component\HttpClient\ThrottlingHttpClient;
 use Symfony\Component\HttpFoundation\IpUtils;
 use Symfony\Component\HttpKernel\DependencyInjection\LoggerPass;
+use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
+use Symfony\Component\HttpKernel\Exception\ConflictHttpException;
+use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
+use Symfony\Component\HttpKernel\Exception\ServiceUnavailableHttpException;
 use Symfony\Component\HttpKernel\Fragment\FragmentUriGeneratorInterface;
 use Symfony\Component\Lock\Store\SemaphoreStore;
 use Symfony\Component\Messenger\Bridge\AmazonSqs\Transport\AmazonSqsTransportFactory;
@@ -599,8 +604,8 @@ public function testPhpErrorsWithLogLevels()
         $definition = $container->getDefinition('debug.error_handler_configurator');
         $this->assertEquals(new Reference('logger', ContainerInterface::NULL_ON_INVALID_REFERENCE), $definition->getArgument(0));
         $this->assertSame([
-            \E_NOTICE => \Psr\Log\LogLevel::ERROR,
-            \E_WARNING => \Psr\Log\LogLevel::ERROR,
+            \E_NOTICE => LogLevel::ERROR,
+            \E_WARNING => LogLevel::ERROR,
         ], $definition->getArgument(1));
     }
 
@@ -611,35 +616,35 @@ public function testExceptionsConfig()
         $configuration = $container->getDefinition('exception_listener')->getArgument(3);
 
         $this->assertSame([
-            \Symfony\Component\HttpKernel\Exception\BadRequestHttpException::class,
-            \Symfony\Component\HttpKernel\Exception\NotFoundHttpException::class,
-            \Symfony\Component\HttpKernel\Exception\ConflictHttpException::class,
-            \Symfony\Component\HttpKernel\Exception\ServiceUnavailableHttpException::class,
+            BadRequestHttpException::class,
+            NotFoundHttpException::class,
+            ConflictHttpException::class,
+            ServiceUnavailableHttpException::class,
         ], array_keys($configuration));
 
         $this->assertEqualsCanonicalizing([
             'log_channel' => null,
             'log_level' => 'info',
             'status_code' => 422,
-        ], $configuration[\Symfony\Component\HttpKernel\Exception\BadRequestHttpException::class]);
+        ], $configuration[BadRequestHttpException::class]);
 
         $this->assertEqualsCanonicalizing([
             'log_channel' => null,
             'log_level' => 'info',
             'status_code' => null,
-        ], $configuration[\Symfony\Component\HttpKernel\Exception\NotFoundHttpException::class]);
+        ], $configuration[NotFoundHttpException::class]);
 
         $this->assertEqualsCanonicalizing([
             'log_channel' => null,
             'log_level' => 'info',
             'status_code' => null,
-        ], $configuration[\Symfony\Component\HttpKernel\Exception\ConflictHttpException::class]);
+        ], $configuration[ConflictHttpException::class]);
 
         $this->assertEqualsCanonicalizing([
             'log_channel' => null,
             'log_level' => null,
             'status_code' => 500,
-        ], $configuration[\Symfony\Component\HttpKernel\Exception\ServiceUnavailableHttpException::class]);
+        ], $configuration[ServiceUnavailableHttpException::class]);
     }
 
     public function testRouter()