Merge branch '5.4' into 6.0

* 5.4:
  [Serializer] Fixed context key
  Replaced doctrine annotations with attributes
  Improve url env var processor with type cast

Author: javiereguiluz

configuration/env_var_processors.rst

@@ -598,9 +598,9 @@ Symfony provides the following env var processors:
                 clients:
                     default:
                         hosts:
-                            - { host: '%env(key:host:url:MONGODB_URL)%', port: '%env(key:port:url:MONGODB_URL)%' }
-                        username: '%env(key:user:url:MONGODB_URL)%'
-                        password: '%env(key:pass:url:MONGODB_URL)%'
+                            - { host: '%env(string:key:host:url:MONGODB_URL)%', port: '%env(int:key:port:url:MONGODB_URL)%' }
+                        username: '%env(string:key:user:url:MONGODB_URL)%'
+                        password: '%env(string:key:pass:url:MONGODB_URL)%'
                 connections:
                     default:
                         database_name: '%env(key:path:url:MONGODB_URL)%'
@@ -615,8 +615,8 @@ Symfony provides the following env var processors:
                     https://symfony.com/schema/dic/services/services-1.0.xsd">
 
                 <mongodb:config>
-                    <mongodb:client name="default" username="%env(key:user:url:MONGODB_URL)%" password="%env(key:pass:url:MONGODB_URL)%">
-                        <mongodb:host host="%env(key:host:url:MONGODB_URL)%" port="%env(key:port:url:MONGODB_URL)%"/>
+                    <mongodb:client name="default" username="%env(string:key:user:url:MONGODB_URL)%" password="%env(string:key:pass:url:MONGODB_URL)%">
+                        <mongodb:host host="%env(string:key:host:url:MONGODB_URL)%" port="%env(int:key:port:url:MONGODB_URL)%"/>
                     </mongodb:client>
                     <mongodb:connections name="default" database_name="%env(key:path:url:MONGODB_URL)%"/>
                 </mongodb:config>
@@ -630,12 +630,12 @@ Symfony provides the following env var processors:
                     'default' => [
                         'hosts' => [
                             [
-                                'host' => '%env(key:host:url:MONGODB_URL)%',
-                                'port' => '%env(key:port:url:MONGODB_URL)%',
+                                'host' => '%env(string:key:host:url:MONGODB_URL)%',
+                                'port' => '%env(int:key:port:url:MONGODB_URL)%',
                             ],
                         ],
-                        'username' => '%env(key:user:url:MONGODB_URL)%',
-                        'password' => '%env(key:pass:url:MONGODB_URL)%',
+                        'username' => '%env(string:key:user:url:MONGODB_URL)%',
+                        'password' => '%env(string:key:pass:url:MONGODB_URL)%',
                     ],
                 ],
                 'connections' => [

reference/constraints/UniqueEntity.rst

@@ -76,15 +76,11 @@ between all of the rows in your user table:
 
         use Symfony\Component\Validator\Constraints as Assert;
 
-        /**
-         * @ORM\Entity
-         */
+        #[ORM\Entity]
         #[UniqueEntity('email')]
         class User
         {
-            /**
-             * @ORM\Column(name="email", type="string", length=255, unique=true)
-             */
+            #[ORM\Column(name: 'email', type: 'string', length: 255, unique: true)]
             #[Assert\Email]
             protected $email;
         }
@@ -223,27 +219,22 @@ Consider this example:
         // src/Entity/Service.php
         namespace App\Entity;
 
+        use App\Entity\Host;
         use Doctrine\ORM\Mapping as ORM;
         use Symfony\Bridge\Doctrine\Validator\Constraints\UniqueEntity;
 
-        /**
-         * @ORM\Entity
-         */
+        #[ORM\Entity]
         #[UniqueEntity(
             fields: ['host', 'port'],
             errorPath: 'port',
             message: 'This port is already in use on that host.',
         )]
         class Service
         {
-            /**
-             * @ORM\ManyToOne(targetEntity="App\Entity\Host")
-             */
+            #[ORM\ManyToOne(targetEntity: Host::class)]
             public $host;
 
-            /**
-             * @ORM\Column(type="integer")
-             */
+            #[ORM\Column(type: 'integer')]
             public $port;
         }