@wordpress/env 11.0.1-next.v.202602200903.0 → 11.0.1

package/README.md

@@ -41,7 +41,7 @@ $ wp-env start --runtime=playground
 | Requires Docker | Yes | No |
 | Xdebug | Yes | Yes |
 | SPX profiling | Yes | No |
-| phpMyAdmin | Yes | Yes |
+| phpMyAdmin | Yes | No |
 | MySQL database | Yes | No (SQLite) |
 | Multisite | Yes | Yes |
 | Custom PHP version | Yes | Yes |
@@ -488,7 +488,7 @@ Success: Installed 1 of 1 plugins.
 
 #### Changing the permalink structure
 
-Pretty permalinks are enabled by default using the `/%year%/%monthnum%/%day%/%postname%/` structure, matching the WordPress core behavior on fresh installs. You can change the structure if needed:
+You might want to do this to enable access to the REST API (`wp-env/wp/v2/`) endpoint in your wp-env environment. The endpoint is not available with plain permalinks.
 
 **Examples**
 
@@ -596,8 +596,7 @@ You can customize the WordPress installation, plugins and themes that the develo
 | `"config"`           | `Object`       | See below.                             | Mapping of wp-config.php constants to their desired values.                                                                      |
 | `"mappings"`         | `Object`       | `"{}"`                                 | Mapping of WordPress directories to local directories to be mounted in the WordPress instance.                                   |
 | `"mysqlPort"`        | `integer`      | `null` (randomly assigned)             | The MySQL port number to expose.                                                                                                 |
-| `"phpmyadmin"`       | `boolean`      | `false`                                | Whether to enable phpMyAdmin for database management.                                                                            |
-| `"phpmyadminPort"`   | `integer`      | `null` (randomly assigned)             | The port number for phpMyAdmin (Docker only). Setting this also enables phpMyAdmin.                                              |
+| `"phpmyadminPort"`   | `integer`      | `null`                                 | The port number for phpMyAdmin. If provided, you'll access phpMyAdmin through: http://localhost:<port>                           |
 | `"multisite"`        | `boolean`      | `false`                                | Whether to set up a multisite installation.                                                                                      |
 | `"lifecycleScripts"` | `Object`       | `"{}"`                                 | Mapping of commands that should be executed at certain points in the lifecycle.                                                   |
 
@@ -786,7 +785,7 @@ You can tell `wp-env` to use a custom port number so that your instance does not
 These can also be set via environment variables:
 
 - `WP_ENV_PORT` to override the web server's port.
-- phpMyAdmin is not enabled by default. Enable it with `"phpmyadmin": true` in `.wp-env.json`. The Docker runtime port can also be overridden via `WP_ENV_PHPMYADMIN_PORT`.
+- phpMyAdmin is not enabled by default, but its port can also be overridden via `WP_ENV_PHPMYADMIN_PORT`.
 - By default, MySQL isn't exposed to the host, which means no chance of port conflicts. But this can also be overridden via `WP_ENV_MYSQL_PORT`.
 
 ### Specific PHP Version

package/lib/config/parse-config.js

@@ -51,8 +51,7 @@ const mergeConfigs = require( './merge-configs' );
  * @property {WPSource[]}                themeSources   Themes to load in the environment.
  * @property {number}                    port           The port to use.
  * @property {number}                    mysqlPort      The port to use for MySQL. Random if empty.
- * @property {boolean}                   phpmyadmin     Whether to enable phpMyAdmin.
- * @property {number}                    phpmyadminPort The port to use for phpMyAdmin. Random if empty.
+ * @property {number}                    phpmyadminPort The port to use for phpMyAdmin. If empty, disabled phpMyAdmin.
  * @property {boolean}                   multisite      Whether to set up a multisite installation.
  * @property {Object}                    config         Mapping of wp-config.php constants to their desired values.
  * @property {Object.<string, WPSource>} mappings       Mapping of WordPress directories to local directories which should be mounted.
@@ -90,7 +89,6 @@ const DEFAULT_ENVIRONMENT_CONFIG = {
 	port: 8888,
 	testsPort: 8889,
 	mysqlPort: null,
-	phpmyadmin: false,
 	phpmyadminPort: null,
 	multisite: false,
 	mappings: {},
@@ -308,7 +306,6 @@ function getEnvironmentVarOverrides( cacheDirectoryPath ) {
 	if ( overrides.phpmyadminPort ) {
 		overrideConfig.env.development.phpmyadminPort =
 			overrides.phpmyadminPort;
-		overrideConfig.env.development.phpmyadmin = true;
 	}
 
 	if ( overrides.testsPort ) {
@@ -499,17 +496,8 @@ async function parseEnvironmentConfig(
 		parsedConfig.mysqlPort = config.mysqlPort;
 	}
 
-	if ( config.phpmyadmin !== undefined ) {
-		parsedConfig.phpmyadmin = config.phpmyadmin;
-	}
-
 	if ( config.phpmyadminPort !== undefined ) {
 		parsedConfig.phpmyadminPort = config.phpmyadminPort;
-		// Backward compat: setting phpmyadminPort implies phpmyadmin: true
-		// unless phpmyadmin was explicitly set.
-		if ( config.phpmyadmin === undefined ) {
-			parsedConfig.phpmyadmin = true;
-		}
 	}
 
 	if ( config.multisite !== undefined ) {

package/lib/config/test/__snapshots__/config-integration.js.snap

@@ -33,7 +33,6 @@ exports[`Config Integration should load local and override configuration files 1
       "multisite": false,
       "mysqlPort": 23306,
       "phpVersion": null,
-      "phpmyadmin": false,
       "phpmyadminPort": null,
       "pluginSources": [],
       "port": 999,
@@ -65,7 +64,6 @@ exports[`Config Integration should load local and override configuration files 1
       "multisite": false,
       "mysqlPort": 23307,
       "phpVersion": null,
-      "phpmyadmin": false,
       "phpmyadminPort": null,
       "pluginSources": [],
       "port": 456,
@@ -118,7 +116,6 @@ exports[`Config Integration should load local configuration file 1`] = `
       "multisite": false,
       "mysqlPort": 13306,
       "phpVersion": null,
-      "phpmyadmin": false,
       "phpmyadminPort": null,
       "pluginSources": [],
       "port": 123,
@@ -150,7 +147,6 @@ exports[`Config Integration should load local configuration file 1`] = `
       "multisite": false,
       "mysqlPort": 23307,
       "phpVersion": null,
-      "phpmyadmin": false,
       "phpmyadminPort": null,
       "pluginSources": [],
       "port": 8889,
@@ -203,7 +199,6 @@ exports[`Config Integration should use default configuration 1`] = `
       "multisite": false,
       "mysqlPort": null,
       "phpVersion": null,
-      "phpmyadmin": false,
       "phpmyadminPort": null,
       "pluginSources": [],
       "port": 8888,
@@ -235,7 +230,6 @@ exports[`Config Integration should use default configuration 1`] = `
       "multisite": false,
       "mysqlPort": null,
       "phpVersion": null,
-      "phpmyadmin": false,
       "phpmyadminPort": null,
       "pluginSources": [],
       "port": 8889,
@@ -288,7 +282,6 @@ exports[`Config Integration should use environment variables over local and over
       "multisite": false,
       "mysqlPort": 23306,
       "phpVersion": null,
-      "phpmyadmin": false,
       "phpmyadminPort": null,
       "pluginSources": [],
       "port": 12345,
@@ -321,7 +314,6 @@ exports[`Config Integration should use environment variables over local and over
       "multisite": false,
       "mysqlPort": 23307,
       "phpVersion": null,
-      "phpmyadmin": false,
       "phpmyadminPort": null,
       "pluginSources": [],
       "port": 61234,

package/lib/config/test/parse-config.js

@@ -22,7 +22,6 @@ const DEFAULT_CONFIG = {
 	port: 8888,
 	testsPort: 8889,
 	mysqlPort: null,
-	phpmyadmin: false,
 	phpmyadminPort: null,
 	multisite: false,
 	phpVersion: null,
@@ -417,7 +416,6 @@ describe( 'parseConfig', () => {
 					},
 					env: {
 						development: {
-							phpmyadmin: true,
 							phpmyadminPort: 9001,
 						},
 					},
@@ -430,38 +428,6 @@ describe( 'parseConfig', () => {
 		const expected = {
 			development: {
 				...DEFAULT_CONFIG.env.development,
-				phpmyadmin: true,
-				phpmyadminPort: 9001,
-			},
-			tests: DEFAULT_CONFIG.env.tests,
-		};
-		expect( parsed.env ).toEqual( expected );
-	} );
-
-	it( 'should infer phpmyadmin: true when phpmyadminPort is set', async () => {
-		readRawConfigFile.mockImplementation( async ( configFile ) => {
-			if ( configFile === '/test/gutenberg/.wp-env.json' ) {
-				return {
-					core: 'WordPress/WordPress#Test',
-					phpVersion: '1.0',
-					lifecycleScripts: {
-						afterStart: 'test',
-					},
-					env: {
-						development: {
-							phpmyadminPort: 9001,
-						},
-					},
-				};
-			}
-		} );
-
-		const parsed = await parseConfig( '/test/gutenberg', '/cache' );
-
-		const expected = {
-			development: {
-				...DEFAULT_CONFIG.env.development,
-				phpmyadmin: true,
 				phpmyadminPort: 9001,
 			},
 			tests: DEFAULT_CONFIG.env.tests,

package/lib/runtime/docker/index.js

@@ -241,7 +241,7 @@ class DockerRuntime {
 				: [],
 		} );
 
-		if ( fullConfig.env.development.phpmyadmin ) {
+		if ( fullConfig.env.development.phpmyadminPort ) {
 			await dockerCompose.upOne( 'phpmyadmin', {
 				...dockerComposeConfig,
 				commandOptions: shouldConfigureWp
@@ -250,7 +250,7 @@ class DockerRuntime {
 			} );
 		}
 
-		if ( testsEnabled && fullConfig.env.tests.phpmyadmin ) {
+		if ( testsEnabled && fullConfig.env.tests.phpmyadminPort ) {
 			await dockerCompose.upOne( 'tests-phpmyadmin', {
 				...dockerComposeConfig,
 				commandOptions: shouldConfigureWp
@@ -312,7 +312,7 @@ class DockerRuntime {
 			dockerComposeConfig
 		);
 
-		const phpmyadminPort = fullConfig.env.development.phpmyadmin
+		const phpmyadminPort = fullConfig.env.development.phpmyadminPort
 			? await this._getPublicDockerPort(
 					'phpmyadmin',
 					80,
@@ -335,7 +335,7 @@ class DockerRuntime {
 				3306,
 				dockerComposeConfig
 			);
-			const testsPhpmyadminPort = fullConfig.env.tests.phpmyadmin
+			const testsPhpmyadminPort = fullConfig.env.tests.phpmyadminPort
 				? await this._getPublicDockerPort(
 						'tests-phpmyadmin',
 						80,
@@ -726,7 +726,7 @@ class DockerRuntime {
 			);
 			isRunning = true;
 
-			if ( fullConfig.env.development.phpmyadmin ) {
+			if ( fullConfig.env.development.phpmyadminPort ) {
 				phpmyadminPort = await this._getPublicDockerPort(
 					'phpmyadmin',
 					80,

package/lib/runtime/docker/wordpress.js

@@ -86,11 +86,6 @@ async function configureWordPress( environment, config, spinner ) {
 		'set -eo pipefail',
 		cliConfigCommand,
 		installCommand,
-		// Enable pretty permalinks by default to match what WordPress core
-		// does on a fresh install. The loopback test that WordPress normally
-		// uses to verify pretty permalinks fails in Docker because the CLI
-		// container can't reach the WordPress container at the site URL.
-		`wp rewrite structure '/%year%/%monthnum%/%day%/%postname%/' --hard`,
 	];
 
 	// Bootstrap .htaccess for multisite

package/lib/runtime/playground/index.js

@@ -48,7 +48,7 @@ class PlaygroundRuntime {
 			testsEnvironment: false, // Single environment only
 			xdebug: true, // Supported via --xdebug flag
 			spx: false, // Not supported in WebAssembly
-			phpMyAdmin: true, // Supported via --phpmyadmin CLI flag
+			phpMyAdmin: false, // Supported on playground.wordpress.net but not in CLI yet
 			multisite: true, // Supported via Blueprint
 			customPhpVersion: true, // Supported via --php flag
 			persistentDatabase: false, // Could be supported via mounts (not yet implemented)
@@ -170,10 +170,6 @@ class PlaygroundRuntime {
 			cliArgs.push( '--verbosity', 'debug' );
 		}
 
-		if ( envConfig.phpmyadmin ) {
-			cliArgs.push( '--phpmyadmin' );
-		}
-
 		if ( xdebug ) {
 			cliArgs.push( '--xdebug' );
 		}
@@ -188,27 +184,12 @@ class PlaygroundRuntime {
 		// Create write stream for log file
 		const logFileStream = await fs.open( logFile, 'w' );
 
-		// Resolve the CLI binary directly so that it is found even when
-		// the package is nested inside workspace node_modules (where npx
-		// cannot discover it).
-		const cliPackageJson = require.resolve(
-			'@wp-playground/cli/package.json'
-		);
-		const cliEntryPoint = path.join(
-			path.dirname( cliPackageJson ),
-			'wp-playground.js'
-		);
-
 		return new Promise( ( resolve, reject ) => {
-			const child = spawn(
-				process.execPath,
-				[ cliEntryPoint, ...cliArgs ],
-				{
-					detached: true,
-					stdio: [ 'ignore', logFileStream.fd, logFileStream.fd ],
-					env: { ...process.env, FORCE_COLOR: '0' },
-				}
-			);
+			const child = spawn( 'npx', [ '@wp-playground/cli', ...cliArgs ], {
+				detached: true,
+				stdio: [ 'ignore', logFileStream.fd, logFileStream.fd ],
+				env: { ...process.env, FORCE_COLOR: '0' },
+			} );
 
 			// Store child process reference
 			this.serverProcess = child;
@@ -260,17 +241,8 @@ class PlaygroundRuntime {
 				.then( async () => {
 					spinner.text = `WordPress Playground started at ${ siteUrl }`;
 
-					const phpmyadminUrl = envConfig.phpmyadmin
-						? `${ siteUrl }/phpmyadmin`
-						: null;
-
-					const message = [
-						'WordPress development site started at ' + siteUrl,
-						phpmyadminUrl &&
-							`phpMyAdmin started at ${ phpmyadminUrl }`,
-					]
-						.filter( Boolean )
-						.join( '\n' );
+					const message =
+						'WordPress development site started at ' + siteUrl;
 
 					resolve( {
 						message,
@@ -477,10 +449,6 @@ class PlaygroundRuntime {
 			runtime: 'playground',
 			urls: {
 				development: isRunning ? `http://localhost:${ port }` : null,
-				phpmyadmin:
-					isRunning && envConfig.phpmyadmin
-						? `http://localhost:${ port }/phpmyadmin`
-						: null,
 			},
 			ports: {
 				development: port,

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/env",
-	"version": "11.0.1-next.v.202602200903.0+06edfb869",
+	"version": "11.0.1",
 	"description": "A zero-config, self contained local WordPress environment for development and testing.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
@@ -44,7 +44,7 @@
 	},
 	"dependencies": {
 		"@inquirer/prompts": "^7.2.0",
-		"@wp-playground/cli": "^3.0.48",
+		"@wp-playground/cli": "^3.0.0",
 		"chalk": "^4.0.0",
 		"copy-dir": "^1.3.0",
 		"cross-spawn": "^7.0.6",
@@ -64,5 +64,5 @@
 	"scripts": {
 		"test": "echo \"Error: run tests from root\" && exit 1"
 	},
-	"gitHead": "6e225a6505fdc8e407305851c7a68b781dee8118"
+	"gitHead": "adb6623c9f32490cfc73c7ac7f122578c1f10c65"
 }