EXP-00: Update drupal core 9.4.5

Author: theodorosploumis

.ddev/config.yaml

@@ -1,32 +1,26 @@
-name: drupal-actions
+name: drupal-experiments
 type: drupal9
 docroot: web
 php_version: "8.0"
-webserver_type: apache-fpm
+webserver_type: nginx-fpm
 router_http_port: "80"
 router_https_port: "443"
 xdebug_enabled: false
 additional_hostnames: []
 additional_fqdns: []
-mariadb_version: ""
-mysql_version: "8.0"
+database:
+ type: mariadb
+ version: "10.4"
+nfs_mount_enabled: false
+mutagen_enabled: false
+use_dns_when_possible: true
+composer_version: "2"
+web_environment: []
+nodejs_version: "16"
 hooks:
  post-start:
  - exec: cp .env.example .env
  - exec: composer install --no-interaction
-webimage_extra_packages: ['ruby']
-use_dns_when_possible: true
-timezone: Europe/Athens
-composer_version: "2"
-disable_settings_management: true
-
-# This config.yaml was created with ddev version v1.17.7
-# webimage: drud/ddev-webserver:v1.17.7
-# dbimage: drud/ddev-dbserver-mariadb-10.3:v1.17.7
-# 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'.
 
 # Key features of ddev's config.yaml:
 
@@ -37,21 +31,19 @@ disable_settings_management: true
 
 # docroot: <relative_path> # Relative path to the directory containing index.php.
 
-# php_version: "7.4" # 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
+# You can explicitly specify the webimage but this
 # is not recommended, as the images are often closely tied to ddev's' behavior,
 # so this can break upgrades.
 
 # webimage: <docker_image> # nginx/php docker image.
-# dbimage: <docker_image> # mariadb docker image.
-# dbaimage: <docker_image>
 
-# mariadb_version and mysql_version
-# ddev can use many versions of mariadb and mysql
-# However these directives are mutually exclusive
-# mariadb_version: 10.2
-# mysql_version: 8.0
+# database:
+#  type: <dbtype> # mysql, mariadb
+#  version: <version> # database version, like "10.3" or "8.0"
+# Note that mariadb_version or mysql_version from v1.18 and earlier
+# will automatically be converted to this notation with just a "ddev config --auto"
 
 # router_http_port: <port> # Port to be used for http (defaults to port 80)
 # router_https_port: <port> # Port for https (defaults to 443)
@@ -74,12 +66,25 @@ disable_settings_management: true
 # see https://en.wikipedia.org/wiki/List_of_tz_database_time_zones
 # For example Europe/Dublin or MST7MDT
 
-# composer_version: ""
-# if composer_version:"" it will use the current ddev default composer release.
-# It can also be set to "1", to get most recent composer v1
-# or "2" for most recent composer v2.
-# It can be set to any existing specific composer version.
-# After first project 'ddev start' this will not be updated until it changes
+# composer_root: <relative_path>
+# Relative path to the composer root directory from the project root. This is
+# the directory which contains the composer.json and where all Composer related
+# commands are executed.
+
+# composer_version: "2"
+# You can set it to "" or "2" (default) for Composer v2 or "1" for Composer v1
+# to use the latest major version available at the time your container is built.
+# It is also possible to select a minor version for example "2.2" which will
+# install the latest release of that branch. Alternatively, an explicit Composer
+# version may be specified, for example "1.0.22". Finally, it is also possible
+# to use one of the key words "stable", "preview" or "snapshot" see Composer
+# documentation.
+# To reinstall Composer after the image was built, run "ddev debug refresh".
+
+# nodejs_version: "16"
+# change from the default system Node.js version to another supported version, like 12, 14, 17, 18.
+# Note that you can use 'ddev nvm' or nvm inside the web container to provide nearly any
+# Node.js version, including v6, etc.
 
 # additional_hostnames:
 # - somename
@@ -94,7 +99,9 @@ disable_settings_management: true
 # 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
+# When mutagen is enabled this path is bind-mounted so that all the files
+# in the upload_dir don't have to be synced into mutagen
 
 # working_dir:
 # web: /var/www/html
@@ -107,12 +114,17 @@ disable_settings_management: true
 # 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
+# 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
 
@@ -136,10 +148,18 @@ disable_settings_management: true
 # 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
 
+# 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
 
@@ -158,7 +178,7 @@ disable_settings_management: true
 # If you prefer you can change this to "ddev.local" to preserve
 # pre-v1.9 behavior.
 
-# ngrok_args: --subdomain mysite --auth username:pass
+# ngrok_args: --basic-auth username:pass1234
 # Provide extra flags to the "ngrok http" command, see
 # https://ngrok.com/docs#http or run "ngrok http -h"
 
@@ -178,10 +198,63 @@ disable_settings_management: true
 # This is to enable experimentation with alternate file mounting strategies.
 # For advanced users only!
 
+# 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.
+
+# default_container_timeout: 120
+# The default time that ddev waits for all containers to become ready can be increased from
+# the default 120. This helps in importing huge databases, for example.
+
+#web_extra_exposed_ports:
+#- name: nodejs
+# container_port: 3000
+# http_port: 2999
+# https_port: 3000
+#- name: something
+# container_port: 4000
+# https_port: 4000
+# http_port: 3999
+# Allows a set of extra ports to be exposed via ddev-router
+# The port behavior on the ddev-webserver must be arranged separately, for example
+# using web_extra_daemons.
+# For example, with a web app on port 3000 inside the container, this config would
+# expose that web app on https://<project>.ddev.site:9999 and http://<project>.ddev.site:9998
+# web_extra_exposed_ports:
+# - container_port: 3000
+# http_port: 9998
+# https_port: 9999
+
+#web_extra_daemons:
+#- name: "http-1"
+# command: "/var/www/html/node_modules/.bin/http-server -p 3000"
+# directory: /var/www/html
+#- name: "http-2"
+# command: "/var/www/html/node_modules/.bin/http-server /var/www/html/sub -p 3000"
+# directory: /var/www/html
+
+# override_config: false
+# By default, config.*.yaml files are *merged* into the configuration
+# But this means that some things can't be overridden
+# For example, if you have 'nfs_mount_enabled: true'' you can't override it with a merge
+# and you can't erase existing hooks or all environment variables.
+# However, with "override_config: true" in a particular config.*.yaml file,
+# 'nfs_mount_enabled: false' can override the existing values, and
+# hooks:
+# post_start: []
+# or
+# web_environment: []
+# or
+# additional_hostnames: []
+# can have their intended affect. 'override_config' affects only behavior of the
+# config.*.yaml file it exists in.
+
 # 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
+# See https://ddev.readthedocs.io/en/stable/users/extend/custom-commands/ for more
 # information on the commands that can be extended and the tasks you can define
 # for them. Example:
 #hooks:

.ddev/providers/platform.yaml

@@ -0,0 +1,69 @@
+#ddev-generated
+# Example Platform.sh provider configuration.
+
+# Consider using `ddev get platformsh/ddev-platformsh` (https://github.com/platformsh/ddev-platformsh) for more
+# complete platform integration.
+
+# To use this configuration,
+
+# 1. Check out the site from platform.sh and then configure it with `ddev config`. You'll want to use `ddev start` and make sure the basic functionality is working.
+# 2. Obtain and configure an API token.
+# a. Login to the Platform.sh Dashboard and go to Account->API Tokens to create an API token for ddev to use.
+# b. Add the API token to the `web_environment` section in your global ddev configuration at ~/.ddev/global_config.yaml:
+# ```yaml
+# web_environment:
+# - PLATFORMSH_CLI_TOKEN=abcdeyourtoken
+# ```
+# 3. Add PLATFORM_PROJECT and PLATFORM_ENVIRONMENT variables to your project `.ddev/config.yaml` or a `.ddev/config.platform.yaml`
+# ```yaml
+# web_environment:
+# - PLATFORM_PROJECT=nf4amudfn23biyourproject
+# - PLATFORM_ENVIRONMENT=main
+# 4. `ddev restart`
+# 5. Run `ddev pull platform`. After you agree to the prompt, the current upstream database and files will be downloaded.
+# 6. Optionally use `ddev push platform` to push local files and database to platform.sh. Note that `ddev push` is a command that can potentially damage your production site, so this is not recommended.
+
+# If you need to change this `platform.yaml` recipe, you can change it to suit your needs, but remember to remove the "ddev-generated" line from the top.
+
+# Debugging: Use `ddev exec platform` to see what platform.sh knows about
+# your configuration and whether it's working correctly.
+
+auth_command:
+ command: |
+ set -eu -o pipefail
+ if [ -z "${PLATFORMSH_CLI_TOKEN:-}" ]; then echo "Please make sure you have set PLATFORMSH_CLI_TOKEN in ~/.ddev/global_config.yaml" && exit 1; fi
+
+db_pull_command:
+ command: |
+ #set -x # You can enable bash debugging output by uncommenting
+ set -eu -o pipefail
+ ls /var/www/html/.ddev >/dev/null # This just refreshes stale NFS if possible
+ platform db:dump --yes --gzip --file=/var/www/html/.ddev/.downloads/db.sql.gz --project="${PLATFORM_PROJECT}" --environment="${PLATFORM_ENVIRONMENT}"
+
+files_import_command:
+ command: |
+ #set -x # You can enable bash debugging output by uncommenting
+ set -eu -o pipefail
+ # Use $PLATFORM_MOUNTS if it exists to get list of mounts to download, otherwise just web/sites/default/files (drupal)
+ declare -a mounts=(${PLATFORM_MOUNTS:-/web/sites/default/files})
+ platform mount:download --all --yes --quiet --project="${PLATFORM_PROJECT}" --environment="${PLATFORM_ENVIRONMENT}" --target=/var/www/html
+
+
+# push is a dangerous command. If not absolutely needed it's better to delete these lines.
+db_push_command:
+ command: |
+ # set -x # You can enable bash debugging output by uncommenting
+ set -eu -o pipefail
+ ls /var/www/html/.ddev >/dev/null # This just refreshes stale NFS if possible
+ pushd /var/www/html/.ddev/.downloads >/dev/null;
+ gzip -dc db.sql.gz | platform db:sql --project="${PLATFORM_PROJECT}" --environment="${PLATFORM_ENVIRONMENT}"
+
+# push is a dangerous command. If not absolutely needed it's better to delete these lines.
+# TODO: This is a naive, Drupal-centric push, which needs adjustment for the mount to be pushed.
+files_push_command:
+ command: |
+ # set -x # You can enable bash debugging output by uncommenting
+ set -eu -o pipefail
+ ls "${DDEV_FILES_DIR}" >/dev/null # This just refreshes stale NFS if possible
+ platform mount:upload --yes --quiet --project="${PLATFORM_PROJECT}" --environment="${PLATFORM_ENVIRONMENT}" --source="${DDEV_FILES_DIR}" --mount=web/sites/default/files
+

.gitignore

@@ -14,6 +14,9 @@
 /web/sites/*/files/
 /private-files/**
 
+# Ignore config
+/config/sync
+
 # Ignore SimpleTest multi-site environment.
 /web/sites/simpletest
 

composer.json

@@ -90,7 +90,7 @@
  "patches": {
  "drupal/core": {
  "BaseFieldOverride fails to take into account ContentEntityInterface::bundleFieldDefinitions()... https://dgo.to/2321071": "https://www.drupal.org/files/issues/2019-12-24/2321071-39.patch",
- "Allow an install hook in profiles installing from configuration, https://dgo.to/2982052": "https://www.drupal.org/files/issues/2021-09-27/2982052-73.patch"
+ "Allow an install hook in profiles installing from configuration, https://dgo.to/2982052": "https://www.drupal.org/files/issues/2022-05-19/2982052-80.patch"
  },
  "drupal/devel": {
  "Compatability with Core 9.3, https://gitlab.com/drupalspoons/devel/-/issues/388": "https://gitlab.com/drupalspoons/devel/uploads/63e4e96921f8c05d3e98faf84d62d4e4/388-compatability-with-core-9.3.diff"