Skip to content

Commit 5e441f5

Browse files
committed
Merge branch 'dev' into UHF-12387_tests
2 parents d3bd3f1 + 3208485 commit 5e441f5

824 files changed

Lines changed: 3172 additions & 2079 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.

.deprecation-ignore.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
11
# This file contains patterns to be ignored while testing for use of
22
# deprecated code.
33
# See https://www.drupal.org/node/3285162 for more details.
4+
5+
# Symfony 7.4
6+
%Since symfony/validator 7.4: Support for evaluating options in the base Constraint class is deprecated. Initialize properties in the constructor of .* instead.%

.github/workflows/artifact.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,3 @@ jobs:
1010
uses: city-of-helsinki/drupal-gh-actions/.github/workflows/build-artifact.yml@main
1111
secrets:
1212
sentry_crons: ${{ secrets.SENTRY_CRONS }}
13-

compose.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@ services:
6767
MYSQL_RANDOM_ROOT_PASSWORD: 1
6868
healthcheck:
6969
test: mysqladmin ping -h 127.0.0.1 -u $$MYSQL_USER --password=$$MYSQL_PASSWORD
70+
interval: 1s
7071
timeout: 1s
7172
retries: 30
7273
volumes:

composer.json

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
"composer/installers": "^2.0",
1212
"cweagans/composer-patches": "^1.6.7",
1313
"drupal/consumer_image_styles": "^4.0",
14-
"drupal/core-composer-scaffold": "^11",
1514
"drupal/draggableviews": "^2.0",
1615
"drupal/hdbt": "^6.0",
1716
"drupal/hdbt_admin": "^3.0",
@@ -32,13 +31,11 @@
3231
"drupal/ultimate_cron": "^2.0@alpha",
3332
"drupal/views_rss": "^2.0@RC",
3433
"josdejong/jsoneditor": "^5.29",
35-
"justinrainbow/json-schema": "^5.2",
3634
"mglaman/composer-drupal-lenient": "*",
3735
"proj4php/proj4php": "^2.0"
3836
},
3937
"require-dev": {
4038
"dealerdirect/phpcodesniffer-composer-installer": "^0.7.0",
41-
"dg/bypass-finals": "^1.5",
4239
"dmore/chrome-mink-driver": "^2.8",
4340
"drupal/core-dev": "^10|^11",
4441
"jangregor/phpstan-prophecy": "^1.0",

0 commit comments

Comments
 (0)