Merge branch 'release/4.0.1'

Author: pingers

RoboFileBase.php

@@ -47,7 +47,7 @@ abstract class RoboFileBase extends \Robo\Tasks {
   protected $application_root = "/code/web";
   protected $file_public_path = '/shared/public';
   protected $file_private_path = '/shared/private';
-  protected $file_temporary_path = '/shared/tmp';
+  protected $file_temp_path = '/shared/tmp';
   protected $services_yml = "web/sites/default/services.yml";
   protected $settings_php = "web/sites/default/settings.php";
 
@@ -199,7 +199,7 @@ public function buildMake($flags = '') {
    * Set the owner and group of all files in the files dir to the web user.
    */
   public function buildSetFilesOwner() {
-    foreach ([$this->file_public_path, $this->file_private_path, $this->file_temporary_path] as $path) {
+    foreach ([$this->file_public_path, $this->file_private_path, $this->file_temp_path] as $path) {
       $this->say("Ensuring all directories exist.");
       $this->_exec("mkdir -p $path");
       $this->say("Setting files directory owner.");

docker-compose.osx.yml

@@ -85,7 +85,7 @@ services:
     network_mode: service:web
 
   selenium:
-    image: selenium/standalone-chrome:3.141.59-oxygen
+    image: selenium/standalone-chrome:latest
     network_mode: service:web
     volumes:
       - /dev/shm:/dev/shm

phpcs.xml

@@ -3,9 +3,16 @@
   <description>Default PHP CodeSniffer configuration for UoA projects.</description>
   <!-- folders to scan -->
   <file>./web/modules/custom</file>
+  <file>./web/modules/contrib</file>
   <file>./web/profiles</file>
   <file>./web/themes</file>
+  <exclude-pattern>./web/modules/contrib/(?!ua_)*</exclude-pattern>
   <exclude-pattern>*md</exclude-pattern>
+  <exclude-pattern>*css</exclude-pattern>
+  <exclude-pattern>*min.js</exclude-pattern>
+  <exclude-pattern>*vendor/*.js</exclude-pattern>
+  <exclude-pattern>*plugins/*.js</exclude-pattern>
+  <exclude-pattern>*dist/*.js</exclude-pattern>
   <!-- additional arguments -->
   <arg name="report" value="full"/>
   <!-- inherit from coder -->

src/Handler.php

@@ -161,7 +161,7 @@ public function generateSettings()
             "  'namespace' => getenv('DATABASE_NAMESPACE') ?: 'Drupal\\\\Core\\\\Database\\\\Driver\\\\mysql',\n" .
             ");\n" .
             "\$settings['file_private_path'] = getenv('PRIVATE_DIR') ?: '/shared/private';\n" .
-            "\$settings['file_temporary_path'] = getenv('TMP_DIR') ?: '/shared/tmp';\n" .
+            "\$settings['file_temp_path'] = getenv('TMP_DIR') ?: '/shared/tmp';\n" .
             "\$settings['hash_salt'] = getenv('HASH_SALT') ?: '" . str_replace(['+', '/', '='], ['-', '_', ''], base64_encode(random_bytes(55))) . "';\n" .
             "\$config_directories['sync'] = DRUPAL_ROOT . '/../config-export';\n" .
             "\$settings['shepherd_site_id'] = getenv('SHEPHERD_SITE_ID');\n" .
@@ -210,6 +210,9 @@ public function generateSettings()
             "  \$settings['reverse_proxy_port_header'] = getenv('SHEPHERD_REVERSE_PROXY_PORT_HEADER') ?: 'X_FORWARDED_PORT';\n" .
             "  \$settings['reverse_proxy_forwarded_header'] = getenv('SHEPHERD_REVERSE_PROXY_FORWARDED_HEADER') ?: 'FORWARDED';\n" .
             "}\n" .
+            "if (getenv('TRUSTED_HOST_PATTERNS')) {\n" .
+            "  \$settings['trusted_host_patterns'] = !empty(getenv('TRUSTED_HOST_PATTERNS')) ? explode(',', getenv('TRUSTED_HOST_PATTERNS')) : [];\n" .
+            "}\n" .
             "/**\n * END SHEPHERD CONFIG\n */\n" .
             "\n" .
             "/**\n * START LOCAL CONFIG\n */\n" .