Merge branch 'main' into chore/assets-update-workflow

Signed-off-by: Dennis Ploetner <[email protected]>

Author: lloc

.github/workflows/code-style.yml

@@ -9,4 +9,4 @@ jobs:
       - name: Composer dependencies
         run: composer install
       - name: Run Testsuite
-        run: composer run-script cs
+        run: composer run-script phpcs

.github/workflows/plugin-check.yml

@@ -17,4 +17,5 @@ jobs:
       - name: Run plugin check
         uses: wordpress/plugin-check-action@v1
         with:
-          build-dir: './multisyde'
+          build-dir: './multisyde'
+          exclude-files: 'modules/**/patches/*.php'

.github/workflows/unit-tests.yml

@@ -2,11 +2,21 @@ name: Unit Tests
 on: [push]
 jobs:
   unit-tests:
+    name: Unit Tests (PHP ${{ matrix.php-version }})
     runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        php-version: ['7.4', '8.3', '8.4']
     steps:
       - name: Checkout
         uses: actions/checkout@v4
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.php-version }}
+          tools: composer
+          coverage: none
       - name: Composer dependencies
-        run: composer install
+        run: composer install --no-interaction --no-progress --prefer-dist
       - name: PHPUnit Tests
         run: vendor/bin/phpunit

.phpcs.xml.dist

@@ -2,6 +2,7 @@
 <ruleset name="CS">
     <description>PHPCS example</description>
     <config name="testVersion" value="7.4-"/>
+    <exclude-pattern>node_modules/*</exclude-pattern>
     <exclude-pattern>vendor/*</exclude-pattern>
 
     <arg value="ps"/>
@@ -10,10 +11,15 @@
     <arg name="extensions" value="php"/>
     <arg name="cache" value=".phpcs.cache"/>
 
+	<rule ref="PHPCompatibilityWP" />
+
     <rule ref="WordPress">
         <!-- PSR4 -->
         <exclude name="WordPress.Files.FileName" />
     </rule>
     <rule ref="WordPress-Extra"/>
     <rule ref="WordPress-Docs"/>
+
+    <exclude-pattern>*/node_modules/*</exclude-pattern>
+    <exclude-pattern>*/vendor/*</exclude-pattern>
 </ruleset>

composer.json

@@ -35,29 +35,30 @@
     "config": {
         "allow-plugins": {
             "dealerdirect/phpcodesniffer-composer-installer": true,
-            "phpstan/extension-installer": true
+            "phpstan/extension-installer": true,
+            "lloc/composer-i18n-scripts": true
         }
     },
     "require-dev": {
         "wp-coding-standards/wpcs": "^3.0",
         "szepeviktor/phpstan-wordpress": "^2.0",
         "phpstan/extension-installer": "^1.4",
-        "yoast/phpunit-polyfills": "^3.1",
         "phpunit/phpunit": "^9.6",
         "brain/monkey": "^2.0@dev",
-        "phpstan/phpstan-mockery": "^2.0"
+        "phpstan/phpstan-mockery": "^2.0",
+        "lloc/composer-i18n-scripts": "^1.0",
+        "phpcompatibility/phpcompatibility-wp": "^2.1"
     },
     "scripts": {
         "tests": "./vendor/bin/phpunit -c ./phpunit.xml.dist",
         "tests:coverage": "XDEBUG_MODE=coverage ./vendor/bin/phpunit -c ./phpunit.xml.dist --coverage-html ./tests/coverage",
-        "cs": "./vendor/bin/phpcs .",
-        "cs:fix": "./vendor/bin/phpcbf .",
+        "phpcs": "vendor/bin/phpcs .",
+        "phpcbf": "./vendor/bin/phpcbf .",
         "phpstan": "./vendor/bin/phpstan analyse --memory-limit=1G",
         "qa": [
             "@cs",
             "@phpstan"
         ],
-        "i18n:pot": "wp i18n make-pot . languages/multisyde.pot",
         "git-release": "bin/git-release.sh",
         "build": [
             "@composer install --no-dev",

modules/GetSiteBy/patches/40180.php

@@ -53,7 +53,7 @@ function get_site_by( $field, $value, $network_id = null ) {
 				}
 				break;
 			case 'url':
-				if ( 0 !== strpos( $value, 'http://' ) && 0 !== strpos( $value, 'https://' ) ) {
+				if ( ! str_starts_with( $value, 'http://' ) && ! str_starts_with( $value, 'https://' ) ) {
 					$value = 'http://' . $value;
 				}
 
@@ -90,7 +90,7 @@ function get_site_by( $field, $value, $network_id = null ) {
 
 	$args['number'] = 1;
 
-	if ( isset( $args['domain'] ) && substr( $args['domain'], 0, 4 ) === 'www.' ) {
+	if ( isset( $args['domain'] ) && str_starts_with( $args['domain'], 'www.' ) ) {
 		$bare = substr( $args['domain'], 4 );
 
 		$args['domain__in'] = array( $bare, $args['domain'] );

modules/README.md

@@ -14,5 +14,6 @@ This plugin provides various improvements for WordPress multisite installations.
 | [Introduce `get_site_by()` function for multisite](./GetSiteBy/README.md) | Provides a utility function to retrieve a site object from the multisite network using a specific field such as ID, slug, domain, path, or full URL. This makes it easier to locate subsites without relying on raw SQL or manual loops. | [#40180](https://core.trac.wordpress.org/ticket/40180) |
 | [Last User login](./LastUserLogin/README.md)                              | This module enhances the Network Admin Users screen in WordPress Multisite by adding a “Last Login” column. It automatically records the timestamp each time a user logs in and displays it in a readable, timezone-aware format.        | [#11](https://github.com/inpsyde/multisyde/issues/11)  |
 | [Site Active Theme](./SiteActiveTheme/README.md)                          | Displays the active theme (and its version) for each site in the Network Admin > Sites dashboard. This makes it easy for network administrators to quickly audit which themes are used across the network.                               | [#56458](https://core.trac.wordpress.org/ticket/56458) |
+| [Permalink Cleanup](./PermalinkCleanup/README.md)                         | Automatically removes the `/blog` prefix from the main site's permalink structure in multisite installations to deliver cleaner primary site URLs.                                                                                    | [#24](https://github.com/inpsyde/multisyde/issues/24)  |
 
 _Made with ❤️ by [Syde](https://syde.com)._

modules/SiteActivePlugins/Feature.php

@@ -18,6 +18,7 @@ final class Feature implements LoadableFeature {
 	const NOTICE_DEACTIVATION = 'bulk_deactivated';
 
 	const DEFAULT_MAX_SITES = 100;
+	const FILTER_MAX_SITES  = 'multisyde_site_active_plugins_max_sites';
 
 	/**
 	 * The active plugins in the sites in the network.
@@ -161,7 +162,7 @@ public function populate_active_plugins(): void {
 		 *
 		 * @param int $max_sites The maximum number of sites to show for each plugin.
 		 */
-		$max_sites = apply_filters( 'site_active_plugins_max_sites', self::DEFAULT_MAX_SITES );
+		$max_sites = apply_filters( self::FILTER_MAX_SITES, self::DEFAULT_MAX_SITES );
 		$site_ids  = get_sites(
 			array(
 				'fields' => 'ids',

modules/SiteActivePlugins/tests/unit/TestFeature.php

@@ -202,7 +202,7 @@ public function test_populate_active_plugins_network_active(): void {
 	public function test_populate_active_plugins_max_sites(): void {
 		$max_sites = 5;
 
-		Filters\expectApplied( 'site_active_plugins_max_sites' )->once()->with( 100 )->andReturn( $max_sites );
+		Filters\expectApplied( Feature::FILTER_MAX_SITES )->once()->with( 100 )->andReturn( $max_sites );
 
 		$args = array(
 			'fields' => 'ids',

multisyde.php

@@ -3,7 +3,7 @@
  * Plugin Name:       MultiSyde
  * Plugin URI:        https://github.com/inpsyde/multisyde
  * Description:       A WordPress plugin that explores potential improvements for WordPress Multisite.
- * Version:           1.1.1
+ * Version:           1.2.0
  * Requires at least: 6.8
  * Requires PHP:      7.4
  * Author:            Syde