Merge branch '2.x' into patch-1

.env

@@ -29,8 +29,9 @@ TRUSTED_PROXIES=127.0.0.1,REMOTE_ADDR
 # IMPORTANT: You MUST configure your server version, either here or in config/packages/doctrine.yaml
 #
 DATABASE_URL="sqlite:///%kernel.project_dir%/var/data.db"
+# DATABASE_URL="mysql://app:[email protected]:3306/app?serverVersion=8.0.32&charset=utf8mb4"
 # 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"
 ###< doctrine/doctrine-bundle ###
 
 ###> symfony/crowdin-translation-provider ###

.env.test

@@ -4,3 +4,4 @@ APP_SECRET='$ecretf0rt3st'
 SYMFONY_DEPRECATIONS_HELPER=999999
 PANTHER_APP_ENV=panther
 PANTHER_ERROR_SCREENSHOT_DIR=./var/error-screenshots
+DATABASE_URL=sqlite:///%kernel.project_dir%/data/database_test.sqlite

.github/dependabot.yml

@@ -23,10 +23,20 @@ updates:
           - "phpstan/*"
   - package-ecosystem: "npm"
     directory: "/"
-    open-pull-requests-limit: 10
+    target-branch: "2.x"
     schedule:
       interval: "monthly"
-    target-branch: "2.x"
+    groups:
+      babel:
+        patterns:
+          - "@babel/*"
+      eslint:
+        patterns:
+          - "@typescript-eslint/*"
+          - "eslint*"
+      webpack:
+        patterns:
+          - "webpack*"
   - package-ecosystem: "github-actions"
     directory: "/"
     open-pull-requests-limit: 10

.github/workflows/ci.yml

@@ -16,7 +16,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-versions: [ '8.1', '8.2' ] # See https://www.php.net/supported-versions.php
+        php-versions: [ '8.2', '8.3' ] # See https://www.php.net/supported-versions.php
     steps:
     - uses: actions/checkout@v4
     - uses: shivammathur/setup-php@v2
@@ -39,7 +39,7 @@ jobs:
     - name: Run checks
       run: vendor/bin/grumphp run --testsuite=check
     - name: Run test suite
-      run: vendor/bin/phpunit
+      run: vendor/bin/simple-phpunit
 
   node-build:
     runs-on: ubuntu-latest
@@ -100,7 +100,7 @@ jobs:
         with:
           images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
       - name: Build and push Docker image
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           context: .
           push: ${{ github.event_name != 'pull_request' }}

.gitignore

@@ -25,7 +25,6 @@ yarn-error.log
 ###< friendsofphp/php-cs-fixer ###
 
 ###> phpunit/phpunit ###
-/phpunit.xml
 .phpunit.result.cache
 ###< phpunit/phpunit ###
 

.phpunit.cache/test-results

@@ -0,0 +1 @@
+{"version":1,"defects":[],"times":[]}