Merge tag '4.3.0'

.ddev/.gitignore

@@ -0,0 +1,33 @@
+# You can remove the above line if you want to edit and maintain this file yourself.
+
+/**/*.example
+/.dbimageBuild
+/.dbimageExtra
+/.ddev-docker-*.yaml
+/.*downloads
+/.global_commands
+/.homeadditions
+/.importdb*
+/.sshimageBuild
+/.webimageBuild
+/.webimageExtra
+/apache/apache-site.conf
+/commands/.gitattributes
+/commands/db/mysql
+/commands/host/launch
+/commands/web/xdebug
+/commands/web/live
+/config.*.y*ml
+/import-db
+/import.yaml
+/mutagen/mutagen.yml
+/mutagen/.start-synced
+/nginx_full/nginx-site.conf
+/postgres/postgresql.conf
+/providers/platform.yaml
+/sequelpro.spf
+/traefik/config/contao-i18n.yaml
+/traefik/certs/contao-i18n.crt
+/traefik/certs/contao-i18n.key
+/xhprof/xhprof_prepend.php
+/**/README.*

.ddev/config.yaml

@@ -0,0 +1,25 @@
+name: merger2
+type: php
+docroot: ".ddev/contao/public"
+php_version: "8.1"
+webserver_type: apache-fpm
+router_http_port: "80"
+router_https_port: "443"
+xdebug_enabled: false
+additional_hostnames: []
+additional_fqdns: []
+database:
+    type: mariadb
+    version: "10.4"
+nfs_mount_enabled: false
+mutagen_enabled: false
+use_dns_when_possible: true
+composer_root: ".ddev/contao"
+composer_version: "2"
+web_environment: []
+nodejs_version: "16"
+timezone: Europe/Berlin
+omit_containers: [dba]
+working_dir: {
+    web: "/var/www/html/.ddev/contao"
+}

.ddev/contao/.env

@@ -0,0 +1,4 @@
+APP_ENV=dev
+DATABASE_URL="mysql://db:db@db:3306/db"
+APP_SECRET="Nwza7bqpxyQqwZZzdCtWEjDLuchuqWpz2Ehw"
+MAILER_DSN="smtp://localhost:1025"

.ddev/contao/composer.json

@@ -0,0 +1,48 @@
+{
+  "name": "contao/managed-edition",
+  "description": "Contao Managed Edition",
+  "license": "LGPL-3.0-or-later",
+  "type": "project",
+  "require": {
+    "contao/calendar-bundle": "^4.13",
+    "contao/comments-bundle": "^4.13",
+    "contao/conflicts": "@dev",
+    "contao/faq-bundle": "^4.13",
+    "contao/listing-bundle": "^4.13",
+    "contao/manager-bundle": "4.13.*",
+    "contao/news-bundle": "^4.13",
+    "contao/newsletter-bundle": "^4.13",
+    "contao-community-alliance/merger2": "*"
+  },
+  "conflict": {
+    "contao-components/installer": "<1.3"
+  },
+  "minimum-stability": "dev",
+  "prefer-stable": true,
+  "config": {
+    "allow-plugins": {
+      "composer/package-versions-deprecated": true,
+      "contao-community-alliance/composer-plugin": true,
+      "contao-components/installer": true,
+      "contao/manager-plugin": true,
+      "php-http/discovery": false
+    }
+  },
+  "extra": {
+    "contao-component-dir": "assets"
+  },
+  "scripts": {
+    "post-install-cmd": [
+      "@php vendor/bin/contao-setup"
+    ],
+    "post-update-cmd": [
+      "@php vendor/bin/contao-setup"
+    ]
+  },
+  "repositories": [
+    {
+      "type": "path",
+      "url": "../.."
+    }
+  ]
+}