Changeset 49358 for trunk

Timestamp:

10/28/2020 07:01:19 PM (4 years ago)

Author:

desrosj

Message:

Build/Test Tools: Allow the desired version of PHPUnit to be passed to the local Docker environment.

This change introduces the LOCAL_PHPUNIT environment variable that allows the desired version of PHPUnit to be specified when running the PHP tests within the local Docker environment.

Because support for newer versions of PHPUnit is not backported, some versions of PHP need the ability to run multiple versions of PHPUnit for different branches. This adds the flexibility needed to use the Docker environment within those older branches to run the PHP tests.

Props johnbillion.
Fixes #50042.

Location:

trunk

Files:

• .env (modified) (2 diffs)
• docker-compose.yml (modified) (1 diff)
• package-lock.json (modified) (3 diffs)
• package.json (modified) (1 diff)
• tools/local-env/scripts/docker.js (modified) (1 diff)
• tools/local-env/scripts/install.js (modified) (1 diff)
• tools/local-env/scripts/start.js (modified) (1 diff)

trunk/.env

@@ -4 +4 @@
 # All of these options can be overridden by setting them as environment variables before starting
 # the environment. You will need to restart your environment when changing any of these.
+#
+# Below, the following substitutions can be made:
+# - '{version}': any major.minor PHP version from 5.2 onwards.
+# - '{phpunit_version}': any major PHPUnit version starting with 4.
 ##
 
@@ -12 +16 @@
 LOCAL_DIR=src
 
-# The PHP version to use. Valid options are 'latest', and '{version}-fpm', where '{version}' is any
-# x.y PHP version from 5.2 onwards.
+# The PHP version to use. Valid options are 'latest', and '{version}-fpm'.
 LOCAL_PHP=latest
+
+##
+# The PHPUnit version to use when running tests.
+#
+# Support for new PHPUnit versions is not backported to past versions, so some old WordPress branches require an older
+# version to run tests.
+#
+# Valid versions are:
+# - 'latest' for the highest version of PHPUnit supported on the highest version of PHP supported.
+# - '{version}-fpm' for the highest version of PHPUnit supported on the specified version of PHP.
+# - '{phpunit_version}-php-{version}-fpm' for a specific version of PHPUnit on the specified version of PHP. This format
+# is only available for PHP versions 5.6 and higher.
+#
+# For the full list of available options, see https://hub.docker.com/r/wordpressdevelop/phpunit/tags.
+#
+# For full documentation on PHPUnit compatibility and WordPress versions, see
+# https://make.wordpress.org/core/handbook/references/phpunit-compatibility-and-wordpress-versions/.
+#
+# This defaults to the value assigned to the value of LOCAL_PHP.
+##
+LOCAL_PHPUNIT=${LOCAL_PHP}
 
 # Whether or not to enable XDebug.

trunk/docker-compose.yml

@@ -97 +97 @@
   ##
   phpunit:
-    image: wordpressdevelop/phpunit:${LOCAL_PHP-latest}
+    image: wordpressdevelop/phpunit:${LOCAL_PHPUNIT-latest}
 
     networks:

trunk/package-lock.json

@@ -9136 +9136 @@
         },
         "dotenv": {
-            "version": "8.1.0",
-            "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-8.1.0.tgz",
-            "integrity": "sha512-GUE3gqcDCaMltj2++g6bRQ5rBJWtkWTmqmD0fo1RnnMuUqHNCt2oTPeDnS9n6fKYvlhn7AeBkb38lymBtWBQdA==",
+            "version": "8.2.0",
+            "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-8.2.0.tgz",
+            "integrity": "sha512-8sJ78ElpbDJBHNeBzUbUVLsqKdccaa/BXF1uPTw3GrvQTBgrQrtObr2mUrE38vzYd8cEv+m/JBfDLioYcfXoaw==",
             "dev": true
         },
@@ -25202 +25202 @@
             },
             "dependencies": {
+                "base64-js": {
+                    "version": "1.3.1",
+                    "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.3.1.tgz",
+                    "integrity": "sha512-mLQ4i2QO1ytvGWFWmcngKO//JXAQueZvwEKtjgQFM4jIK0kU+ytMfplL8j+n5mspOfjHwoAg+9yhb7BwAHm36g==",
+                    "dev": true
+                },
                 "bl": {
                     "version": "4.0.3",
@@ -25214 +25220 @@
                 },
                 "buffer": {
-                    "version": "5.6.0",
-                    "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.6.0.tgz",
-                    "integrity": "sha512-/gDYp/UtU0eA1ys8bOs9J6a+E/KWIY+DZ+Q2WESNUA0jFRsJOc0SNUO6xJ5SGA1xueg3NL65W6s+NY5l9cunuw==",
-                    "dev": true,
-                    "requires": {
-                        "base64-js": "^1.0.2",
-                        "ieee754": "^1.1.4"
+                    "version": "5.7.0",
+                    "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.0.tgz",
+                    "integrity": "sha512-cd+5r1VLBwUqTrmnzW+D7ABkJUM6mr7uv1dv+6jRw4Rcl7tFIFHDqHPL98LhpGFn3dbAt3gtLxtrWp4m1kFrqg==",
+                    "dev": true,
+                    "requires": {
+                        "base64-js": "^1.3.1",
+                        "ieee754": "^1.1.13"
                     }
                 },

trunk/package.json

@@ -36 +36 @@
         "copy-webpack-plugin": "^5.1.1",
         "cssnano": "4.1.10",
-        "dotenv": "8.1.0",
+        "dotenv": "8.2.0",
         "dotenv-expand": "5.1.0",
         "grunt": "~1.1.0",

trunk/tools/local-env/scripts/docker.js

@@ -1 @@
-const dotenv = require( 'dotenv' );
+const dotenv       = require( 'dotenv' );
+const dotenvExpand = require( 'dotenv-expand' );
 const { execSync } = require( 'child_process' );
-dotenv.config();
+
+dotenvExpand( dotenv.config() );
 
 // Execute any docker-compose command passed to this script.

trunk/tools/local-env/scripts/install.js

@@ -1 @@
-const dotenv = require( 'dotenv' );
+const dotenv       = require( 'dotenv' );
+const dotenvExpand = require( 'dotenv-expand' );
 const wait_on = require( 'wait-on' );
 const { execSync } = require( 'child_process' );
 const { renameSync, readFileSync, writeFileSync } = require( 'fs' );
 
-dotenv.config();
+dotenvExpand( dotenv.config() );
 
 // Create wp-config.php.

trunk/tools/local-env/scripts/start.js

@@ -1 @@
-const dotenv = require( 'dotenv' );
+const dotenv       = require( 'dotenv' );
+const dotenvExpand = require( 'dotenv-expand' );
 const { execSync } = require( 'child_process' );
 
-dotenv.config();
+dotenvExpand( dotenv.config() );
 
 // Start the local-env containers.