All: Remove remnants of WP-MU ("multi-site") configuration

Ref jquery/infrastructure-puppet#6 Ref jquery/infrastructure-puppet#29 (comment)
jquery · Oct 19, 2023 · 6f3a8fe · 6f3a8fe
1 parent e3abcec
commit 6f3a8fe
Show file tree

Hide file tree

Showing 11 changed files with 7 additions and 455 deletions.
diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
@@ -11,7 +11,6 @@ jobs:
       fail-fast: false
       matrix:
         php-version:
-          - "5.4"
           - "7.4"
           - "8.0"
           - "8.1"

diff --git a/INSTALL.md b/INSTALL.md
diff --git a/composer.json b/composer.json
@@ -1,6 +1,6 @@
 {
 	"require": {
-        "php": ">= 5.4"
+        "php": ">= 7.4"
 	},
 	"require-dev": {
 		"php-parallel-lint/php-parallel-lint": "1.3.2"

diff --git a/config.php b/config.php
diff --git a/install.php b/install.php
diff --git a/mu-plugins/_loader.php b/mu-plugins/_loader.php
@@ -1,6 +1,6 @@
 <?php
 
-// Plugins enabled everywhere for local dev (jquery-wp-docker) and old WP-MU servers.
+// Plugins enabled everywhere for local dev (jquery-wp-docker)
 //
 // For production, plugin enablement is managed via Puppet:
 // https://github.com/jquery/infrastructure-puppet/blob/staging/modules/profile/manifests/wordpress/docs.pp

diff --git a/package.json b/package.json
diff --git a/plugins/jquery-filters.php b/plugins/jquery-filters.php
@@ -18,8 +18,11 @@
 		// Don't mess with themes for now.
 		continue;
 	}
-	if ( $option === 'active_plugins' && !is_multisite() ) {
-		// For standalone sites, let Puppet manage plugins.
+	if ( $option === 'active_plugins' ) {
+		// Deprecated
+		// In production, Puppet manages activation of per-site plugins.
+		// Locally, global plugins are enabled via mu-plugins/_loader.php,
+		// and per-site plugins are activated by the imported database.
 		continue;
 	}
 	add_filter( 'pre_option_' . $option, function () use ( $value ) {
-Original file line number
+Diff line change
@@ Expand Up / @@ -11,7 +11,6 @@ jobs: @@
           fail-fast: false
           matrix:
             php-version:
-              - "5.4"
               - "7.4"
               - "8.0"
               - "8.1"
@@ Expand Down @@