Skip to content

Commit ec6ff93

Browse files
authored
Merge branch 'symfony:main' into master
2 parents f426f58 + ca74983 commit ec6ff93

File tree

58 files changed

+256
-86
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

58 files changed

+256
-86
lines changed

.github/versions.json

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -414,6 +414,9 @@
414414
"7.0",
415415
"7.1"
416416
],
417+
"symfony/emoji": [
418+
"7.1"
419+
],
417420
"symfony/engagespot-notifier": [
418421
"6.1",
419422
"6.2",
@@ -1403,6 +1406,9 @@
14031406
"7.0",
14041407
"7.1"
14051408
],
1409+
"symfony/resend-mailer": [
1410+
"7.1"
1411+
],
14061412
"symfony/ring-central-notifier": [
14071413
"6.3",
14081414
"6.4",
@@ -1934,6 +1940,9 @@
19341940
"7.0",
19351941
"7.1"
19361942
],
1943+
"symfony/type-info": [
1944+
"7.1"
1945+
],
19371946
"symfony/uid": [
19381947
"5.1",
19391948
"5.2",

doctrine/doctrine-bundle/1.12/config/packages/doctrine.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ doctrine:
44

55
# IMPORTANT: You MUST configure your server version,
66
# either here or in the DATABASE_URL env var (see .env file)
7-
#server_version: '15'
7+
#server_version: '16'
88

99
# only needed for MySQL
1010
charset: utf8mb4

doctrine/doctrine-bundle/1.12/manifest.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"#3": "",
1313
"#4": "DATABASE_URL=\"sqlite:///%kernel.project_dir%/var/data.db\"",
1414
"#5": "DATABASE_URL=\"mysql://app:!ChangeMe!@127.0.0.1:3306/db_name?serverVersion=8\"",
15-
"DATABASE_URL": "postgresql://app:!ChangeMe!@127.0.0.1:5432/db_name?serverVersion=15&charset=utf8"
15+
"DATABASE_URL": "postgresql://app:!ChangeMe!@127.0.0.1:5432/db_name?serverVersion=16&charset=utf8"
1616
},
1717
"dockerfile": [
1818
"RUN apk add --no-cache --virtual .pgsql-deps postgresql-dev && \\",
@@ -24,7 +24,7 @@
2424
"docker-compose.yml": {
2525
"services": [
2626
"database:",
27-
" image: postgres:${POSTGRES_VERSION:-15}-alpine",
27+
" image: postgres:${POSTGRES_VERSION:-16}-alpine",
2828
" environment:",
2929
" POSTGRES_DB: ${POSTGRES_DB:-app}",
3030
" # You should definitely change the password in production",
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
* Modify your DATABASE_URL config in <fg=green>.env</>
22

33
* Configure the <fg=green>driver</> (postgresql) and
4-
<fg=green>server_version</> (15) in <fg=green>config/packages/doctrine.yaml</>
4+
<fg=green>server_version</> (16) in <fg=green>config/packages/doctrine.yaml</>

doctrine/doctrine-bundle/1.6/config/packages/doctrine.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ doctrine:
44

55
# IMPORTANT: You MUST configure your server version,
66
# either here or in the DATABASE_URL env var (see .env file)
7-
#server_version: '15'
7+
#server_version: '16'
88

99
# only needed for MySQL
1010
charset: utf8mb4

doctrine/doctrine-bundle/1.6/manifest.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"#3": "",
1313
"#4": "DATABASE_URL=\"sqlite:///%kernel.project_dir%/var/data.db\"",
1414
"#5": "DATABASE_URL=\"mysql://app:!ChangeMe!@127.0.0.1:3306/app?serverVersion=8\"",
15-
"DATABASE_URL": "postgresql://app:!ChangeMe!@127.0.0.1:5432/app?serverVersion=15&charset=utf8"
15+
"DATABASE_URL": "postgresql://app:!ChangeMe!@127.0.0.1:5432/app?serverVersion=16&charset=utf8"
1616
},
1717
"dockerfile": [
1818
"RUN apk add --no-cache --virtual .pgsql-deps postgresql-dev && \\",
@@ -24,7 +24,7 @@
2424
"docker-compose.yml": {
2525
"services": [
2626
"database:",
27-
" image: postgres:${POSTGRES_VERSION:-15}-alpine",
27+
" image: postgres:${POSTGRES_VERSION:-16}-alpine",
2828
" environment:",
2929
" POSTGRES_DB: ${POSTGRES_DB:-app}",
3030
" # You should definitely change the password in production",
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
* Modify your DATABASE_URL config in <fg=green>.env</>
22

33
* Configure the <fg=green>driver</> (postgresql) and
4-
<fg=green>server_version</> (15) in <fg=green>config/packages/doctrine.yaml</>
4+
<fg=green>server_version</> (16) in <fg=green>config/packages/doctrine.yaml</>

doctrine/doctrine-bundle/2.0/config/packages/doctrine.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@ doctrine:
44

55
# IMPORTANT: You MUST configure your server version,
66
# either here or in the DATABASE_URL env var (see .env file)
7-
#server_version: '15'
7+
#server_version: '16'
8+
use_savepoints: true
89
orm:
910
auto_generate_proxy_classes: true
1011
naming_strategy: doctrine.orm.naming_strategy.underscore_number_aware

doctrine/doctrine-bundle/2.0/manifest.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"#3": "",
1313
"#4": "DATABASE_URL=\"sqlite:///%kernel.project_dir%/var/data.db\"",
1414
"#5": "DATABASE_URL=\"mysql://app:!ChangeMe!@127.0.0.1:3306/app?serverVersion=8\"",
15-
"DATABASE_URL": "postgresql://app:!ChangeMe!@127.0.0.1:5432/app?serverVersion=15&charset=utf8"
15+
"DATABASE_URL": "postgresql://app:!ChangeMe!@127.0.0.1:5432/app?serverVersion=16&charset=utf8"
1616
},
1717
"dockerfile": [
1818
"RUN apk add --no-cache --virtual .pgsql-deps postgresql-dev && \\",
@@ -24,7 +24,7 @@
2424
"docker-compose.yml": {
2525
"services": [
2626
"database:",
27-
" image: postgres:${POSTGRES_VERSION:-15}-alpine",
27+
" image: postgres:${POSTGRES_VERSION:-16}-alpine",
2828
" environment:",
2929
" POSTGRES_DB: ${POSTGRES_DB:-app}",
3030
" # You should definitely change the password in production",
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
* Modify your DATABASE_URL config in <fg=green>.env</>
22

33
* Configure the <fg=green>driver</> (postgresql) and
4-
<fg=green>server_version</> (15) in <fg=green>config/packages/doctrine.yaml</>
4+
<fg=green>server_version</> (16) in <fg=green>config/packages/doctrine.yaml</>

0 commit comments

Comments
 (0)