Improve doctrine versions and configuration (#1606)

Author: jordisala1991

composer.json

@@ -23,7 +23,7 @@
         "php": "^8.0",
         "doctrine/collections": "^1.6 || ^2.0",
         "doctrine/common": "^3.1",
-        "doctrine/persistence": "^2.1 || ^3.0",
+        "doctrine/persistence": "^3.0.2",
         "sonata-project/doctrine-extensions": "^1.13 || ^2.0",
         "sonata-project/form-extensions": "^1.4",
         "sonata-project/twig-extensions": "^1.3 || ^2.0",
@@ -48,12 +48,11 @@
         "twig/twig": "^2.14 || ^3.0"
     },
     "require-dev": {
-        "dama/doctrine-test-bundle": "^6.7",
-        "doctrine/annotations": "^1.13.2 || ^2.0",
-        "doctrine/doctrine-bundle": "^2.3.2",
-        "doctrine/mongodb-odm": "^2.2",
-        "doctrine/orm": "^2.9",
-        "egulias/email-validator": "^2.1.9 || ^3.1",
+        "dama/doctrine-test-bundle": "^6.7 || ^7.0",
+        "doctrine/doctrine-bundle": "^2.7",
+        "doctrine/mongodb-odm": "^2.3",
+        "doctrine/orm": "^2.14",
+        "egulias/email-validator": "^3.1 || ^4.0",
         "friendsofphp/php-cs-fixer": "^3.4",
         "matthiasnoback/symfony-config-test": "^4.2",
         "matthiasnoback/symfony-dependency-injection-test": "^4.0",

src/Resources/config/doctrine/BaseUser.mongodb.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<doctrine-mongo-mapping xmlns="http://doctrine-project.org/schemas/odm/doctrine-mongo-mapping" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://doctrine-project.org/schemas/odm/doctrine-mongo-mapping                         http://doctrine-project.org/schemas/odm/doctrine-mongo-mapping.xsd">
+<doctrine-mongo-mapping xmlns="https://doctrine-project.org/schemas/odm/doctrine-mongo-mapping" xmlns:xsi="https://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://doctrine-project.org/schemas/odm/doctrine-mongo-mapping https://doctrine-project.org/schemas/odm/doctrine-mongo-mapping.xsd">
     <mapped-superclass name="Sonata\UserBundle\Document\BaseUser">
         <field name="username" type="string"/>
         <field name="usernameCanonical" type="string"/>

src/Resources/config/doctrine/BaseUser.orm.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping                   http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
+<doctrine-mapping xmlns="https://doctrine-project.org/schemas/orm/doctrine-mapping" xmlns:xsi="https://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://doctrine-project.org/schemas/orm/doctrine-mapping https://doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
     <mapped-superclass name="Sonata\UserBundle\Entity\BaseUser">
         <field name="username" column="username" type="string" length="180"/>
         <field name="usernameCanonical" column="username_canonical" type="string" length="180" unique="true"/>

tests/App/AppKernel.php

@@ -32,6 +32,7 @@
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\HttpKernel\Kernel;
 use Symfony\Component\Routing\Loader\Configurator\RoutingConfigurator;
+use Symfony\Component\Security\Http\Attribute\IsGranted;
 use Symfony\Component\Security\Http\Authentication\AuthenticatorManager;
 
 /**
@@ -82,24 +83,26 @@ public function getProjectDir(): string
      */
     protected function configureRoutes($routes): void
     {
-        $routes->import(__DIR__.'/Resources/config/routing/routes.yaml');
+        $routes->import(__DIR__.'/config/routes.yaml');
     }
 
     /**
      * @psalm-suppress DeprecatedClass
      */
     protected function configureContainer(ContainerBuilder $container, LoaderInterface $loader): void
     {
-        $loader->load(__DIR__.'/Resources/config/config.yaml');
+        $loader->load(__DIR__.'/config/config.yaml');
 
-        if (class_exists(AuthenticatorManager::class)) {
-            $loader->load(__DIR__.'/Resources/config/config_sf5.yaml');
+        if (class_exists(IsGranted::class)) {
+            $loader->load(__DIR__.'/config/config_sf6.yaml');
+        } elseif (class_exists(AuthenticatorManager::class)) {
+            $loader->load(__DIR__.'/config/config_sf5.yaml');
         } else {
-            $loader->load(__DIR__.'/Resources/config/config_sf4.yaml');
+            $loader->load(__DIR__.'/config/config_sf4.yaml');
         }
 
         if (class_exists(HttpCacheHandler::class)) {
-            $loader->load(__DIR__.'/Resources/config/config_sonata_block_v4.yaml');
+            $loader->load(__DIR__.'/config/config_sonata_block_v4.yaml');
         }
 
         $container->setParameter('app.base_dir', $this->getBaseDir());

tests/App/Entity/User.php

@@ -13,20 +13,17 @@
 
 namespace Sonata\UserBundle\Tests\App\Entity;
 
+use Doctrine\DBAL\Types\Types;
 use Doctrine\ORM\Mapping as ORM;
 use Sonata\UserBundle\Entity\BaseUser;
 
-/**
- * @ORM\Entity
- * @ORM\Table(name="user__user")
- */
+#[ORM\Entity]
+#[ORM\Table(name: 'user__user')]
 class User extends BaseUser
 {
-    /**
-     * @ORM\Id
-     * @ORM\GeneratedValue
-     * @ORM\Column(type="integer")
-     */
+    #[ORM\Id]
+    #[ORM\Column(type: Types::INTEGER)]
+    #[ORM\GeneratedValue]
     protected $id;
 
     public function setId(?int $id): void

tests/App/Resources/config/config.yaml tests/App/config/config.yaml

@@ -42,8 +42,6 @@ security:
 
 twig:
     exception_controller: null
-    paths:
-        - '%kernel.project_dir%/Resources/views'
     strict_variables: true
 
 doctrine:
@@ -56,7 +54,7 @@ doctrine:
                 mappings:
                     SonataUserBundle: null
                     SonataUserTest:
-                        type: annotation
+                        type: attribute
                         dir: '%kernel.project_dir%/Entity'
                         is_bundle: false
                         prefix: Sonata\UserBundle\Tests\App\Entity

tests/App/Resources/config/config_sf4.yaml tests/App/config/config_sf4.yaml

@@ -0,0 +1,13 @@
+framework:
+    session:
+        storage_factory_id: session.storage.factory.mock_file
+    assets:
+
+security:
+    password_hashers:
+        Sonata\UserBundle\Model\UserInterface:
+            algorithm: plaintext
+
+    firewalls:
+        main:
+            lazy: true