Merge branch 'master' into issue/161

Author: JJJ

.github/workflows/phpunit-ci.yml

@@ -18,6 +18,36 @@ jobs:
         # Based on WordPress version requirements and PHP compatibility
         # Note: WordPress officially only supports PHPUnit up to 7.x
         include:
+          # WordPress trunk (development) - PHP 7.2+
+          - wordpress: "trunk"
+            php: "8.3"
+            phpunit: "9"
+            wp-version: "trunk"
+
+          # WordPress 6.9 - PHP 7.2+
+          - wordpress: "6.9"
+            php: "8.3"
+            phpunit: "9"
+            wp-version: "6.9"
+          - wordpress: "6.9"
+            php: "8.2"
+            phpunit: "9"
+            wp-version: "6.9"
+
+          # WordPress 6.8 - PHP 7.2+
+          - wordpress: "6.8"
+            php: "8.3"
+            phpunit: "9"
+            wp-version: "6.8"
+          - wordpress: "6.8"
+            php: "8.2"
+            phpunit: "9"
+            wp-version: "6.8"
+          - wordpress: "6.8"
+            php: "8.1"
+            phpunit: "9"
+            wp-version: "6.8"
+
           # WordPress 6.7+ (latest) - PHP 7.2+
           - wordpress: "latest"
             php: "8.3"

TESTING.md

@@ -15,26 +15,41 @@ The testing matrix is designed to validate the plugin against various combinatio
 ### PHPUnit Version Requirements
 
 | PHPUnit Version | PHP Requirement | WordPress Compatibility | Configuration File |
-|----------------|-----------------|------------------------|-------------------|
-| PHPUnit 9.x    | PHP 7.3+        | All versions           | phpunit.xml.dist  |
-| PHPUnit 8.x    | PHP 7.2+        | All versions           | phpunit.xml.legacy |
-| PHPUnit 7.x    | PHP 7.1+        | WP 4.9 - 6.x          | phpunit.xml.legacy |
+|-----------------|-----------------|-------------------------|--------------------|
+| PHPUnit 9.x     | PHP 7.3+        | All versions            | phpunit.xml.dist   |
+| PHPUnit 8.x     | PHP 7.2+        | All versions            | phpunit.xml.legacy |
+| PHPUnit 7.x     | PHP 7.1+        | WP 4.9 - 6.x            | phpunit.xml.legacy |
 
 ### WordPress Version Requirements
 
 | WordPress Version | Minimum PHP | Recommended PHP |
-|------------------|-------------|-----------------|
-| 6.7 (latest)     | 7.2.24      | 8.0+           |
-| 6.4 - 6.6        | 7.2.24      | 8.0+           |
-| 6.0 - 6.3        | 7.2.24      | 7.4+           |
-| 5.9              | 7.2.24      | 7.4+           |
-| 5.5 - 5.8        | 7.2.0       | 7.4+           |
+|-------------------|-------------|-----------------|
+| trunk             | 7.2.24      | 8.0+            |
+| 6.4 - 6.9         | 7.2.24      | 8.0+            |
+| 6.0 - 6.3         | 7.2.24      | 7.4+            |
+| 5.9               | 7.2.24      | 7.4+            |
+| 5.5 - 5.8         | 7.2.0       | 7.4+            |
 
 ## Test Matrix Configuration
 
 The GitHub Actions workflow (`.github/workflows/phpunit-ci.yml`) runs tests across the following combinations:
 
-### Latest WordPress (6.7+)
+### WordPress trunk (development)
+
+- PHP 8.3 + PHPUnit 9
+
+### WordPress 6.9
+
+- PHP 8.3 + PHPUnit 9
+- PHP 8.2 + PHPUnit 9
+
+### WordPress 6.8
+
+- PHP 8.3 + PHPUnit 9
+- PHP 8.2 + PHPUnit 9
+- PHP 8.1 + PHPUnit 9
+
+### Latest WordPress (6.7)
 
 - PHP 8.3 + PHPUnit 9
 - PHP 8.2 + PHPUnit 9
@@ -111,6 +126,54 @@ bash bin/install-wp-tests.sh wordpress_test wp wp localhost $WP_VERSION
 ./vendor/bin/phpunit
 ```
 
+### Running Specific Test Groups
+
+Tests are organized using PHPUnit groups for easy filtering:
+
+**Run all upload path tests:**
+
+```bash
+./vendor/bin/phpunit --group=upload
+```
+
+**Run tests by ticket number:**
+
+```bash
+./vendor/bin/phpunit --group=136
+```
+
+**Run specific test groups:**
+
+```bash
+# Files rewriting tests
+./vendor/bin/phpunit --group=files-rewriting
+
+# Multisite configuration tests
+./vendor/bin/phpunit --group=multisite
+
+# Subdirectory installation tests
+./vendor/bin/phpunit --group=subdirectory
+```
+
+**Run a single test class:**
+
+```bash
+./vendor/bin/phpunit tests/integration/tests/test-upload-paths.php
+```
+
+**Run a specific test method:**
+
+```bash
+./vendor/bin/phpunit --filter test_upload_path_without_duplication
+```
+
+**Verbose and debug output:**
+
+```bash
+./vendor/bin/phpunit --group=upload --verbose
+./vendor/bin/phpunit --group=upload --debug
+```
+
 ### Testing with Docker
 
 You can test different PHP versions using Docker:

tests/integration/tests/test-networkoperations.php

@@ -65,4 +65,28 @@ public function test_switch_to_network() {
 
 		$this->assertEquals( 1, $current_site->id, 'Switching back should switch the network' );
 	}
+
+	public function test_update_network_clears_cache() {
+		// Create a test network.
+		$network_id = $this->factory->network->create(
+			array(
+				'domain' => 'example.com',
+				'path'   => '/test/',
+			)
+		);
+
+		// Get the network to populate cache.
+		$network = get_network( $network_id );
+		$this->assertEquals( 'example.com', $network->domain, 'Network should have original domain' );
+		$this->assertEquals( '/test/', $network->path, 'Network should have original path' );
+
+		// Update the network with new domain and path.
+		$result = update_network( $network_id, 'newdomain.com', '/newpath/' );
+		$this->assertTrue( $result, 'Network update should succeed' );
+
+		// Get the network again - it should reflect the updated values.
+		$updated_network = get_network( $network_id );
+		$this->assertEquals( 'newdomain.com', $updated_network->domain, 'Network should have updated domain without manual cache flush' );
+		$this->assertEquals( '/newpath/', $updated_network->path, 'Network should have updated path without manual cache flush' );
+	}
 }