Build/Test Tools: Revert [49358] to investigate failures.

Unprops desrosj.
See #50042.

git-svn-id: https://develop.svn.wordpress.org/trunk@49360 602fd350-edb4-49c9-b593-d223f7449a82

.env

@@ -3,10 +3,6 @@
 #
 # 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.
 ##
 
 # The site will be available at http://localhost:LOCAL_PORT
@@ -15,30 +11,10 @@ LOCAL_PORT=8889
 # Where to run WordPress from. Valid options are 'src' and 'build'.
 LOCAL_DIR=src
 
-# The PHP version to use. Valid options are 'latest', and '{version}-fpm'.
+# The PHP version to use. Valid options are 'latest', and '{version}-fpm', where '{version}' is any
+# x.y PHP version from 5.2 onwards.
 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.
 LOCAL_PHP_XDEBUG=false
 

docker-compose.yml

@@ -96,7 +96,7 @@ services:
   # The PHPUnit container.
   ##
   phpunit:
-    image: wordpressdevelop/phpunit:${LOCAL_PHPUNIT-latest}
+    image: wordpressdevelop/phpunit:${LOCAL_PHP-latest}
 
     networks:
       - wpdevnet

package-lock.json

@@ -9135,9 +9135,9 @@
 			}
 		},
 		"dotenv": {
-			"version": "8.2.0",
-			"resolved": "https://registry.npmjs.org/dotenv/-/dotenv-8.2.0.tgz",
-			"integrity": "sha512-8sJ78ElpbDJBHNeBzUbUVLsqKdccaa/BXF1uPTw3GrvQTBgrQrtObr2mUrE38vzYd8cEv+m/JBfDLioYcfXoaw==",
+			"version": "8.1.0",
+			"resolved": "https://registry.npmjs.org/dotenv/-/dotenv-8.1.0.tgz",
+			"integrity": "sha512-GUE3gqcDCaMltj2++g6bRQ5rBJWtkWTmqmD0fo1RnnMuUqHNCt2oTPeDnS9n6fKYvlhn7AeBkb38lymBtWBQdA==",
 			"dev": true
 		},
 		"dotenv-expand": {
@@ -25201,12 +25201,6 @@
 				"tar-stream": "^2.0.0"
 			},
 			"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",
 					"resolved": "https://registry.npmjs.org/bl/-/bl-4.0.3.tgz",
@@ -25219,13 +25213,13 @@
 					}
 				},
 				"buffer": {
-					"version": "5.7.0",
-					"resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.0.tgz",
-					"integrity": "sha512-cd+5r1VLBwUqTrmnzW+D7ABkJUM6mr7uv1dv+6jRw4Rcl7tFIFHDqHPL98LhpGFn3dbAt3gtLxtrWp4m1kFrqg==",
+					"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.3.1",
-						"ieee754": "^1.1.13"
+						"base64-js": "^1.0.2",
+						"ieee754": "^1.1.4"
 					}
 				},
 				"readable-stream": {

package.json

@@ -35,7 +35,7 @@
 		"check-node-version": "4.0.1",
 		"copy-webpack-plugin": "^5.1.1",
 		"cssnano": "4.1.10",
-		"dotenv": "8.2.0",
+		"dotenv": "8.1.0",
 		"dotenv-expand": "5.1.0",
 		"grunt": "~1.1.0",
 		"grunt-banner": "^0.6.0",

tools/local-env/scripts/docker.js

@@ -1,8 +1,6 @@
-const dotenv       = require( 'dotenv' );
-const dotenvExpand = require( 'dotenv-expand' );
+const dotenv = require( 'dotenv' );
 const { execSync } = require( 'child_process' );
-
-dotenvExpand( dotenv.config() );
+dotenv.config();
 
 // Execute any docker-compose command passed to this script.
 execSync( 'docker-compose ' + process.argv.slice( 2 ).join( ' ' ), { stdio: 'inherit' } );

tools/local-env/scripts/install.js

@@ -1,10 +1,9 @@
-const dotenv       = require( 'dotenv' );
-const dotenvExpand = require( 'dotenv-expand' );
+const dotenv = require( 'dotenv' );
 const wait_on = require( 'wait-on' );
 const { execSync } = require( 'child_process' );
 const { renameSync, readFileSync, writeFileSync } = require( 'fs' );
 
-dotenvExpand( dotenv.config() );
+dotenv.config();
 
 // Create wp-config.php.
 wp_cli( 'config create --dbname=wordpress_develop --dbuser=root --dbpass=password --dbhost=mysql --path=/var/www/src --force' );

tools/local-env/scripts/start.js

@@ -1,8 +1,7 @@
-const dotenv       = require( 'dotenv' );
-const dotenvExpand = require( 'dotenv-expand' );
+const dotenv = require( 'dotenv' );
 const { execSync } = require( 'child_process' );
 
-dotenvExpand( dotenv.config() );
+dotenv.config();
 
 // Start the local-env containers.
 execSync( 'docker-compose up -d wordpress-develop', { stdio: 'inherit' } );