Skip to content

Commit b8555be

Browse files
committed
Merge branch '5.3' into 5.4
* 5.3: Replaced doctrine annotations with attributes Improve url env var processor with type cast
2 parents 1c57697 + 683c628 commit b8555be

File tree

2 files changed

+15
-24
lines changed

2 files changed

+15
-24
lines changed

configuration/env_var_processors.rst

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -603,9 +603,9 @@ Symfony provides the following env var processors:
603603
clients:
604604
default:
605605
hosts:
606-
- { host: '%env(key:host:url:MONGODB_URL)%', port: '%env(key:port:url:MONGODB_URL)%' }
607-
username: '%env(key:user:url:MONGODB_URL)%'
608-
password: '%env(key:pass:url:MONGODB_URL)%'
606+
- { host: '%env(string:key:host:url:MONGODB_URL)%', port: '%env(int:key:port:url:MONGODB_URL)%' }
607+
username: '%env(string:key:user:url:MONGODB_URL)%'
608+
password: '%env(string:key:pass:url:MONGODB_URL)%'
609609
connections:
610610
default:
611611
database_name: '%env(key:path:url:MONGODB_URL)%'
@@ -620,8 +620,8 @@ Symfony provides the following env var processors:
620620
https://symfony.com/schema/dic/services/services-1.0.xsd">
621621
622622
<mongodb:config>
623-
<mongodb:client name="default" username="%env(key:user:url:MONGODB_URL)%" password="%env(key:pass:url:MONGODB_URL)%">
624-
<mongodb:host host="%env(key:host:url:MONGODB_URL)%" port="%env(key:port:url:MONGODB_URL)%"/>
623+
<mongodb:client name="default" username="%env(string:key:user:url:MONGODB_URL)%" password="%env(string:key:pass:url:MONGODB_URL)%">
624+
<mongodb:host host="%env(string:key:host:url:MONGODB_URL)%" port="%env(int:key:port:url:MONGODB_URL)%"/>
625625
</mongodb:client>
626626
<mongodb:connections name="default" database_name="%env(key:path:url:MONGODB_URL)%"/>
627627
</mongodb:config>
@@ -635,12 +635,12 @@ Symfony provides the following env var processors:
635635
'default' => [
636636
'hosts' => [
637637
[
638-
'host' => '%env(key:host:url:MONGODB_URL)%',
639-
'port' => '%env(key:port:url:MONGODB_URL)%',
638+
'host' => '%env(string:key:host:url:MONGODB_URL)%',
639+
'port' => '%env(int:key:port:url:MONGODB_URL)%',
640640
],
641641
],
642-
'username' => '%env(key:user:url:MONGODB_URL)%',
643-
'password' => '%env(key:pass:url:MONGODB_URL)%',
642+
'username' => '%env(string:key:user:url:MONGODB_URL)%',
643+
'password' => '%env(string:key:pass:url:MONGODB_URL)%',
644644
],
645645
],
646646
'connections' => [

reference/constraints/UniqueEntity.rst

Lines changed: 6 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -76,15 +76,11 @@ between all of the rows in your user table:
7676
7777
use Symfony\Component\Validator\Constraints as Assert;
7878
79-
/**
80-
* @ORM\Entity
81-
*/
79+
#[ORM\Entity]
8280
#[UniqueEntity('email')]
8381
class User
8482
{
85-
/**
86-
* @ORM\Column(name="email", type="string", length=255, unique=true)
87-
*/
83+
#[ORM\Column(name: 'email', type: 'string', length: 255, unique: true)]
8884
#[Assert\Email]
8985
protected $email;
9086
}
@@ -223,27 +219,22 @@ Consider this example:
223219
// src/Entity/Service.php
224220
namespace App\Entity;
225221
222+
use App\Entity\Host;
226223
use Doctrine\ORM\Mapping as ORM;
227224
use Symfony\Bridge\Doctrine\Validator\Constraints\UniqueEntity;
228225
229-
/**
230-
* @ORM\Entity
231-
*/
226+
#[ORM\Entity]
232227
#[UniqueEntity(
233228
fields: ['host', 'port'],
234229
errorPath: 'port',
235230
message: 'This port is already in use on that host.',
236231
)]
237232
class Service
238233
{
239-
/**
240-
* @ORM\ManyToOne(targetEntity="App\Entity\Host")
241-
*/
234+
#[ORM\ManyToOne(targetEntity: Host::class)]
242235
public $host;
243236
244-
/**
245-
* @ORM\Column(type="integer")
246-
*/
237+
#[ORM\Column(type: 'integer')]
247238
public $port;
248239
}
249240

0 commit comments

Comments
 (0)