Skip to content

Commit ec6ff93

Browse files
makrazmakraz
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

+9
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

+1-1
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

+2-2
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:[email protected]:3306/db_name?serverVersion=8\"",
15-
"DATABASE_URL": "postgresql://app:[email protected]:5432/db_name?serverVersion=15&charset=utf8"
15+
"DATABASE_URL": "postgresql://app:[email protected]: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",

‎doctrine/doctrine-bundle/1.12/post-install.txt

+1-1
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

+1-1
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

+2-2
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:[email protected]:3306/app?serverVersion=8\"",
15-
"DATABASE_URL": "postgresql://app:[email protected]:5432/app?serverVersion=15&charset=utf8"
15+
"DATABASE_URL": "postgresql://app:[email protected]: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",

‎doctrine/doctrine-bundle/1.6/post-install.txt

+1-1
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

+2-1
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

+2-2
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:[email protected]:3306/app?serverVersion=8\"",
15-
"DATABASE_URL": "postgresql://app:[email protected]:5432/app?serverVersion=15&charset=utf8"
15+
"DATABASE_URL": "postgresql://app:[email protected]: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",

‎doctrine/doctrine-bundle/2.0/post-install.txt

+1-1
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.10/config/packages/doctrine.yaml

+2-1
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,10 @@ 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
profiling_collect_backtrace: '%kernel.debug%'
10+
use_savepoints: true
1011
orm:
1112
auto_generate_proxy_classes: true
1213
enable_lazy_ghost_objects: true

‎doctrine/doctrine-bundle/2.10/manifest.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"#4": "DATABASE_URL=\"sqlite:///%kernel.project_dir%/var/data.db\"",
1414
"#5": "DATABASE_URL=\"mysql://app:[email protected]:3306/app?serverVersion=8.0.32&charset=utf8mb4\"",
1515
"#6": "DATABASE_URL=\"mysql://app:[email protected]:3306/app?serverVersion=10.11.2-MariaDB&charset=utf8mb4\"",
16-
"DATABASE_URL": "postgresql://app:[email protected]:5432/app?serverVersion=15&charset=utf8"
16+
"DATABASE_URL": "postgresql://app:[email protected]:5432/app?serverVersion=16&charset=utf8"
1717
},
1818
"dockerfile": [
1919
"RUN install-php-extensions pdo_pgsql"
@@ -22,7 +22,7 @@
2222
"docker-compose.yml": {
2323
"services": [
2424
"database:",
25-
" image: postgres:${POSTGRES_VERSION:-15}-alpine",
25+
" image: postgres:${POSTGRES_VERSION:-16}-alpine",
2626
" environment:",
2727
" POSTGRES_DB: ${POSTGRES_DB:-app}",
2828
" # You should definitely change the password in production",

‎doctrine/doctrine-bundle/2.10/post-install.txt

+1-1
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.3/config/packages/doctrine.yaml

+2-1
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.3/manifest.json

+2-2
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:[email protected]:3306/app?serverVersion=8&charset=utf8mb4\"",
15-
"DATABASE_URL": "postgresql://app:[email protected]:5432/app?serverVersion=15&charset=utf8"
15+
"DATABASE_URL": "postgresql://app:[email protected]: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",

‎doctrine/doctrine-bundle/2.3/post-install.txt

+1-1
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.4/config/packages/doctrine.yaml

+2-1
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.4/manifest.json

+2-2
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:[email protected]:3306/app?serverVersion=8&charset=utf8mb4\"",
15-
"DATABASE_URL": "postgresql://app:[email protected]:5432/app?serverVersion=15&charset=utf8"
15+
"DATABASE_URL": "postgresql://app:[email protected]: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",

‎doctrine/doctrine-bundle/2.4/post-install.txt

+1-1
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.8/config/packages/doctrine.yaml

+2-1
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
enable_lazy_ghost_objects: true

‎doctrine/doctrine-bundle/2.8/manifest.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"#4": "DATABASE_URL=\"sqlite:///%kernel.project_dir%/var/data.db\"",
1414
"#5": "DATABASE_URL=\"mysql://app:[email protected]:3306/app?serverVersion=8.0.32&charset=utf8mb4\"",
1515
"#6": "DATABASE_URL=\"mysql://app:[email protected]:3306/app?serverVersion=10.11.2-MariaDB&charset=utf8mb4\"",
16-
"DATABASE_URL": "postgresql://app:[email protected]:5432/app?serverVersion=15&charset=utf8"
16+
"DATABASE_URL": "postgresql://app:[email protected]:5432/app?serverVersion=16&charset=utf8"
1717
},
1818
"dockerfile": [
1919
"RUN apk add --no-cache --virtual .pgsql-deps postgresql-dev; \\",
@@ -25,7 +25,7 @@
2525
"docker-compose.yml": {
2626
"services": [
2727
"database:",
28-
" image: postgres:${POSTGRES_VERSION:-15}-alpine",
28+
" image: postgres:${POSTGRES_VERSION:-16}-alpine",
2929
" environment:",
3030
" POSTGRES_DB: ${POSTGRES_DB:-app}",
3131
" # You should definitely change the password in production",

‎doctrine/doctrine-bundle/2.8/post-install.txt

+1-1
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.9/config/packages/doctrine.yaml

+2-1
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
enable_lazy_ghost_objects: true

‎doctrine/doctrine-bundle/2.9/manifest.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"#4": "DATABASE_URL=\"sqlite:///%kernel.project_dir%/var/data.db\"",
1414
"#5": "DATABASE_URL=\"mysql://app:[email protected]:3306/app?serverVersion=8.0.32&charset=utf8mb4\"",
1515
"#6": "DATABASE_URL=\"mysql://app:[email protected]:3306/app?serverVersion=10.11.2-MariaDB&charset=utf8mb4\"",
16-
"DATABASE_URL": "postgresql://app:[email protected]:5432/app?serverVersion=15&charset=utf8"
16+
"DATABASE_URL": "postgresql://app:[email protected]:5432/app?serverVersion=16&charset=utf8"
1717
},
1818
"dockerfile": [
1919
"RUN install-php-extensions pdo_pgsql"
@@ -22,7 +22,7 @@
2222
"docker-compose.yml": {
2323
"services": [
2424
"database:",
25-
" image: postgres:${POSTGRES_VERSION:-15}-alpine",
25+
" image: postgres:${POSTGRES_VERSION:-16}-alpine",
2626
" environment:",
2727
" POSTGRES_DB: ${POSTGRES_DB:-app}",
2828
" # You should definitely change the password in production",

‎doctrine/doctrine-bundle/2.9/post-install.txt

+1-1
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</>

‎symfony/asset-mapper/6.4/assets/app.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@
44
* This file will be included onto the page via the importmap() Twig function,
55
* which should already be in your base.html.twig.
66
*/
7-
import './styles/app.css'
7+
import './styles/app.css';
88

9-
console.log('This log comes from assets/app.js - welcome to AssetMapper! 🎉')
9+
console.log('This log comes from assets/app.js - welcome to AssetMapper! 🎉');

‎symfony/asset-mapper/6.4/importmap.php

-2
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@
1010
* be used as an "entrypoint" (and passed to the importmap() Twig function).
1111
*
1212
* The "importmap:require" command can be used to add new entries to this file.
13-
*
14-
* This file has been auto-generated by the importmap commands.
1513
*/
1614
return [
1715
'app' => [

‎symfony/asset-mapper/6.4/manifest.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"aliases": ["asset-mapper", "importmap"],
88
"gitignore": [
99
"/%PUBLIC_DIR%/assets/",
10-
"/assets/vendor"
10+
"/assets/vendor/"
1111
],
1212
"composer-scripts": {
1313
"importmap:install": "symfony-cmd"

‎symfony/crowdin-translation-provider/5.3/manifest.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{
22
"add-lines": [
33
{
4-
"file": "config/packages/notifier.yaml",
4+
"file": "config/packages/translation.yaml",
55
"position": "after_target",
6-
"target": " texter_transports:",
7-
"content": " crowdin: '%env(CROWDIN_DSN)%'"
6+
"target": " providers:",
7+
"content": " crowdin:\n dsn: '%env(CROWDIN_DSN)%'"
88
}
99
],
1010
"env": {

‎symfony/framework-bundle/7.0/config/packages/framework.yaml

+2-9
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,12 @@
22
framework:
33
secret: '%env(APP_SECRET)%'
44
#csrf_protection: true
5-
handle_all_throwables: true
65

7-
# Enables session support. Note that the session will ONLY be started if you read or write from it.
8-
# Remove or comment this section to explicitly disable session support.
9-
session:
10-
handler_id: null
11-
cookie_secure: auto
12-
cookie_samesite: lax
6+
# Note that the session will be started ONLY if you read or write from it.
7+
session: true
138

149
#esi: true
1510
#fragments: true
16-
php_errors:
17-
log: true
1811

1912
when@test:
2013
framework:

‎symfony/loco-translation-provider/5.3/manifest.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{
22
"add-lines": [
33
{
4-
"file": "config/packages/notifier.yaml",
4+
"file": "config/packages/translation.yaml",
55
"position": "after_target",
6-
"target": " texter_transports:",
7-
"content": " loco: '%env(LOCO_DSN)%'"
6+
"target": " providers:",
7+
"content": " loco:\n dsn: '%env(LOCO_DSN)%'"
88
}
99
],
1010
"env": {

‎symfony/lokalise-translation-provider/5.3/manifest.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{
22
"add-lines": [
33
{
4-
"file": "config/packages/notifier.yaml",
4+
"file": "config/packages/translation.yaml",
55
"position": "after_target",
6-
"target": " texter_transports:",
7-
"content": " lokalise: '%env(LOKALISE_DSN)%'"
6+
"target": " providers:",
7+
"content": " lokalise:\n dsn: '%env(LOKALISE_DSN)%'"
88
}
99
],
1010
"env": {

0 commit comments

Comments
 (0)