Skip to content

Commit

Permalink
Merge branch 'symfony:main' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
makraz authored Feb 8, 2024
2 parents f426f58 + ca74983 commit ec6ff93
Show file tree
Hide file tree
Showing 58 changed files with 256 additions and 86 deletions.
9 changes: 9 additions & 0 deletions .github/versions.json
Original file line number Diff line number Diff line change
Expand Up @@ -414,6 +414,9 @@
"7.0",
"7.1"
],
"symfony/emoji": [
"7.1"
],
"symfony/engagespot-notifier": [
"6.1",
"6.2",
Expand Down Expand Up @@ -1403,6 +1406,9 @@
"7.0",
"7.1"
],
"symfony/resend-mailer": [
"7.1"
],
"symfony/ring-central-notifier": [
"6.3",
"6.4",
Expand Down Expand Up @@ -1934,6 +1940,9 @@
"7.0",
"7.1"
],
"symfony/type-info": [
"7.1"
],
"symfony/uid": [
"5.1",
"5.2",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ doctrine:

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

# only needed for MySQL
charset: utf8mb4
Expand Down
4 changes: 2 additions & 2 deletions doctrine/doctrine-bundle/1.12/manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"#3": "",
"#4": "DATABASE_URL=\"sqlite:///%kernel.project_dir%/var/data.db\"",
"#5": "DATABASE_URL=\"mysql://app:[email protected]:3306/db_name?serverVersion=8\"",
"DATABASE_URL": "postgresql://app:[email protected]:5432/db_name?serverVersion=15&charset=utf8"
"DATABASE_URL": "postgresql://app:[email protected]:5432/db_name?serverVersion=16&charset=utf8"
},
"dockerfile": [
"RUN apk add --no-cache --virtual .pgsql-deps postgresql-dev && \\",
Expand All @@ -24,7 +24,7 @@
"docker-compose.yml": {
"services": [
"database:",
" image: postgres:${POSTGRES_VERSION:-15}-alpine",
" image: postgres:${POSTGRES_VERSION:-16}-alpine",
" environment:",
" POSTGRES_DB: ${POSTGRES_DB:-app}",
" # You should definitely change the password in production",
Expand Down
2 changes: 1 addition & 1 deletion doctrine/doctrine-bundle/1.12/post-install.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
* Modify your DATABASE_URL config in <fg=green>.env</>

* Configure the <fg=green>driver</> (postgresql) and
<fg=green>server_version</> (15) in <fg=green>config/packages/doctrine.yaml</>
<fg=green>server_version</> (16) in <fg=green>config/packages/doctrine.yaml</>
2 changes: 1 addition & 1 deletion doctrine/doctrine-bundle/1.6/config/packages/doctrine.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ doctrine:

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

# only needed for MySQL
charset: utf8mb4
Expand Down
4 changes: 2 additions & 2 deletions doctrine/doctrine-bundle/1.6/manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"#3": "",
"#4": "DATABASE_URL=\"sqlite:///%kernel.project_dir%/var/data.db\"",
"#5": "DATABASE_URL=\"mysql://app:[email protected]:3306/app?serverVersion=8\"",
"DATABASE_URL": "postgresql://app:[email protected]:5432/app?serverVersion=15&charset=utf8"
"DATABASE_URL": "postgresql://app:[email protected]:5432/app?serverVersion=16&charset=utf8"
},
"dockerfile": [
"RUN apk add --no-cache --virtual .pgsql-deps postgresql-dev && \\",
Expand All @@ -24,7 +24,7 @@
"docker-compose.yml": {
"services": [
"database:",
" image: postgres:${POSTGRES_VERSION:-15}-alpine",
" image: postgres:${POSTGRES_VERSION:-16}-alpine",
" environment:",
" POSTGRES_DB: ${POSTGRES_DB:-app}",
" # You should definitely change the password in production",
Expand Down
2 changes: 1 addition & 1 deletion doctrine/doctrine-bundle/1.6/post-install.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
* Modify your DATABASE_URL config in <fg=green>.env</>

* Configure the <fg=green>driver</> (postgresql) and
<fg=green>server_version</> (15) in <fg=green>config/packages/doctrine.yaml</>
<fg=green>server_version</> (16) in <fg=green>config/packages/doctrine.yaml</>
3 changes: 2 additions & 1 deletion doctrine/doctrine-bundle/2.0/config/packages/doctrine.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@ doctrine:

# IMPORTANT: You MUST configure your server version,
# either here or in the DATABASE_URL env var (see .env file)
#server_version: '15'
#server_version: '16'
use_savepoints: true
orm:
auto_generate_proxy_classes: true
naming_strategy: doctrine.orm.naming_strategy.underscore_number_aware
Expand Down
4 changes: 2 additions & 2 deletions doctrine/doctrine-bundle/2.0/manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"#3": "",
"#4": "DATABASE_URL=\"sqlite:///%kernel.project_dir%/var/data.db\"",
"#5": "DATABASE_URL=\"mysql://app:[email protected]:3306/app?serverVersion=8\"",
"DATABASE_URL": "postgresql://app:[email protected]:5432/app?serverVersion=15&charset=utf8"
"DATABASE_URL": "postgresql://app:[email protected]:5432/app?serverVersion=16&charset=utf8"
},
"dockerfile": [
"RUN apk add --no-cache --virtual .pgsql-deps postgresql-dev && \\",
Expand All @@ -24,7 +24,7 @@
"docker-compose.yml": {
"services": [
"database:",
" image: postgres:${POSTGRES_VERSION:-15}-alpine",
" image: postgres:${POSTGRES_VERSION:-16}-alpine",
" environment:",
" POSTGRES_DB: ${POSTGRES_DB:-app}",
" # You should definitely change the password in production",
Expand Down
2 changes: 1 addition & 1 deletion doctrine/doctrine-bundle/2.0/post-install.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
* Modify your DATABASE_URL config in <fg=green>.env</>

* Configure the <fg=green>driver</> (postgresql) and
<fg=green>server_version</> (15) in <fg=green>config/packages/doctrine.yaml</>
<fg=green>server_version</> (16) in <fg=green>config/packages/doctrine.yaml</>
3 changes: 2 additions & 1 deletion doctrine/doctrine-bundle/2.10/config/packages/doctrine.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,10 @@ doctrine:

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

profiling_collect_backtrace: '%kernel.debug%'
use_savepoints: true
orm:
auto_generate_proxy_classes: true
enable_lazy_ghost_objects: true
Expand Down
4 changes: 2 additions & 2 deletions doctrine/doctrine-bundle/2.10/manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"#4": "DATABASE_URL=\"sqlite:///%kernel.project_dir%/var/data.db\"",
"#5": "DATABASE_URL=\"mysql://app:[email protected]:3306/app?serverVersion=8.0.32&charset=utf8mb4\"",
"#6": "DATABASE_URL=\"mysql://app:[email protected]:3306/app?serverVersion=10.11.2-MariaDB&charset=utf8mb4\"",
"DATABASE_URL": "postgresql://app:[email protected]:5432/app?serverVersion=15&charset=utf8"
"DATABASE_URL": "postgresql://app:[email protected]:5432/app?serverVersion=16&charset=utf8"
},
"dockerfile": [
"RUN install-php-extensions pdo_pgsql"
Expand All @@ -22,7 +22,7 @@
"docker-compose.yml": {
"services": [
"database:",
" image: postgres:${POSTGRES_VERSION:-15}-alpine",
" image: postgres:${POSTGRES_VERSION:-16}-alpine",
" environment:",
" POSTGRES_DB: ${POSTGRES_DB:-app}",
" # You should definitely change the password in production",
Expand Down
2 changes: 1 addition & 1 deletion doctrine/doctrine-bundle/2.10/post-install.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
* Modify your DATABASE_URL config in <fg=green>.env</>

* Configure the <fg=green>driver</> (postgresql) and
<fg=green>server_version</> (15) in <fg=green>config/packages/doctrine.yaml</>
<fg=green>server_version</> (16) in <fg=green>config/packages/doctrine.yaml</>
3 changes: 2 additions & 1 deletion doctrine/doctrine-bundle/2.3/config/packages/doctrine.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@ doctrine:

# IMPORTANT: You MUST configure your server version,
# either here or in the DATABASE_URL env var (see .env file)
#server_version: '15'
#server_version: '16'
use_savepoints: true
orm:
auto_generate_proxy_classes: true
naming_strategy: doctrine.orm.naming_strategy.underscore_number_aware
Expand Down
4 changes: 2 additions & 2 deletions doctrine/doctrine-bundle/2.3/manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"#3": "",
"#4": "DATABASE_URL=\"sqlite:///%kernel.project_dir%/var/data.db\"",
"#5": "DATABASE_URL=\"mysql://app:[email protected]:3306/app?serverVersion=8&charset=utf8mb4\"",
"DATABASE_URL": "postgresql://app:[email protected]:5432/app?serverVersion=15&charset=utf8"
"DATABASE_URL": "postgresql://app:[email protected]:5432/app?serverVersion=16&charset=utf8"
},
"dockerfile": [
"RUN apk add --no-cache --virtual .pgsql-deps postgresql-dev; \\",
Expand All @@ -24,7 +24,7 @@
"docker-compose.yml": {
"services": [
"database:",
" image: postgres:${POSTGRES_VERSION:-15}-alpine",
" image: postgres:${POSTGRES_VERSION:-16}-alpine",
" environment:",
" POSTGRES_DB: ${POSTGRES_DB:-app}",
" # You should definitely change the password in production",
Expand Down
2 changes: 1 addition & 1 deletion doctrine/doctrine-bundle/2.3/post-install.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
* Modify your DATABASE_URL config in <fg=green>.env</>

* Configure the <fg=green>driver</> (postgresql) and
<fg=green>server_version</> (15) in <fg=green>config/packages/doctrine.yaml</>
<fg=green>server_version</> (16) in <fg=green>config/packages/doctrine.yaml</>
3 changes: 2 additions & 1 deletion doctrine/doctrine-bundle/2.4/config/packages/doctrine.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@ doctrine:

# IMPORTANT: You MUST configure your server version,
# either here or in the DATABASE_URL env var (see .env file)
#server_version: '15'
#server_version: '16'
use_savepoints: true
orm:
auto_generate_proxy_classes: true
naming_strategy: doctrine.orm.naming_strategy.underscore_number_aware
Expand Down
4 changes: 2 additions & 2 deletions doctrine/doctrine-bundle/2.4/manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"#3": "",
"#4": "DATABASE_URL=\"sqlite:///%kernel.project_dir%/var/data.db\"",
"#5": "DATABASE_URL=\"mysql://app:[email protected]:3306/app?serverVersion=8&charset=utf8mb4\"",
"DATABASE_URL": "postgresql://app:[email protected]:5432/app?serverVersion=15&charset=utf8"
"DATABASE_URL": "postgresql://app:[email protected]:5432/app?serverVersion=16&charset=utf8"
},
"dockerfile": [
"RUN apk add --no-cache --virtual .pgsql-deps postgresql-dev; \\",
Expand All @@ -24,7 +24,7 @@
"docker-compose.yml": {
"services": [
"database:",
" image: postgres:${POSTGRES_VERSION:-15}-alpine",
" image: postgres:${POSTGRES_VERSION:-16}-alpine",
" environment:",
" POSTGRES_DB: ${POSTGRES_DB:-app}",
" # You should definitely change the password in production",
Expand Down
2 changes: 1 addition & 1 deletion doctrine/doctrine-bundle/2.4/post-install.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
* Modify your DATABASE_URL config in <fg=green>.env</>

* Configure the <fg=green>driver</> (postgresql) and
<fg=green>server_version</> (15) in <fg=green>config/packages/doctrine.yaml</>
<fg=green>server_version</> (16) in <fg=green>config/packages/doctrine.yaml</>
3 changes: 2 additions & 1 deletion doctrine/doctrine-bundle/2.8/config/packages/doctrine.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@ doctrine:

# IMPORTANT: You MUST configure your server version,
# either here or in the DATABASE_URL env var (see .env file)
#server_version: '15'
#server_version: '16'
use_savepoints: true
orm:
auto_generate_proxy_classes: true
enable_lazy_ghost_objects: true
Expand Down
4 changes: 2 additions & 2 deletions doctrine/doctrine-bundle/2.8/manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"#4": "DATABASE_URL=\"sqlite:///%kernel.project_dir%/var/data.db\"",
"#5": "DATABASE_URL=\"mysql://app:[email protected]:3306/app?serverVersion=8.0.32&charset=utf8mb4\"",
"#6": "DATABASE_URL=\"mysql://app:[email protected]:3306/app?serverVersion=10.11.2-MariaDB&charset=utf8mb4\"",
"DATABASE_URL": "postgresql://app:[email protected]:5432/app?serverVersion=15&charset=utf8"
"DATABASE_URL": "postgresql://app:[email protected]:5432/app?serverVersion=16&charset=utf8"
},
"dockerfile": [
"RUN apk add --no-cache --virtual .pgsql-deps postgresql-dev; \\",
Expand All @@ -25,7 +25,7 @@
"docker-compose.yml": {
"services": [
"database:",
" image: postgres:${POSTGRES_VERSION:-15}-alpine",
" image: postgres:${POSTGRES_VERSION:-16}-alpine",
" environment:",
" POSTGRES_DB: ${POSTGRES_DB:-app}",
" # You should definitely change the password in production",
Expand Down
2 changes: 1 addition & 1 deletion doctrine/doctrine-bundle/2.8/post-install.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
* Modify your DATABASE_URL config in <fg=green>.env</>

* Configure the <fg=green>driver</> (postgresql) and
<fg=green>server_version</> (15) in <fg=green>config/packages/doctrine.yaml</>
<fg=green>server_version</> (16) in <fg=green>config/packages/doctrine.yaml</>
3 changes: 2 additions & 1 deletion doctrine/doctrine-bundle/2.9/config/packages/doctrine.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@ doctrine:

# IMPORTANT: You MUST configure your server version,
# either here or in the DATABASE_URL env var (see .env file)
#server_version: '15'
#server_version: '16'
use_savepoints: true
orm:
auto_generate_proxy_classes: true
enable_lazy_ghost_objects: true
Expand Down
4 changes: 2 additions & 2 deletions doctrine/doctrine-bundle/2.9/manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"#4": "DATABASE_URL=\"sqlite:///%kernel.project_dir%/var/data.db\"",
"#5": "DATABASE_URL=\"mysql://app:[email protected]:3306/app?serverVersion=8.0.32&charset=utf8mb4\"",
"#6": "DATABASE_URL=\"mysql://app:[email protected]:3306/app?serverVersion=10.11.2-MariaDB&charset=utf8mb4\"",
"DATABASE_URL": "postgresql://app:[email protected]:5432/app?serverVersion=15&charset=utf8"
"DATABASE_URL": "postgresql://app:[email protected]:5432/app?serverVersion=16&charset=utf8"
},
"dockerfile": [
"RUN install-php-extensions pdo_pgsql"
Expand All @@ -22,7 +22,7 @@
"docker-compose.yml": {
"services": [
"database:",
" image: postgres:${POSTGRES_VERSION:-15}-alpine",
" image: postgres:${POSTGRES_VERSION:-16}-alpine",
" environment:",
" POSTGRES_DB: ${POSTGRES_DB:-app}",
" # You should definitely change the password in production",
Expand Down
2 changes: 1 addition & 1 deletion doctrine/doctrine-bundle/2.9/post-install.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
* Modify your DATABASE_URL config in <fg=green>.env</>

* Configure the <fg=green>driver</> (postgresql) and
<fg=green>server_version</> (15) in <fg=green>config/packages/doctrine.yaml</>
<fg=green>server_version</> (16) in <fg=green>config/packages/doctrine.yaml</>
4 changes: 2 additions & 2 deletions symfony/asset-mapper/6.4/assets/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@
* This file will be included onto the page via the importmap() Twig function,
* which should already be in your base.html.twig.
*/
import './styles/app.css'
import './styles/app.css';

console.log('This log comes from assets/app.js - welcome to AssetMapper! 🎉')
console.log('This log comes from assets/app.js - welcome to AssetMapper! 🎉');
2 changes: 0 additions & 2 deletions symfony/asset-mapper/6.4/importmap.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,6 @@
* be used as an "entrypoint" (and passed to the importmap() Twig function).
*
* The "importmap:require" command can be used to add new entries to this file.
*
* This file has been auto-generated by the importmap commands.
*/
return [
'app' => [
Expand Down
2 changes: 1 addition & 1 deletion symfony/asset-mapper/6.4/manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"aliases": ["asset-mapper", "importmap"],
"gitignore": [
"/%PUBLIC_DIR%/assets/",
"/assets/vendor"
"/assets/vendor/"
],
"composer-scripts": {
"importmap:install": "symfony-cmd"
Expand Down
6 changes: 3 additions & 3 deletions symfony/crowdin-translation-provider/5.3/manifest.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"add-lines": [
{
"file": "config/packages/notifier.yaml",
"file": "config/packages/translation.yaml",
"position": "after_target",
"target": " texter_transports:",
"content": " crowdin: '%env(CROWDIN_DSN)%'"
"target": " providers:",
"content": " crowdin:\n dsn: '%env(CROWDIN_DSN)%'"
}
],
"env": {
Expand Down
11 changes: 2 additions & 9 deletions symfony/framework-bundle/7.0/config/packages/framework.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,12 @@
framework:
secret: '%env(APP_SECRET)%'
#csrf_protection: true
handle_all_throwables: true

# Enables session support. Note that the session will ONLY be started if you read or write from it.
# Remove or comment this section to explicitly disable session support.
session:
handler_id: null
cookie_secure: auto
cookie_samesite: lax
# Note that the session will be started ONLY if you read or write from it.
session: true

#esi: true
#fragments: true
php_errors:
log: true

when@test:
framework:
Expand Down
6 changes: 3 additions & 3 deletions symfony/loco-translation-provider/5.3/manifest.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"add-lines": [
{
"file": "config/packages/notifier.yaml",
"file": "config/packages/translation.yaml",
"position": "after_target",
"target": " texter_transports:",
"content": " loco: '%env(LOCO_DSN)%'"
"target": " providers:",
"content": " loco:\n dsn: '%env(LOCO_DSN)%'"
}
],
"env": {
Expand Down
6 changes: 3 additions & 3 deletions symfony/lokalise-translation-provider/5.3/manifest.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"add-lines": [
{
"file": "config/packages/notifier.yaml",
"file": "config/packages/translation.yaml",
"position": "after_target",
"target": " texter_transports:",
"content": " lokalise: '%env(LOKALISE_DSN)%'"
"target": " providers:",
"content": " lokalise:\n dsn: '%env(LOKALISE_DSN)%'"
}
],
"env": {
Expand Down
Loading

0 comments on commit ec6ff93

Please sign in to comment.