Merge branch 'develop' into production

.ddev/config.yaml

@@ -15,8 +15,8 @@ database:
 hooks:
     post-start:
         - exec: cp .env.ddev .env.local
-        - exec: /mnt/ddev_config/scripts/setup-db
         - composer: install
+        - exec: /mnt/ddev_config/scripts/setup-db
 omit_containers: [db]
 use_dns_when_possible: true
 timezone: Europe/Zurich

.ddev/scripts/setup-db

@@ -1,18 +1,14 @@
 #!/bin/bash
 
-if [ "$APP_ENV" = "test" ]; then
-    DBFILE='/var/www/html/var/test.db'
-    test -f $DBFILE && rm $DBFILE && echo 'Database file removed'
-else
-    DBFILE=`echo $DATABASE_URL|sed 's@sqlite:\/\/\/%kernel\.project_dir%@'"/var/www/html"'@'`
-fi
+DBFILE='/var/www/html/var/ddev.db'
 
 echo 'Database file: '$DBFILE
 
 if [ ! -f $DBFILE ]; then
     echo "No database found, creating a new one including the fixtures..."
 
     php ./bin/console doctrine:schema:create --no-interaction
+    php ./bin/console doctrine:migrations:sync-metadata-storage --no-interaction
     php ./bin/console doctrine:migrations:version --add --all --no-interaction
     php ./bin/console doctrine:fixtures:load --no-interaction
 else

.github/workflows/continuous-integration.yml

@@ -1,7 +1,11 @@
-name: Continuous Integration / Deployment (CI/CD)
+name: Continuous Integration
 
 on:
   push:
+    branches-ignore:
+      - 'task/**'
+      - 'bugfix/**'
+      - 'feature/**'
   pull_request:
 
 jobs:

README.md

@@ -113,26 +113,9 @@ Currently there are 4 Symfony environments defined:
 
 Additional configuration for the webserver can be found in the folder `cnf`.
 
-#### Staging / Development
-
-![CI Development](https://github.com/TYPO3/get.typo3.org/workflows/Integration%20(CI)/badge.svg?branch=develop)
-![CD Development](https://github.com/TYPO3/get.typo3.org/workflows/Deployment%20(CD)/badge.svg?branch=develop)
-
-All pushs to the branch `develop` are automatically deployed to the development
-site at [get.typo3.dev](https://get.typo3.dev) or [composer.typo3.dev](https://composer.typo3.dev).
-This site is protected and can be accessed with the following credentials:
-
-* User: `preview`
-* Password: `U@2C@3t295hb`
-
-SSH access is possible with the following command:
-
-`ssh get-dev@get01.typo3server.ch`
-
 #### Production
 
-![CI Production](https://github.com/TYPO3/get.typo3.org/workflows/Integration%20(CI)/badge.svg?branch=production)
-![CD Production](https://github.com/TYPO3/get.typo3.org/workflows/Deployment%20(CD)/badge.svg?branch=production)
+![CI Production](https://github.com/TYPO3/get.typo3.org/workflows/Continuous%20Integration/badge.svg?branch=develop)
 
 All pushs to the branch `production` are automatically deployed to the production
 site at [get.typo3.org](https://get.typo3.org) or [composer.typo3.org](https://composer.typo3.org).

composer.json

@@ -43,6 +43,7 @@
 		"ext-zip": "*",
 		"ext-zlib": "*",
 		"composer/semver": "^3.3",
+		"doctrine/annotations": "^2.0",
 		"doctrine/collections": "^1.6",
 		"doctrine/dbal": "^3.3",
 		"doctrine/doctrine-bundle": "^2.7",
@@ -53,8 +54,6 @@
 		"easycorp/easyadmin-bundle": "^4.3",
 		"guzzlehttp/guzzle": "^7.4",
 		"guzzlehttp/promises": "^1.5",
-		"jms/serializer": "^3.17",
-		"jms/serializer-bundle": "^4.0.2",
 		"knplabs/knp-menu": "^3.3",
 		"nelmio/api-doc-bundle": "^4.9",
 		"nelmio/cors-bundle": "^2.2",
@@ -67,6 +66,7 @@
 		"symfony/dependency-injection": "^6.2",
 		"symfony/dotenv": "^6.2",
 		"symfony/expression-language": "^6.2",
+		"symfony/finder": "^6.2",
 		"symfony/flex": "^2.2",
 		"symfony/form": "^6.2",
 		"symfony/framework-bundle": "^6.2",
@@ -92,7 +92,7 @@
 		"symfony/validator": "^6.2",
 		"symfony/web-link": "^6.2",
 		"symfony/yaml": "^6.2",
-		"t3g/symfony-template-bundle": "^3.4",
+		"t3g/symfony-template-bundle": "^4.0",
 		"t3g/symfony-usercentrics-bundle": "^1.0.2 || dev-master",
 		"twig/extra-bundle": "^2.12 || ^3.0",
 		"twig/twig": "^2.12 || ^3.0"