Merge to publish version 3.1 (#47)

* Prepare new version 3.1 (#46)

.ddev/config.yaml

@@ -1,36 +1,29 @@
 name: timezones
 type: typo3
-docroot: .build/web
-php_version: "7.3"
+docroot: .Build/public
+php_version: "7.4"
 webserver_type: apache-fpm
-dbaimage: phpmyadmin/phpmyadmin:4.9.4
+dbaimage: phpmyadmin/phpmyadmin:5.1.3
 router_http_port: "80"
 router_https_port: "443"
 xdebug_enabled: true
 additional_hostnames: []
 additional_fqdns: []
-mariadb_version: "10.2"
+mariadb_version: "10.4"
 mysql_version: ""
-provider: default
-use_dns_when_possible: true
-composer_version: "2"
+nfs_mount_enabled: false
+mutagen_enabled: false
 hooks:
   post-start:
   - exec: echo '*/1 * * * * root TYPO3_CONTEXT=Development /usr/bin/php /var/www/html/public/typo3/sysext/core/bin/typo3scheduler:run'
       | sudo tee -a /etc/cron.d/typo3
   - exec: sudo chmod 0600 /etc/cron.d/typo3 && sudo service cron start
   - exec: sudo cp ~/.ssh/sshd_config /etc/ssh && sudo service ssh start
 webimage_extra_packages: [cron, ssh]
+use_dns_when_possible: true
 timezone: Europe/Berlin
-
-
-# This config.yaml was created with ddev version v1.16.2
-# webimage: drud/ddev-webserver:v1.16.2
-# dbimage: drud/ddev-dbserver-mariadb-10.2:v1.16.0
-# dbaimage: phpmyadmin:5
-# However we do not recommend explicitly wiring these images into the
-# config.yaml as they may break future versions of ddev.
-# You can update this config.yaml using 'ddev config'.
+composer_version: "2"
+web_environment: []
 
 # Key features of ddev's config.yaml:
 
@@ -41,7 +34,7 @@ timezone: Europe/Berlin
 
 # docroot: <relative_path> # Relative path to the directory containing index.php.
 
-# php_version: "7.3"  # PHP version to use, "5.6", "7.0", "7.1", "7.2", "7.3", "7.4" "8.0"
+# php_version: "7.4"  # PHP version to use, "5.6", "7.0", "7.1", "7.2", "7.3", "7.4", "8.0", "8.1"
 
 # You can explicitly specify the webimage, dbimage, dbaimage lines but this
 # is not recommended, as the images are often closely tied to ddev's' behavior,
@@ -65,6 +58,11 @@ timezone: Europe/Berlin
 # "ddev xdebug" to enable xdebug and "ddev xdebug off" to disable it work better,
 # as leaving xdebug enabled all the time is a big performance hit.
 
+# xhprof_enabled: false  # Set to true to enable xhprof and "ddev start" or "ddev restart"
+# Note that for most people the commands
+# "ddev xhprof" to enable xhprof and "ddev xhprof off" to disable it work better,
+# as leaving xhprof enabled all the time is a big performance hit.
+
 # webserver_type: nginx-fpm  # or apache-fpm
 
 # timezone: Europe/Berlin
@@ -74,9 +72,9 @@ timezone: Europe/Berlin
 # For example Europe/Dublin or MST7MDT
 
 # composer_version: "2"
-# if composer_version:"" it will use the current ddev default composer release.
+# if composer_version:"2" it will use the most recent composer v2
 # It can also be set to "1", to get most recent composer v1
-# or "2" for most recent composer v2.
+# or "" for the default v2 created at release time.
 # It can be set to any existing specific composer version.
 # After first project 'ddev start' this will not be updated until it changes
 
@@ -93,7 +91,7 @@ timezone: Europe/Berlin
 # Please take care with this because it can cause great confusion.
 
 # upload_dir: custom/upload/dir
-# would set the destination path for ddev import-files to custom/upload/dir.
+# would set the destination path for ddev import-files to <docroot>/custom/upload/dir
 
 # working_dir:
 #   web: /var/www/html
@@ -106,12 +104,20 @@ timezone: Europe/Berlin
 # Currently only these containers are supported. Some containers can also be
 # omitted globally in the ~/.ddev/global_config.yaml. Note that if you omit
 # the "db" container, several standard features of ddev that access the
-# database container will be unusable.
+# database container will be unusable. In the global configuration it is also
+# possible to omit ddev-router, but not here.
 
 # nfs_mount_enabled: false
 # Great performance improvement but requires host configuration first.
 # See https://ddev.readthedocs.io/en/stable/users/performance/#using-nfs-to-mount-the-project-into-the-container
 
+# mutagen_enabled: false
+# Experimental performance improvement using mutagen asynchronous updates.
+# See https://ddev.readthedocs.io/en/latest/users/performance/#using-mutagen
+
+# fail_on_hook_fail: False
+# Decide whether 'ddev start' should be interrupted by a failing hook
+
 # host_https_port: "59002"
 # The host port binding for https can be explicitly specified. It is
 # dynamic unless otherwise specified.
@@ -132,11 +138,19 @@ timezone: Europe/Berlin
 # phpmyadmin_https_port: "8037"
 # The PHPMyAdmin ports can be changed from the default 8036 and 8037
 
+# host_phpmyadmin_port: "8036"
+# The phpmyadmin (dba) port is not normally bound on the host at all, instead being routed
+# through ddev-router, but it can be specified and bound.
+
 # mailhog_port: "8025"
 # mailhog_https_port: "8026"
 # The MailHog ports can be changed from the default 8025 and 8026
 
-# webimage_extra_packages: [php7.3-tidy, php-bcmath]
+# host_mailhog_port: "8025"
+# The mailhog port is not normally bound on the host at all, instead being routed
+# through ddev-router, but it can be bound directly to localhost if specified here.
+
+# webimage_extra_packages: [php7.4-tidy, php-bcmath]
 # Extra Debian packages that are needed in the webimage can be added here
 
 # dbimage_extra_packages: [telnet,netcat]
@@ -160,21 +174,32 @@ timezone: Europe/Berlin
 
 # disable_settings_management: false
 # If true, ddev will not create CMS-specific settings files like
-# Drupal's settings.php/settings.ddev.php or TYPO3's AdditionalSettings.php
+# Drupal's settings.php/settings.ddev.php or TYPO3's AdditionalConfiguration.php
 # In this case the user must provide all such settings.
 
+# You can inject environment variables into the web container with:
+# web_environment:
+# - SOMEENV=somevalue
+# - SOMEOTHERENV=someothervalue
+
 # no_project_mount: false
 # (Experimental) If true, ddev will not mount the project into the web container;
 # the user is responsible for mounting it manually or via a script.
 # This is to enable experimentation with alternate file mounting strategies.
 # For advanced users only!
 
-# provider: default # Currently either "default" or "pantheon"
-#
+# bind_all_interfaces: false
+# If true, host ports will be bound on all network interfaces,
+# not just the localhost interface. This means that ports
+# will be available on the local network if the host firewall
+# allows it.
+
 # Many ddev commands can be extended to run tasks before or after the
 # ddev command is executed, for example "post-start", "post-import-db",
 # "pre-composer", "post-composer"
 # See https://ddev.readthedocs.io/en/stable/users/extending-commands/ for more
 # information on the commands that can be extended and the tasks you can define
 # for them. Example:
 #hooks:
+#  post-start:
+#    - exec: composer install -d /var/www/html

.ddev/docker-compose-documentation.yaml

@@ -0,0 +1,8 @@
+version: '3'
+services:
+  t3docmake:
+    image: t3docs/render-documentation:latest
+    command: makehtml
+    volumes:
+      - ../:/PROJECT:ro
+      - ../.Build/var/Documentation-GENERATED-temp:/RESULT

.ddev/docker-compose.chrome.yaml

@@ -0,0 +1,10 @@
+version: '3.6'
+services:
+    selenium:
+        container_name: ddev-${DDEV_SITENAME}-chrome
+        image: selenium/standalone-chrome:3.12
+        environment:
+            - VIRTUAL_HOST=$DDEV_HOSTNAME
+            - HTTP_EXPOSE=4444
+        external_links:
+            - ddev-router:$DDEV_HOSTNAME

.ddev/docker-compose.environment.yaml

@@ -4,7 +4,11 @@ services:
   web:
     environment:
       - TYPO3_CONTEXT=Development
+      - typo3DatabaseName=db
       - typo3DatabaseHost=db
-      - typo3DatabaseName=t3func
       - typo3DatabasePassword=root
       - typo3DatabaseUsername=root
+      - PHP_IDE_CONFIG=serverName=${DDEV_SITENAME}.ddev.site
+      - CODECEPTION_ENV=ddev
+    ports:
+        - "9922:22"

.ddev/docker-compose.tempfs.yaml

@@ -0,0 +1,9 @@
+version: '3.6'
+
+services:
+  web:
+    volumes:
+      - type: tmpfs
+        target: /var/www/html/var/cache
+        tmpfs:
+          size: 268435456