Drop support Sf 6.x to keep 6.4 only (#421)

composer.json

@@ -21,14 +21,14 @@
     "ext-json": "*",
     "damienharper/auditor": "dev-master",
     "doctrine/doctrine-bundle": "^2.0",
-    "doctrine/orm": "^2.13|^3.2",
-    "symfony/asset": "^5.4|^6.0|^7.0",
-    "symfony/doctrine-bridge": "^5.4|^6.0|^7.0",
-    "symfony/event-dispatcher": "^5.4|^6.0|^7.0",
-    "symfony/lock": "^5.4|^6.0|^7.0",
-    "symfony/security-bundle": "^5.4|^6.0|^7.0",
-    "symfony/translation": "^5.4|^6.0|^7.0",
-    "symfony/twig-bundle": "^5.4|^6.0|^7.0",
+    "doctrine/orm": "^2.13 || ^3.2",
+    "symfony/asset": "^5.4|^6.4|^7.0",
+    "symfony/doctrine-bridge": "^5.4|^6.4|^7.0",
+    "symfony/event-dispatcher": "^5.4|^6.4|^7.0",
+    "symfony/lock": "^5.4|^6.4|^7.0",
+    "symfony/security-bundle": "^5.4|^6.4|^7.0",
+    "symfony/translation": "^5.4|^6.4|^7.0",
+    "symfony/twig-bundle": "^5.4|^6.4|^7.0",
     "twig/extra-bundle": "^3.3",
     "twig/intl-extra": "^3.3"
   },
@@ -48,10 +48,10 @@
     "matthiasnoback/symfony-dependency-injection-test": "^6.0",
     "nyholm/symfony-bundle-test": "^2.0|^3.0",
     "phpunit/phpunit": "^11.0",
-    "symfony/browser-kit": "^5.4|^6.0|^7.0",
-    "symfony/css-selector": "^5.4|^6.0|^7.0",
-    "symfony/framework-bundle": "^5.4|^6.0|^7.0",
-    "symfony/var-dumper": "^5.4|^6.0|^7.0",
+    "symfony/browser-kit": "^5.4|^6.4|^7.0",
+    "symfony/css-selector": "^5.4|^6.4|^7.0",
+    "symfony/framework-bundle": "^5.4|^6.4|^7.0",
+    "symfony/var-dumper": "^5.4|^6.4|^7.0",
     "symfony/webpack-encore-bundle": "^1.12|^2.0",
     "doctrine/data-fixtures": "^1.4"
   },

src/DependencyInjection/Configuration.php

@@ -15,7 +15,7 @@ public function getConfigTreeBuilder(): TreeBuilder
     {
         $treeBuilder = new TreeBuilder('dh_auditor');
 
-        $this->getRootNode($treeBuilder, 'dh_auditor')
+        $treeBuilder->getRootNode()
             ->children()
                 ->booleanNode('enabled')
                     ->defaultTrue()
@@ -39,23 +39,11 @@ public function getConfigTreeBuilder(): TreeBuilder
         return $treeBuilder;
     }
 
-    /**
-     * Proxy to get root node for Symfony < 4.2.
-     */
-    protected function getRootNode(TreeBuilder $treeBuilder, string $name): ArrayNodeDefinition
-    {
-        if (method_exists($treeBuilder, 'getRootNode')) {
-            return $treeBuilder->getRootNode();
-        }
-
-        return $treeBuilder->root($name);
-    }
-
     private function getProvidersNode(): ArrayNodeDefinition
     {
         $treeBuilder = new TreeBuilder('providers');
 
-        return $this->getRootNode($treeBuilder, 'providers')
+        return $treeBuilder->getRootNode()
             ->requiresAtLeastOneElement()
             ->useAttributeAsKey('name')
             ->variablePrototype()

src/DependencyInjection/DHAuditorExtension.php

@@ -32,10 +32,7 @@ private function loadProviders(ContainerBuilder $container, array $config): void
         foreach ($config['providers'] as $providerName => $providerConfig) {
             $container->setParameter('dh_auditor.provider.'.$providerName.'.configuration', $providerConfig);
 
-            if (method_exists($container, 'registerAliasForArgument')) {
-                $serviceId = 'dh_auditor.provider.'.$providerName;
-                $container->registerAliasForArgument($serviceId, ProviderInterface::class, \sprintf('%sProvider', $providerName));
-            }
+            $container->registerAliasForArgument('dh_auditor.provider.'.$providerName, ProviderInterface::class, \sprintf('%sProvider', $providerName));
         }
     }
 }

src/Event/ViewerEventSubscriber.php

@@ -5,7 +5,6 @@
 namespace DH\AuditorBundle\Event;
 
 use DH\Auditor\Auditor;
-use DH\Auditor\Configuration as AuditorConfiguration;
 use DH\Auditor\Provider\Doctrine\Configuration as DoctrineProviderConfiguration;
 use DH\Auditor\Provider\Doctrine\DoctrineProvider;
 use DH\AuditorBundle\Controller\ViewerController;
@@ -33,7 +32,6 @@ public function onKernelController(KernelEvent $event): void
             $controller = $controller[0];
         }
 
-        /** @var AuditorConfiguration $auditorConfiguration */
         $auditorConfiguration = $this->auditor->getConfiguration();
 
         /** @var DoctrineProviderConfiguration $providerConfiguration */

src/User/ConsoleUserProvider.php

@@ -27,6 +27,6 @@ public function __invoke(): ?UserInterface
 
     public function setCurrentCommand(?Command $command): void
     {
-        $this->currentCommand = $command instanceof Command ? $command->getName() : null;
+        $this->currentCommand = $command?->getName();
     }
 }

src/User/UserProvider.php

@@ -47,11 +47,7 @@ public function __invoke(): ?AuditorUserInterface
 
     private function getUsername(UserInterface $user): string
     {
-        if (method_exists($user, 'getUserIdentifier')) {
-            return $user->getUserIdentifier();
-        }
-
-        return '';
+        return $user->getUserIdentifier() ?: '';
     }
 
     private function getTokenUser(): ?UserInterface

tests/Console/ConsoleUserProviderTest.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace DH\AuditorBundle\Tests\User;
+namespace DH\AuditorBundle\Tests\Console;
 
 use DH\Auditor\Provider\Doctrine\DoctrineProvider;
 use DH\Auditor\Tests\Provider\Doctrine\Fixtures\Entity\Standard\Blog\Post;

tests/Controller/ViewerControllerTest.php

@@ -17,7 +17,6 @@
 use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
 use Symfony\Component\BrowserKit\AbstractBrowser;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
-use Symfony\Component\HttpKernel\Kernel;
 use Symfony\Component\Security\Core\Exception\AccessDeniedException;
 use Symfony\Component\Security\Core\User\InMemoryUser;
 use Symfony\Component\Security\Core\User\User;