Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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 composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
"process-timeout": 600,
"sort-packages": true,
"platform": {
"php": "7.4"
"php": "8.3"
},
"allow-plugins": {
"composer/installers": true,
Expand Down
2 changes: 1 addition & 1 deletion contributing.md
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ We use npm as the canonical task runner for the project. The following commands
- `npm run test-xdebug` will run the PHPunit tests with Xdebug enabled.
- `npm run test-e2e` will run the Playwright E2E tests.
- `npm run test-e2e-debug` will run the Playwright E2E tests in a debug mode (with Chromium browser and dev tools open).
- `npm run switch-to:php7.4` and `npm run switch-to:php8.2` will switch you to either PHP 7.4 or PHP 8.2
- `npm run switch-to:php7.4`, `npm run switch-to:php8.2`, and `npm run switch-to:php8.3` switch the WordPress container PHP version (default build is PHP 8.3)
- `npm run document:connectors` generates [connectors.md](connectors.md). This runs via your local php.
- `npm run large-records-generate` inserts ~1.6M rows to `wp_stream` and ~8.4M rows to `wp_streammeta` for testing
- `npm run large-records-remove` removes the test data only
Expand Down
8 changes: 8 additions & 0 deletions docker-compose.build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,14 @@ services:
PHP_VERSION: "8.2"
XDEBUG_VERSION: "3.2.1"

wordpress_php8.3:
image: ghcr.io/xwp/stream-wordpress:php8.3
build:
context: ./local/docker/wordpress
args:
PHP_VERSION: "8.3"
XDEBUG_VERSION: "3.3.2"

# Helper image that generates a locally-trusted TLS cert via mkcert for
# the Apache HTTPS vhost on the wordpress service. Pre-built and pushed
# to ghcr.io so CI and contributors don't rebuild it on every fresh
Expand Down
6 changes: 3 additions & 3 deletions local/docker/wordpress/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
# Keep in sync with the default value of XDEBUG_VERSION below!
ARG PHP_VERSION=7.4
ARG PHP_VERSION=8.3

FROM wordpress:php${PHP_VERSION}-apache

# The latest Xdebug version which supports PHP 7.4 is 3.1.6.
# Xdebug 3.3.x supports PHP 8.3.
# @link https://xdebug.org/docs/compat
ARG XDEBUG_VERSION=3.1.6
ARG XDEBUG_VERSION=3.3.2

# Include our Composer vendor binary path into global path.
ENV PATH="/var/www/html/wp-content/plugins/stream-src/vendor/bin:${PATH}"
Expand Down
3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,9 @@
"push-containers": "docker compose --file docker-compose.build.yml push",
"start": "docker compose up --remove-orphans --detach",
"start-xdebug": "XDEBUG_TRIGGER=1 docker compose up --remove-orphans --detach",
"switch-to:php8.3": "docker compose build --build-arg PHP_VERSION=8.3 --build-arg XDEBUG_VERSION=3.3.2 && npm run start",
"switch-to:php8.2": "docker compose build --build-arg PHP_VERSION=8.2 --build-arg XDEBUG_VERSION=3.3.2 && npm run start",
"switch-to:php7.4": "docker compose build && npm run start",
"switch-to:php7.4": "docker compose build --build-arg PHP_VERSION=7.4 --build-arg XDEBUG_VERSION=3.1.6 && npm run start",
"which-php": "npm run cli -- php --version",
"document:connectors": "php ./local/scripts/generate-connector-docs.php",
"stop": "docker compose down",
Expand Down
Loading