Merge branch 'feature/typo3_11' into develop

Author: mschwemer

.ddev/commands/host/initialize

@@ -2,7 +2,7 @@
 
 ## Description: import given test data into ddev (database and configurations)
 ## Usage: initialize
-## Example: "ddev import-data"
+## Example: "ddev initialize"
 
 if ! command -v "git-lfs" &> /dev/null
 then
@@ -16,3 +16,5 @@ ddev import-db --src=.project/data/db.sql.gz
 mkdir -p config/sites/main && cp .project/TYPO3/config.yaml config/sites/main/
 cp .ddev/typo3/AdditionalConfiguration.php .Build/Web/typo3conf/
 ddev typo3cms install:setup
+mkdir -p .Build/Web/fileadmin
+cd .Build/Web && tar xf ../../.project/data/fileadmin.tar.gz

.ddev/config.yaml

@@ -1,7 +1,7 @@
 name: powermail
 type: typo3
 docroot: .Build/Web/
-php_version: "7.2"
+php_version: "8.0"
 webserver_type: nginx-fpm
 router_http_port: "80"
 router_https_port: "443"
@@ -17,7 +17,7 @@ hooks:
   post-start:
     - exec: composer install
     - exec: cp .ddev/typo3/AdditionalConfiguration.php .Build/Web/typo3conf/
-
+host_db_port: "28262"
 
 # This config.yaml was created with ddev version v1.17.5
 # webimage: drud/ddev-webserver:v1.17.4

.ddev/docker-compose.browser.yaml

@@ -1,11 +1,13 @@
 version: '3.6'
 services:
-  chromedriver:
+  chrome:
     container_name: ddev-${DDEV_SITENAME}-chromedriver
-    image: selenium/standalone-chrome-debug
+    image: selenium/standalone-chrome:3.141
     restart: "no"
     volumes:
       - /dev/shm:/dev/shm
+    external_links:
+      - ddev-router:$DDEV_HOSTNAME
     ports:
       - 4444
-      - "5900:5900"
+      - "19647:5900"

.gitattributes

@@ -5,7 +5,6 @@
 /Resources/Private/gulpfile.js
 /Resources/Private/package.json
 /readme.md
-
 # Enforce checkout with linux lf consistent over all plattforms
 *.html text eol=lf
 *.css text eol=lf
@@ -21,4 +20,6 @@
 *.xlf text eol=lf
 *.sql text eol=lf
 *.t3s text eol=lf
-*.txt text eol=lf
+*.txt text eol=lf
+*.tar.gz filter=lfs diff=lfs merge=lfs -text
+*.sql.gz filter=lfs diff=lfs merge=lfs -text

.gitignore

@@ -26,3 +26,7 @@ config/
 !.ddev/commands/typo3cms
 !.ddev/typo3/AdditionalConfiguration.php
 !.ddev/typo3/config.yaml
+/.phpunit.result.cache
+/phpunit.xml.dist.bak
+
+.project/data/screenshots

.project/TYPO3/config.yaml

@@ -5,19 +5,6 @@ baseVariants:
     base: 'https://powermail.ddev.site/'
     condition: 'applicationContext == "Development/DDEV"'
 languages:
-  -
-    title: English
-    enabled: true
-    base: /en/
-    typo3Language: default
-    locale: en_US.UTF-8
-    iso-639-1: en
-    websiteTitle: ''
-    navigationTitle: English
-    hreflang: en-US
-    direction: ltr
-    flag: en-us-gb
-    languageId: '1'
   -
     title: deutsch
     enabled: true
@@ -33,6 +20,19 @@ languages:
     fallbacks: ''
     flag: de
     languageId: '0'
+  -
+    title: English
+    enabled: true
+    base: /en/
+    typo3Language: default
+    locale: en_US.UTF-8
+    iso-639-1: en
+    websiteTitle: ''
+    navigationTitle: English
+    hreflang: en-US
+    direction: ltr
+    flag: en-us-gb
+    languageId: '1'
 rootPageId: 1
 routes: {  }
 websiteTitle: ''

.project/data/db.sql.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ac0afc7063785f117138db6878145b81b6b4dcce8231e2d1c580782dcf5f8d73
+size 926025

.project/data/fileadmin.tar.gz

@@ -47,7 +47,9 @@ services:
     working_dir: /home/node/app/Resources/Private
 
   chrome:
-    image: selenium/standalone-chrome-debug:3.141
+    image: seleniarm/standalone-chromium
+    environment:
+      HTTP_EXPOSE: 4444
     volumes:
       - /dev/shm:/dev/shm
     ports:

.project/docker/docker-compose.darwin.yml

@@ -16,7 +16,7 @@ services:
           - ${HOST}
 
   php:
-    image: in2code/php-dev:7.2-fpm
+    image: in2code/php-dev:8.0-fpm
     volumes:
       - ./:/app/:cached
       - $HOME/.composer/auth.json:/tmp/composer/auth.json