Upgrade Bedrock + PHP 8.5, sync with main, modernise theme

.devcontainer/.env.example

@@ -0,0 +1,19 @@
+DB_NAME=wordpress
+DB_USER=wordpress
+DB_PASSWORD=password
+DB_HOST=database
+DB_PREFIX=wp_
+
+WP_ENV=development
+WP_HOME=http://localhost:8080
+WP_SITEURL=${WP_HOME}/wp
+
+# Generate your keys here: https://roots.io/salts.html
+AUTH_KEY='generateme'
+SECURE_AUTH_KEY='generateme'
+LOGGED_IN_KEY='generateme'
+NONCE_KEY='generateme'
+AUTH_SALT='generateme'
+SECURE_AUTH_SALT='generateme'
+LOGGED_IN_SALT='generateme'
+NONCE_SALT='generateme'

.devcontainer/.gitignore

@@ -0,0 +1,2 @@
+docker-compose.override.yml
+.env

.devcontainer/Dockerfile

@@ -0,0 +1,19 @@
+FROM php:8.3-fpm
+
+RUN apt-get update && apt-get install -y \
+    mariadb-client \
+    zip \
+    unzip \
+  && docker-php-ext-install -j$(nproc) \
+    mysqli \
+    pdo_mysql \
+  && apt-get clean \
+  && rm -rf /var/lib/apt/lists/*
+
+RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer
+
+RUN curl -O https://raw.githubusercontent.com/wp-cli/builds/gh-pages/phar/wp-cli.phar \
+  && chmod +x wp-cli.phar \
+  && mv wp-cli.phar /usr/local/bin/wp
+
+WORKDIR /roots/app

.devcontainer/config/nginx.conf

@@ -0,0 +1,15 @@
+server {
+  listen 80;
+  root /roots/app/web;
+  index index.php;
+
+  location / {
+    try_files $uri $uri/ /index.php$is_args$args;
+  }
+
+  location ~ \.php$ {
+    fastcgi_pass app:9000;
+    fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
+    include fastcgi_params;
+  }
+}

.devcontainer/config/php.ini

@@ -0,0 +1,7 @@
+memory_limit = 256M
+max_execution_time = 120
+upload_max_filesize = 64M
+post_max_size = 64M
+error_reporting = E_ALL
+display_errors = Off
+log_errors = On

.devcontainer/devcontainer.json

@@ -0,0 +1,11 @@
+{
+  "name": "Bedrock Development",
+  "dockerComposeFile": ["docker-compose.yml"],
+  "service": "app",
+  "workspaceFolder": "/roots/app",
+  "forwardPorts": [8080],
+  "remoteEnv": {
+    "WP_ENV": "development"
+  },
+  "postCreateCommand": "cp -n /roots/app/.devcontainer/.env.example /roots/app/.env"
+}

.devcontainer/docker-compose.yml

@@ -0,0 +1,45 @@
+services:
+  app:
+    build:
+      context: .
+      dockerfile: Dockerfile
+    volumes:
+      - ..:/roots/app
+      - ./config/php.ini:/usr/local/etc/php/conf.d/bedrock.ini
+    networks:
+      - bedrock
+    depends_on:
+      database:
+        condition: service_healthy
+    environment:
+      WP_CLI_ALLOW_ROOT: 1
+
+  web:
+    image: nginx:alpine
+    ports:
+      - '8080:80'
+    volumes:
+      - ..:/roots/app:ro
+      - ./config/nginx.conf:/etc/nginx/conf.d/default.conf:ro
+    depends_on:
+      - app
+    networks:
+      - bedrock
+
+  database:
+    image: mariadb:12
+    environment:
+      MYSQL_DATABASE: wordpress
+      MYSQL_USER: wordpress
+      MYSQL_PASSWORD: password
+      MYSQL_ROOT_PASSWORD: password
+    networks:
+      - bedrock
+    healthcheck:
+      test: ["CMD", "healthcheck.sh", "--connect", "--innodb_initialized"]
+      timeout: 20s
+      retries: 10
+
+networks:
+  bedrock:
+    driver: bridge

.editorconfig

@@ -0,0 +1,15 @@
+root = true
+
+[*]
+indent_style = space
+indent_size = 2
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+
+[*.php]
+indent_size = 4
+
+[*.md]
+trim_trailing_whitespace = false

.gitattributes

@@ -0,0 +1,4 @@
+/.editorconfig export-ignore
+/.devcontainer export-ignore
+/.gitattributes export-ignore
+/.github export-ignore

.github/renovate.json

@@ -0,0 +1,30 @@
+{
+  "baseBranchPatterns": [
+    "main"
+  ],
+  "commitMessageAction": "⬆️ Bump",
+  "commitMessageTopic": "{{depName}}",
+  "extends": [
+    "config:recommended",
+    "schedule:weekly",
+    ":semanticCommitsDisabled"
+  ],
+  "ignoreDeps": ["php"],
+  "ignorePaths": ["Dockerfile"],
+  "packageRules": [
+    {
+      "groupName": "GitHub Actions",
+      "matchManagers": ["github-actions"]
+    },
+    {
+      "groupName": "roots/wordpress",
+      "schedule": [
+        "at any time"
+      ],
+      "matchPackageNames": [
+        "roots/wordpress{/,}**"
+      ]
+    }
+  ],
+  "timezone": "America/Chicago"
+}

.github/workflows/ci.yml

@@ -0,0 +1,42 @@
+name: CI
+
+on: [push, pull_request]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        # Pinned to the PHP version in the Dockerfile (php:8.5.7-fpm-alpine) so CI,
+        # local dev and production all target the same runtime.
+        php-version: ['8.5']
+
+    steps:
+    - uses: actions/checkout@v6
+
+    - name: Setup PHP
+      uses: shivammathur/setup-php@v2
+      with:
+        php-version: ${{ matrix.php-version }}
+
+    - name: Cache Composer dependencies
+      id: composer-cache
+      run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
+
+    - uses: actions/cache@v5
+      with:
+        path: ${{ steps.composer-cache.outputs.dir }}
+        key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
+        restore-keys: ${{ runner.os }}-composer-
+
+    - name: Check Composer lock file is up to date
+      run: composer validate --no-check-all
+
+    - name: Install Composer dependencies
+      run: composer install --no-progress --prefer-dist --optimize-autoloader
+
+    - name: Run Pint
+      run: composer lint
+
+    - name: Run tests
+      run: composer test

.github/workflows/push.yml

@@ -5,10 +5,12 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Install Composer dependencies
         uses: php-actions/composer@v6
+        with:
+          php_version: "8.5"
 
       - name: Build the stack
         run: docker compose up -d

.github/workflows/theme.yml

@@ -0,0 +1,25 @@
+name: Theme build
+
+on: [push, pull_request]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    defaults:
+      run:
+        working-directory: web/app/themes/wordpress-starter-template
+    steps:
+      - uses: actions/checkout@v5
+
+      - name: Setup Node
+        uses: actions/setup-node@v4
+        with:
+          node-version-file: web/app/themes/wordpress-starter-template/.nvmrc
+          cache: npm
+          cache-dependency-path: web/app/themes/wordpress-starter-template/package-lock.json
+
+      - name: Install dependencies
+        run: npm ci
+
+      - name: Build theme assets
+        run: npm run build

.gitignore

@@ -1,12 +1,17 @@
 # Application
 web/app/plugins/*
 !web/app/plugins/.gitkeep
+# Ignore Composer-installed mu-plugin directories; single-file mu-plugins are tracked intentionally
 web/app/mu-plugins/*/
+web/app/themes/twentytwentyfive/
 web/app/upgrade
 web/app/uploads/*
 !web/app/uploads/.gitkeep
 web/app/cache/*
 
+# Theme build output (generated by webpack)
+web/app/themes/*/build/
+
 # WordPress
 web/wp
 web/.htaccess
@@ -22,6 +27,12 @@ web/.htaccess
 # Composer
 /vendor
 /web/app/vendor
+auth.json
+
+# PHPUnit/Pest
+phpunit.xml
+.phpunit.result.cache
+.phpunit.cache
 
 # WP-CLI
 wp-cli.local.yml
@@ -32,4 +43,4 @@ docker/mysql/data/*
 # Mac OS X
 .DS_Store
 
-node_modules
+node_modules

CHANGELOG.md

@@ -1,3 +1,11 @@
+### Bedrock upstream sync: 2026-06-09
+* Realign with Roots Bedrock `master`: PHP `>=8.5`, `roots/wordpress` 7.0 (WordPress 6.9.x)
+* Migrate package sourcing from WPackagist to wp-packages.org (`wp-plugin/*`, `wp-theme/*`)
+* Replace phpcs + git pre-commit hook with `laravel/pint` + `pestphp/pest`; add `tests/`, `phpunit.xml.dist`, `pint.json`, `.devcontainer/`, `.gitattributes`, CI workflow
+* Bump Docker image to `php:8.3-fpm-alpine`
+* Adopt upstream `config/application.php` (env flags, `WP_ENVIRONMENT_TYPE`, `WP_DEVELOPMENT_MODE`, `DB_SSL`, `CONCATENATE_SCRIPTS`), retaining CK tweaks (`error_reporting`, `DISALLOW_FILE_EDIT`)
+* Drop `roots/wp-password-bcrypt` (redundant on WP 6.8+)
+
 ### 1.19.2: 2022-03-11
 * Bump roots/wordpress to 5.9.2 ([#631](https://github.com/roots/bedrock/pull/631))
 

Dockerfile

@@ -1,4 +1,4 @@
-FROM php:8.3.12-fpm-alpine
+FROM php:8.5.7-fpm-alpine
 
 ENV PATH "$PATH:/var/www/html/vendor/bin"
 

README.md

@@ -69,7 +69,7 @@ Note WP-CLI will not work on the host machine, as WordPress configuration refers
 
 ### Adding WordPress Plugins
 
-Run `docker compose run composer require wpackagist-plugin/plugin-name`.
+Run `docker compose run composer require wp-plugin/plugin-name`.
 
 ### Further Documentation