Merge branch 'release/6.0.0'

Author: pingers

.gitignore

@@ -3,3 +3,4 @@ vendor
 docker-compose.yml
 bin/
 .php_cs.cache
+.php-cs-fixer.cache

composer.json

@@ -5,14 +5,14 @@
     "license": "GPL-2.0+",
     "minimum-stability": "dev",
     "require": {
-        "php": ">=7.4",
+        "php": ">=8",
         "composer-plugin-api": "^2",
         "symfony/filesystem": "~3.0 || ^4.0"
     },
     "require-dev": {
         "composer/composer": "^2@stable",
         "friendsofphp/php-cs-fixer": "^3@stable",
-        "consolidation/robo": "^3@stable"
+        "consolidation/robo": "^4"
     },
     "config": {
         "bin-dir": "bin/"

composer.lock

@@ -23,7 +23,7 @@ services:
       REDIS_HOST: redis
       SHEPHERD_SITE_ID: 2
       SHEPHERD_INSTALL_PROFILE: ua
-      SHEPHERD_SECRET_PATH: /code/private
+      SHEPHERD_SECRET_PATH: /code/secret
       SHEPHERD_TOKEN: super-secret-token
       SHEPHERD_URL: http://shepherd.test
       SIMPLETEST_BASE_URL: http://web:8080
@@ -52,7 +52,8 @@ services:
       MYSQL_USER: user
       MYSQL_PASSWORD: password
       MYSQL_ROOT_PASSWORD: super-secret-password
-    network_mode: service:web
+    networks:
+      - default
 
   mail:
     image: mailhog/mailhog
@@ -85,4 +86,5 @@ services:
     image: selenium/standalone-chrome:latest
     volumes:
       - /dev/shm:/dev/shm
-    network_mode: service:web
+    networks:
+      - default

scaffold/optional/docker-compose.linux.yml

@@ -17,6 +17,7 @@ services:
       - "8025:8025"
       - "9990:9990"
       - "11211:11211"
+      - "4444:4444"
     environment:
       DTT_BASE_URL: http://web:8080
       DTT_MINK_DRIVER_ARGS: '["chrome", { "chromeOptions": { "w3c": false } }, "http://selenium:4444/wd/hub"]'
@@ -27,7 +28,7 @@ services:
       REDIS_ENABLED: 0
       SHEPHERD_INSTALL_PROFILE: ua
       SHEPHERD_SITE_ID: 2
-      SHEPHERD_SECRET_PATH: /code/private
+      SHEPHERD_SECRET_PATH: /code/secret
       SHEPHERD_TOKEN: super-secret-token
       SHEPHERD_URL: http://shepherd.test
       SIMPLETEST_BASE_URL: http://web:8080

scaffold/optional/docker-compose.osx.yml

@@ -1,10 +1,10 @@
 # This dockerfile takes the current users uid/gid at build time and adjusts reality
 # so that the running user for www-data is actually the same as the launching user.
-FROM uofa/s2i-shepherd-drupal:composer2
+FROM uofa/s2i-shepherd-drupal:openshift-4.x-22.04-php8.1
 
 ARG USER_ID
 ARG GROUP_ID
-ARG PHP_VERSION="7.4"
+ARG PHP_VERSION="8.1"
 
 # Ensure shell is what we want.
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]

scaffold/optional/docker/Dockerfile

@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" bootstrap="./web/core/tests/bootstrap.php" colors="true"
+     beStrictAboutTestsThatDoNotTestAnything="true"
+     beStrictAboutOutputDuringTests="true"
+     beStrictAboutChangesToGlobalState="true"
+     printerClass="\Drupal\Tests\Listeners\HtmlOutputPrinter">
+    <coverage>
+        <include>
+            <directory>./web/modules/custom</directory>
+        </include>
+        <exclude>
+            <directory suffix="Test.php">./</directory>
+            <directory suffix="TestBase.php">./</directory>
+        </exclude>
+    </coverage>
+    <php>
+        <!-- Set error reporting to E_ALL. -->
+        <ini name="error_reporting" value="32767"/>
+        <ini name="memory_limit" value="-1"/>
+        <ini name="max_execution_time" value="0"/>
+        <env name="BROWSERTEST_OUTPUT_DIRECTORY" value="/code/web/sites/simpletest/browser_output" />
+        <env name="DTT_HTML_OUTPUT_DIRECTORY" value="/code/web/sites/simpletest/browser_output" />
+        <env name="SIMPLETEST_BASE_URL" value="http://web:8080"/>
+        <!-- See \weitzman\DrupalTestTraits\MinkSetup -->
+        <env name="DTT_BASE_URL" value="http://web:8080"/>
+        <!-- See \weitzman\DrupalTestTraits\WebDriverSetup -->
+        <env name="DTT_MINK_DRIVER_ARGS" value="[&quot;chrome&quot;, { &quot;chromeOptions&quot;: { &quot;w3c&quot;: false, &quot;args&quot;: [&quot;--disable-dev-shm-usage&quot;] } }, &quot;http://selenium:4444/wd/hub&quot;]"/>
+        <env name="SIMPLETEST_DB" value="mysql://user:password@db/drupal"/>
+        <const name="BOOTSTRAP_IS_PHPUNIT" value="true"/>
+        <!-- To disable deprecation testing completely set SYMFONY_DEPRECATIONS_HELPER value: 'disabled' -->
+        <env name="SYMFONY_DEPRECATIONS_HELPER" value="disabled"/>
+    </php>
+    <testsuites>
+        <testsuite name="unit">
+            <directory>./web/modules/custom/*/tests/src/Unit</directory>
+            <directory>./web/profiles/*/tests/src/Unit</directory>
+        </testsuite>
+        <testsuite name="kernel">
+            <directory>./web/modules/custom/*/tests/src/Kernel</directory>
+            <directory>./web/profiles/*/tests/src/Kernel</directory>
+        </testsuite>
+        <testsuite name="functional">
+            <directory>./web/modules/custom/*/tests/src/Functional</directory>
+            <directory>./web/profiles/*/tests/src/Functional</directory>
+        </testsuite>
+        <testsuite name="functional-javascript">
+            <directory>./web/modules/custom/*/tests/src/FunctionalJavascript</directory>
+            <directory>./web/profiles/*/tests/src/FunctionalJavascript</directory>
+        </testsuite>
+    </testsuites>
+    <listeners>
+        <listener class="\Drupal\Tests\Listeners\DrupalListener">
+        </listener>
+        <!-- The Symfony deprecation listener has to come after the Drupal listener -->
+        <listener class="Symfony\Bridge\PhpUnit\SymfonyTestsListener">
+        </listener>
+    </listeners>
+</phpunit>

scaffold/optional/phpunit.xml

@@ -47,6 +47,7 @@ public static function tasks(Filesystem $filesystem, string $scaffoldPath, strin
             [$scaffoldPath . '/optional', 'docker-compose.osx.yml'],
             [$scaffoldPath . '/optional', 'dsh_bash'],
             [$scaffoldPath . '/optional', 'phpcs.xml'],
+            [$scaffoldPath . '/optional', 'phpunit.xml'],
             [$scaffoldPath . '/optional', 'RoboFile.php'],
             [$scaffoldPath . '/optional', 'docker/Dockerfile'],
             [$scaffoldPath . '/optional', 'docker/xdebug.ini'],