Merge branch 'master' of https://github.com/roots/bedrock

.github/workflows/integration.yml

@@ -0,0 +1,25 @@
+name: Integration
+
+on: [push, pull_request, workflow_dispatch]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+      with:
+        repository: roots/bedrock-docker
+        ref: main
+        path: bedrock-docker
+    - uses: actions/checkout@v2
+      with:
+        path: bedrock-docker/bedrock
+    - name: Build and run
+      run: docker compose up --build -d
+      working-directory: bedrock-docker
+    - name: Wait for install
+      run: sleep 30
+      working-directory: bedrock-docker
+    - name: Verify install
+      run: curl -s http://127.0.0.1 | grep "<title>bedrock"
+      working-directory: bedrock-docker

composer.json

@@ -37,7 +37,7 @@
     "oscarotero/env": "^2.1",
     "roots/bedrock-autoloader": "^1.0",
     "roots/bedrock-disallow-indexing": "^2.0",
-    "roots/wordpress": "6.2",
+    "roots/wordpress": "6.2.2",
     "roots/wp-config": "1.0.0",
     "roots/wp-password-bcrypt": "1.1.0",
     "wpackagist-theme/twentytwentythree": "^1.0"
@@ -65,9 +65,6 @@
     "wordpress-install-dir": "web/wp"
   },
   "scripts": {
-    "post-root-package-install": [
-      "php -r \"copy('.env.example', '.env');\""
-    ],
     "test": [
       "phpcs"
     ]

config/application.php

@@ -53,7 +53,7 @@
 /**
  * Infer WP_ENVIRONMENT_TYPE based on WP_ENV
  */
-if (!env('WP_ENVIRONMENT_TYPE') && in_array(WP_ENV, ['production', 'staging', 'development'])) {
+if (!env('WP_ENVIRONMENT_TYPE') && in_array(WP_ENV, ['production', 'staging', 'development', 'local'])) {
     Config::define('WP_ENVIRONMENT_TYPE', WP_ENV);
 }