Skip to content

Blueprints: Use playground.documentRoot instead of hardcoding /wordpress path #216

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Apr 26, 2023
Merged

Blueprints: Use playground.documentRoot instead of hardcoding /wordpress path #216

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
1e2219b
defineSiteUrl: accept documentRoot as parameter
sejas Apr 25, 2023
5a831d3
defineSiteUrl: format file
sejas Apr 25, 2023
656a45b
defineSiteUrl: get the document root from playground
sejas Apr 26, 2023
98a2aaa
defineSiteUrl: get async documentRoot from playground
sejas Apr 26, 2023
6ef579b
base-php: fix documentRoot
sejas Apr 26, 2023
9aac72d
Merge branch 'trunk' of github.com:Automattic/wordpress-playground in…
sejas Apr 26, 2023
5d308d7
Fix code style
sejas Apr 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/php-wasm/universal/src/lib/base-php.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ export abstract class BasePHP implements IsomorphicLocalPHP {

/** @inheritDoc */
get documentRoot() {
return this.requestHandler!.requestHandler.absoluteUrl;
return this.requestHandler!.requestHandler.documentRoot;
}

/** @inheritDoc */
Expand Down
3 changes: 2 additions & 1 deletion packages/php-wasm/universal/src/lib/universal-php.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,8 @@ export interface RequestHandler {
absoluteUrl: string;

/**
* The absolute URL of this PHPRequestHandler instance.
* The directory in the PHP filesystem where the server will look
* for the files to serve. Default: `/var/www`.
*/
documentRoot: string;
}
Expand Down
5 changes: 3 additions & 2 deletions packages/playground/blueprints/src/lib/steps/define-site-url.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,12 @@ export const defineSiteUrl: StepHandler<DefineSiteUrlStep> = async (
playground,
{ siteUrl }
) => {
const documentRoot = await playground.documentRoot;
await updateFile(
playground,
`/wordpress/wp-config.php`,
`${documentRoot}/wp-config.php`,
(contents) =>
`<?php
`<?php
if ( ! defined( 'WP_HOME' ) ) {
define('WP_HOME', "${siteUrl}");
}
Expand Down