Merge branch 'production' into fix/813

.docker/config/composer.json

@@ -17,6 +17,7 @@
 	"extra": {
 		"installer-paths": {
 			"public_html/wp-content/plugins/{$name}/": ["type:wordpress-plugin"],
+			"public_html/wp-content/mu-plugins/{$name}/": ["type:wordpress-muplugin"],
 			"public_html/wp-content/themes/{$name}/": ["type:wordpress-theme"]
 		}
 	},
@@ -25,6 +26,10 @@
 			"type": "composer",
 			"url": "https://wpackagist.org/"
 		},
+		{
+			"type": "vcs",
+			"url": "https://github.com/WordPress/wporg-mu-plugins.git"
+		},
 		{
 			"type": "package",
 			"package": [
@@ -119,6 +124,7 @@
 		"wpackagist-plugin/wp-cldr": "*",
 		"wpackagist-plugin/wp-super-cache": "*",
 		"wordpress-meta/wporg-profiles-wp-activity-notifier": "1.1",
+		"wporg/wporg-mu-plugins": "dev-build",
 		"wpackagist-theme/p2": "*",
 		"wpackagist-theme/twentyten": "*",
 		"wpackagist-theme/twentyeleven": "*",
@@ -133,5 +139,12 @@
 		"wpackagist-theme/twentytwentyone": "*",
 		"wpackagist-theme/twentytwentytwo": "*",
 		"wpackagist-theme/twentytwentythree": "*"
+	},
+	"scripts": {
+		"post-update-cmd": [
+			"mkdir -p public_html/wp-content/mu-plugins-private/wporg-mu-plugins/pub-sync",
+			"mv public_html/wp-content/mu-plugins/wporg-mu-plugins/mu-plugins/utilities public_html/wp-content/mu-plugins-private/wporg-mu-plugins/pub-sync",
+			"rm -rf public_html/wp-content/mu-plugins/wporg-mu-plugins"
+		]
 	}
 }

.docker/readme.md

@@ -52,16 +52,26 @@ Follow these steps to setup a local WordCamp.org environment using [Docker](http
 
 1. Build and boot the Docker environment.
     ```bash
+	#
+	# **** If you have an Apple Silicon CPU, make the edits below _before_ running these commands ****
+	#
     docker compose build --pull
     docker compose up
 	```
 
-    _Using an Apple ARM64 chip? You may see `failed to solve: rpc error: code = Unknown desc =...` after running either of commands above. Try adding `platform: linux/amd64` to both `wordcamp.test` and `wordcamp.db` in `docker-compose.yaml`. This will instruct Docker to create an image based on the `linux/amd64` architecture instead of `linux/arm64`, i.e._
+    _Using an Apple ARM64 (Silicon) chip? You may see `failed to solve: rpc error: code = Unknown desc =...` or `failed to solve: mysql:5.7-debian: no match for platform in manifest` after running either of commands above. Try adding `platform: linux/amd64` to _both_ `wordcamp.test` and `wordcamp.db` in `docker-compose.yaml`. This will instruct Docker to create an image based on the `linux/amd64` architecture instead of `linux/arm64`, i.e._
     ```
-    build:
-        context: .docker
-        dockerfile: Dockerfile.php-fpm
-    platform: linux/amd64
+	wordcamp.test:
+	  build:
+	    context: .docker
+	    dockerfile: Dockerfile.php-fpm
+	  platform: linux/amd64
+
+	wordcamp.db:
+	  build:
+	    context: .docker
+	    dockerfile: Dockerfile.mysql
+	  platform: linux/amd64
     ```
 
 

.docker/wp-config.php

@@ -43,13 +43,13 @@
 const EVENTS_NETWORK_ID     = 2;
 const EVENTS_ROOT_BLOG_ID   = 47;
 
-switch ( $_SERVER['HTTP_HOST'] ) {
+switch ( strtolower( $_SERVER['HTTP_HOST'] ) ) {
 	case 'events.wordpress.test':
 		define( 'SITE_ID_CURRENT_SITE',  EVENTS_NETWORK_ID );
 		define( 'BLOG_ID_CURRENT_SITE',  EVENTS_ROOT_BLOG_ID );
 		define( 'DOMAIN_CURRENT_SITE',   'events.wordpress.test' );
 		define( 'SUBDOMAIN_INSTALL',     false );
-		define( 'NOBLOGREDIRECT',        'https://events.wordpress.test' );
+		// NOBLOGREDIRECT is intentionally omitted so that the 404 template works.
 		define( 'CLI_HOSTNAME_OVERRIDE', 'events.wordpress.test' );
 		break;
 
@@ -119,9 +119,18 @@
 define( 'EMAIL_CENTRAL_SUPPORT',         '[email protected]' );
 
 $trusted_deputies = array(
-	3, // role-tester.
+	6, // contributorrole.
 );
 
+$wcorg_subroles = array(
+	// contributorrole.
+	6 => array(
+		'wordcamp_wrangler',
+		'meetup_wrangler',
+		'mentor_manager',
+		'report_viewer',
+	),
+);
 
 /*
  * Third party services
@@ -168,6 +177,7 @@
 define( 'WORDCAMP_PAYMENT_STRIPE_PUBLISHABLE_LIVE', '' );
 define( 'WORDCAMP_PAYMENT_STRIPE_SECRET_LIVE',      '' );
 
+define( 'WORDCAMP_PROD_GOOGLE_MAPS_API_KEY', '' );
 define( 'WORDCAMP_DEV_GOOGLE_MAPS_API_KEY', '' );
 
 define( 'MEETUP_API_BASE_URL', 'https://api.meetup.com/' );

.gitignore

@@ -5,6 +5,7 @@
 .docker/database
 .docker/wordcamp*.pem
 .docker/test_suite
+docker-compose.override.yaml
 
 
 #
@@ -108,3 +109,4 @@ public_html/wp-content/themes/twentytwenty
 public_html/wp-content/themes/twentytwentyone
 public_html/wp-content/themes/twentytwentytwo
 public_html/wp-content/themes/twentytwentythree
+public_html/wp-content/themes/wporg-parent-2021

composer.json

@@ -14,20 +14,34 @@
 		"_comment": "Work around `test:watch` timeout, see https://github.com/spatie/phpunit-watcher/issues/63#issuecomment-545633709",
 		"process-timeout": 0,
 		"allow-plugins": {
-			"dealerdirect/phpcodesniffer-composer-installer": true
+			"dealerdirect/phpcodesniffer-composer-installer": true,
+			"composer/installers": true
 		}
 	},
+	"extra": {
+		"installer-paths": {
+			"public_html/wp-content/themes/{$name}": ["wporg/wporg-parent-2021"]
+		}
+	},
+	"repositories": [
+		{
+			"type": "vcs",
+			"url": "[email protected]:WordPress/wporg-parent-2021.git"
+		}
+	],
 	"require": {
-		"adhocore/jwt": "^1.0"
+		"adhocore/jwt": "^1.0",
+		"wporg/wporg-parent-2021": "dev-build"
 	},
 	"require-dev": {
 		"dealerdirect/phpcodesniffer-composer-installer": "^1.0.0",
-		"wp-coding-standards/wpcs": "2.*",
+		"wp-coding-standards/wpcs": "~3.0.0",
 		"phpcompatibility/phpcompatibility-wp": "*",
 		"phpunit/phpunit": "^9",
 		"sirbrillig/phpcs-changed": "2.10.0",
 		"spatie/phpunit-watcher": "^1.23",
-		"yoast/phpunit-polyfills": "^1.0"
+		"yoast/phpunit-polyfills": "^1.0",
+		"composer/installers": "^2.2"
 	},
 	"scripts": {
 		"format": "phpcbf -p",