Skip to content

Commit a0e9ffb

Browse files
committed
Merge remote-tracking branch 'origin/release/3.0.0' into feature/5402-upgrade-md-operator-contract
# Conflicts: # CHANGELOG.md
2 parents 204d67c + 8566816 commit a0e9ffb

183 files changed

Lines changed: 9254 additions & 4260 deletions

File tree

Some content is hidden

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

.dockerignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626

2727
# CI / quality-tool configs (not consumed at runtime)
2828
/phpstan.dist.neon
29+
/phpstan-baseline.neon
2930
/phpunit.xml.dist
3031
/psalm.xml
3132
/psalm-baseline.xml
@@ -65,7 +66,7 @@ launch.json
6566
/test-results/
6667
/playwright-report/
6768
/blob-report/
68-
/playwright/.cache/
69+
/playwright/
6970
#< Playwright
7071

7172
###> vincentlanglet/twig-cs-fixer ###

.env

Lines changed: 27 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,17 @@ TRUSTED_PROXIES=127.0.0.1,REMOTE_ADDR
3030
###< symfony/framework-bundle ###
3131

3232
###> doctrine/doctrine-bundle ###
33+
# Doctrine `serverVersion` for dialect selection — must match the running
34+
# MariaDB. Default tracks the docker-compose default (mariadb:11.4);
35+
# override MARIADB_VERSION (and the matching MARIADB_IMAGE in compose) to
36+
# test against 10.11.
37+
MARIADB_VERSION=11.4.4-MariaDB
3338
# Database connection string for MariaDB/MySQL.
3439
# Format described at https://www.doctrine-project.org/projects/doctrine-dbal/en/latest/reference/configuration.html#connecting-using-a-url
3540
# IMPORTANT: You MUST configure your server version, either here or in config/packages/doctrine.yaml
3641
#
3742
# DATABASE_URL="sqlite:///%kernel.project_dir%/var/data.db"
38-
DATABASE_URL="mysql://db:db@mariadb:3306/db?serverVersion=10.11.5-MariaDB"
43+
DATABASE_URL="mysql://db:db@mariadb:3306/db?serverVersion=${MARIADB_VERSION}"
3944
#DATABASE_URL="postgresql://db_user:db_password@127.0.0.1:5432/db_name?serverVersion=13&charset=utf8"
4045
###< doctrine/doctrine-bundle ###
4146

@@ -72,6 +77,13 @@ JWT_SCREEN_REFRESH_TOKEN_TTL=2592000
7277
REDIS_CACHE_PREFIX=DisplayApiService
7378
# Connection string for Redis cache server.
7479
REDIS_CACHE_DSN=redis://redis:6379/0
80+
# Session storage backend, consumed by framework.session.handler_id.
81+
# A `redis://...` DSN makes Symfony auto-build a RedisSessionHandler (with
82+
# its own `sf_s` key prefix, so cache and session keys don't collide on
83+
# the same DB). Empty value = PHP's native file handler; pick that for
84+
# single-pod deployments that don't care about flock-induced tail latency
85+
# or container-restart session survival.
86+
SESSION_HANDLER_DSN=${REDIS_CACHE_DSN}
7587
###< redis ###
7688

7789
###> Http Client ###
@@ -96,6 +108,9 @@ KEY_VAULT_JSON="{}"
96108
TRACK_SCREEN_INFO=false
97109
# Interval in seconds between screen info updates.
98110
TRACK_SCREEN_INFO_UPDATE_INTERVAL_SECONDS=300
111+
# Maximum media upload size in mebibytes (MiB). Read per-request, so no cache:clear needed.
112+
# Must stay aligned with NGINX_MAX_BODY_SIZE and php-fpm upload_max_filesize / post_max_size.
113+
MEDIA_MAX_UPLOAD_SIZE_MB=200
99114
# Toggle the relations checksum optimisation for content updates.
100115
RELATIONS_CHECKSUM_ENABLED=true
101116
###< App ###
@@ -165,6 +180,11 @@ CALENDAR_API_FEED_SOURCE_CACHE_EXPIRE_SECONDS=300
165180
EVENTDATABASE_API_V2_CACHE_EXPIRE_SECONDS=300
166181
###< Event Database Api V2 Feed Type ###
167182

183+
###> Instant Book ###
184+
# Source of busy intervals data for instant booking interactive slides (graph or feed).
185+
INSTANT_BOOK_BUSY_INTERVALS_SOURCE=graph
186+
###< Instant Book ###
187+
168188
###> Admin configuration ###
169189
# API key for Rejseplanen (Danish journey planner) integration.
170190
ADMIN_REJSEPLANEN_APIKEY=
@@ -176,6 +196,10 @@ ADMIN_TOUCH_BUTTON_REGIONS=false
176196
ADMIN_LOGIN_METHODS='[{"type":"username-password","enabled":true,"provider":"username-password","label":""}]'
177197
# Enable enhanced preview mode with additional features.
178198
ADMIN_ENHANCED_PREVIEW=false
199+
# Optional HTML block shown in the login sidebar.
200+
# Allowed tags: strong, em, b, i, br, p, a, span. Allowed attrs: href, title, target, rel, class.
201+
# Leave empty to hide the sidebar text card entirely.
202+
ADMIN_LOGIN_SCREEN_TEXT=
179203
###< Admin configuration ###
180204

181205
###> Client configuration ###
@@ -187,8 +211,8 @@ CLIENT_REFRESH_TOKEN_TIMEOUT=300000
187211
CLIENT_RELEASE_TIMESTAMP_INTERVAL_TIMEOUT=600000
188212
# Interval in milliseconds for running content scheduling checks. 60000 = 1 minute.
189213
CLIENT_SCHEDULING_INTERVAL=60000
190-
# Interval in milliseconds for pulling new content from server. 90000 = 1.5 minutes.
191-
CLIENT_PULL_STRATEGY_INTERVAL=90000
214+
# Interval in milliseconds for pulling new content from server. 600000 = 10 minutes.
215+
CLIENT_PULL_STRATEGY_INTERVAL=600000
192216
# JSON configuration for client color scheme with location coordinates.
193217
CLIENT_COLOR_SCHEME='{"type":"library","lat":56.0,"lng":10.0}'
194218
# Enable debug mode for client-side logging and diagnostics.

.env.test

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ SYMFONY_DEPRECATIONS_HELPER=999999
55
PANTHER_APP_ENV=panther
66
PANTHER_ERROR_SCREENSHOT_DIR=./var/error-screenshots
77

8-
DATABASE_URL="mysql://root:password@mariadb:3306/db_test?serverVersion=mariadb-10.5.13"
8+
DATABASE_URL="mysql://root:password@mariadb:3306/db_test?serverVersion=${MARIADB_VERSION}"
99

1010
###> lexik/jwt-authentication-bundle ###
1111
JWT_SECRET_KEY=%kernel.project_dir%/config/jwt/private.pem
@@ -19,3 +19,6 @@ JWT_SCREEN_TOKEN_TTL=43200
1919
JWT_REFRESH_TOKEN_TTL=3600
2020
JWT_SCREEN_REFRESH_TOKEN_TTL=86400
2121
###< gesdinet/jwt-refresh-token-bundle ###
22+
23+
# Lowered so testMediaUploadRejectedWhenTooLarge can build a small tmp file.
24+
MEDIA_MAX_UPLOAD_SIZE_MB=1

.git-blame-ignore-revs

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
# Revisions to skip when running `git blame`.
2+
#
3+
# Configure once locally:
4+
# git config blame.ignoreRevsFile .git-blame-ignore-revs
5+
#
6+
# Each line is a full commit SHA followed by a comment.
7+
8+
# 7329: Applied coding standards (bulk style commit during psalm→phpstan migration)
9+
6a91050b2339fe7c1b5080f9cdb3219fe1adc739

.github/Taskfile.yml

Lines changed: 0 additions & 46 deletions
This file was deleted.

0 commit comments

Comments
 (0)