Changeset 51685

Timestamp:

08/28/2021 09:16:22 PM (3 years ago)

Author:

johnbillion

Message:

Build/Test Tools: Install the Composer package dependencies within the Docker environment as part of the local development environment installation and testing processes.

This makes the use of Composer on the host machine optional when using the Docker environment, which means there is no change to the process for installing, updating, and running the tests since [51559].

Props hellofromTonya, azaozz, netweb, desrosj, jrf, johnbillion

Fixes #53945

Location:

trunk

Files:

• package.json (modified) (1 diff)
• tools/local-env/scripts/install.js (modified) (2 diffs)

trunk/package.json

@@ -171 +171 @@
         "env:logs": "node ./tools/local-env/scripts/docker.js logs",
         "env:pull": "node ./tools/local-env/scripts/docker.js pull",
-        "test:php": "node ./tools/local-env/scripts/docker.js run --rm phpunit phpunit",
-        "test:php-composer": "node ./tools/local-env/scripts/docker.js run --rm phpunit php ./vendor/bin/phpunit",
+        "test:php": "node ./tools/local-env/scripts/docker.js run -T php composer update -W && node ./tools/local-env/scripts/docker.js run --rm phpunit phpunit",
+        "test:php-composer": "node ./tools/local-env/scripts/docker.js run -T php composer update -W && node ./tools/local-env/scripts/docker.js run --rm phpunit php ./vendor/bin/phpunit",
         "test:e2e": "node ./tests/e2e/run-tests.js",
         "wp-packages-update": "wp-scripts packages-update"

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

@@ -22 +22 @@
 
 install_wp_importer();
+
+install_composer_dependencies();
 
 // Read in wp-tests-config-sample.php, edit it to work with our config, then write it to wp-tests-config.php.
@@ -58 +60 @@
     execSync( `docker-compose exec -T php git clone https://github.com/WordPress/wordpress-importer.git ${testPluginDirectory} --depth=1`, { stdio: 'inherit' } );
 }
+
+/**
+ * Installs the Composer package dependencies within the Docker environment.
+ */
+function install_composer_dependencies() {
+    execSync( `docker-compose run -T php composer update -W`, { stdio: 'inherit' } );
+}