Add support for nucleos/user-bundle 4

Author: core23

composer.json

@@ -38,7 +38,7 @@
     "require": {
         "php": "^8.3",
         "ext-json": "*",
-        "nucleos/user-bundle": "^3.4",
+        "nucleos/user-bundle": "^3.7 || ^4.0",
         "psr/container": "^1.0 || ^2.0",
         "psr/log": "^1.0 || ^2.0 || ^3.0",
         "sonata-project/admin-bundle": "^4.8.1",
@@ -65,7 +65,7 @@
         "twig/twig": "^2.14 || ^3.1"
     },
     "require-dev": {
-        "doctrine/doctrine-bundle": "^2.10",
+        "doctrine/doctrine-bundle": "^2.18 || ^3.0",
         "doctrine/orm": "^2.18 || ^3.0",
         "ergebnis/composer-normalize": "^2.0.1",
         "knplabs/knp-menu": "^3.2",
@@ -79,7 +79,7 @@
         "symfony/yaml": "^6.4 || ^7.0"
     },
     "conflict": {
-        "doctrine/doctrine-bundle": "<2.10 || >=3",
+        "doctrine/doctrine-bundle": "<2.18",
         "doctrine/orm": "<2.18 || >=4",
         "symfony/doctrine-bridge": "<6.4 || >=8"
     },

src/DependencyInjection/NucleosUserAdminExtension.php

@@ -35,14 +35,22 @@ public function prepend(ContainerBuilder $container): void
         }
     }
 
+    /**
+     * @SuppressWarnings("PHPMD.NPathComplexity")
+     */
     public function load(array $configs, ContainerBuilder $container): void
     {
         $processor     = new Processor();
         $configuration = new Configuration();
         $config        = $processor->processConfiguration($configuration, $configs);
         $config        = $this->fixImpersonating($config);
 
-        $config['manager_type'] = $container->getParameter('nucleos_user.storage');
+        // TODO: Remove when dropping support of NucleosUserBundle 3
+        if ($container->hasParameter('nucleos_user.storage')) {
+            $config['manager_type'] = $container->getParameter('nucleos_user.storage');
+        } else {
+            $config['manager_type'] = 'orm';
+        }
 
         /** @var array<string, mixed> $bundles */
         $bundles = $container->getParameter('kernel.bundles');

tests/App/Entity/Group.php

@@ -13,11 +13,19 @@
 
 use Doctrine\DBAL\Types\Types;
 use Doctrine\ORM\Mapping as ORM;
-use Nucleos\UserBundle\Model\Group as BaseGroup;
+use Nucleos\UserBundle\Entity\BaseGroup;
+use Nucleos\UserBundle\Entity\BaseUser;
+use Nucleos\UserBundle\Model\Group as ModelGroup;
+
+if (class_exists(BaseUser::class)) {
+    abstract class InternalTestGroup extends BaseGroup {}
+} else {
+    abstract class InternalTestGroup extends ModelGroup {}
+}
 
 #[ORM\Entity]
 #[ORM\Table(name: 'user__group')]
-class Group extends BaseGroup
+class Group extends InternalTestGroup
 {
     #[ORM\Id]
     #[ORM\Column(type: Types::INTEGER)]

tests/App/Entity/User.php

@@ -15,15 +15,25 @@
 use Doctrine\Common\Collections\Collection;
 use Doctrine\DBAL\Types\Types;
 use Doctrine\ORM\Mapping as ORM;
+use Nucleos\UserBundle\Entity\BaseUser;
 use Nucleos\UserBundle\Model\GroupInterface;
-use Nucleos\UserBundle\Model\User as BaseUser;
+use Nucleos\UserBundle\Model\User as ModelUser;
+
+if (class_exists(BaseUser::class)) {
+    /**
+     * @phpstan-extends BaseUser<GroupInterface>
+     */
+    abstract class InternalTestUser extends BaseUser {}
+} else {
+    /**
+     * @phpstan-extends ModelUser<GroupInterface>
+     */
+    abstract class InternalTestUser extends ModelUser {}
+}
 
-/**
- * @phpstan-extends BaseUser<GroupInterface>
- */
 #[ORM\Entity]
 #[ORM\Table(name: 'user__user')]
-class User extends BaseUser
+class User extends InternalTestUser
 {
     #[ORM\Id]
     #[ORM\Column(type: Types::INTEGER)]

tests/App/config/config.php

@@ -87,7 +87,10 @@
         ],
     ]]);
 
-    $containerConfigurator->extension('nucleos_user', ['db_driver' => 'orm']);
+    // TODO: Remove when dropping support of NucleosUserBundle 3
+    if (class_exists('\Nucleos\UserBundle\Action\CheckEmailAction')) {
+        $containerConfigurator->extension('nucleos_user', ['db_driver' => 'orm']);
+    }
 
     $containerConfigurator->extension('nucleos_user', ['firewall_name' => 'admin']);