chore: Bump version to 7.3.1 and update dependencies

tekapo · tekapo · commit f8bd205ebcfc · 2026-02-03T17:51:09.000+09:00
- Updated version numbers in plugin files and package manifests to 7.3.1.
- Enhanced Invalidation_Batch_Service to handle permalink retrieval for drafts and trashed posts more effectively.
- Added a new method `get_invalidation_permalink()` to improve permalink handling for CloudFront invalidation.
- Updated tests to cover new functionality and ensure proper invalidation paths are generated for posts transitioning between statuses.
diff --git a/c3-cloudfront-clear-cache.php b/c3-cloudfront-clear-cache.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * Plugin Name: C3 Cloudfront Cache Controller
- * Version: 7.3.0
+ * Version: 7.3.1
  * Plugin URI:https://github.com/amimoto-ami/c3-cloudfront-clear-cache
  * Description: Manage CloudFront Cache and provide some fixtures.
  * Author: hideokamoto
diff --git a/classes/AWS/Invalidation_Batch_Service.php b/classes/AWS/Invalidation_Batch_Service.php
@@ -62,17 +62,22 @@ function __construct( ...$args ) {
 	 *
 	 * @param \WP_Post $post WP post object.
 	 */
-	public function set_post( $post ) {
-		/**
-		 * To get the trashed post's permalink.
-		 *
-		 * @see https://github.com/amimoto-ami/c3-cloudfront-clear-cache/pull/54/files
-		 */
-		if ( 'trash' === $post->post_status ) {
-			// For trashed post, get the permalink when it was published.
-			$post->post_status = 'publish';
+	public function set_post( \WP_Post $post ) {
+		// Clone and normalize so permalink can be derived without mutating the original.
+		$normalized_post = clone $post;
+		$original_post_name = $normalized_post->post_name;
+
+		if ( 'publish' !== $normalized_post->post_status ) {
+			$normalized_post->post_status = 'publish';
+			if ( preg_match( '/__trashed(-\d+)?$/', (string) $normalized_post->post_name ) ) {
+				$normalized_post->post_name = preg_replace( '/__trashed(-\d+)?$/', '', (string) $normalized_post->post_name );
+			}
+			if ( empty( $normalized_post->post_name ) ) {
+				$normalized_post->post_name = $original_post_name ?: sanitize_title( (string) $normalized_post->post_title );
+			}
 		}
-		$this->post->set_post( $post );
+
+		$this->post->set_post( $normalized_post );
 	}
 
 	/**
@@ -85,7 +90,10 @@ public function put_post_invalidation_batch( Invalidation_Batch $invalidation_ba
 		if ( $post ) {
 			$this->set_post( $post );
 		}
-		$invalidation_batch->put_invalidation_path( $this->post->get_permalink() . '*' );
+		$permalink = $this->post->get_invalidation_permalink();
+		if ( ! is_wp_error( $permalink ) && $permalink ) {
+			$invalidation_batch->put_invalidation_path( $permalink . '*' );
+		}
 		$term_links = $this->post->get_the_post_term_links();
 		foreach ( $term_links as $key => $url ) {
 			$invalidation_batch->put_invalidation_path( $url );
diff --git a/classes/WP/Post.php b/classes/WP/Post.php
@@ -47,6 +47,46 @@ public function get_permalink() {
 		return get_permalink( $this->post );
 	}
 
+	/**
+	 * Get a permalink suitable for CloudFront invalidation.
+	 *
+	 * When a post is not published (e.g. draft), WordPress may return a preview/plain permalink
+	 * like `/?p=123`. In that case the invalidation path becomes `/` and the single permalink
+	 * cache is not cleared. This method attempts to retrieve a "sample" (pretty) permalink.
+	 *
+	 * @return \WP_Error|string|false
+	 */
+	public function get_invalidation_permalink() {
+		if ( ! $this->post ) {
+			return new \WP_Error( 'Post is required' );
+		}
+
+		$post      = $this->post;
+		$permalink = get_permalink( $post );
+
+		// If the permalink looks like a plain/preview URL, try to retrieve a sample (pretty) permalink.
+		if ( is_string( $permalink ) ) {
+			$path = parse_url( $permalink, PHP_URL_PATH );
+			$looks_plain = ( ! $path || '/' === $path || false !== strpos( $permalink, '?p=' ) );
+
+			if ( $looks_plain && function_exists( 'get_post_permalink' ) ) {
+				$sample_permalink = get_post_permalink( $post, false, true );
+				if ( is_string( $sample_permalink ) && '' !== $sample_permalink ) {
+					$permalink = $sample_permalink;
+				}
+			}
+
+			if ( $looks_plain && function_exists( 'get_sample_permalink' ) && isset( $post->ID ) ) {
+				$sample = get_sample_permalink( (int) $post->ID );
+				if ( is_array( $sample ) && isset( $sample[0] ) && is_string( $sample[0] ) && '' !== $sample[0] ) {
+					$permalink = $sample[0];
+				}
+			}
+		}
+
+		return $permalink;
+	}
+
 	/**
 	 * Parse the url
 	 *
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -10,7 +10,7 @@
     }
   },
   "name": "trunk",
-  "version": "7.3.0",
+  "version": "7.3.1",
   "main": "index.js",
   "directories": {
     "test": "tests"
diff --git a/tests/AWS/Invalidation_Batch_Service_Test.php b/tests/AWS/Invalidation_Batch_Service_Test.php
@@ -54,8 +54,8 @@ public function test_overwrite_invalidation_item_by_post_name() {
             }
             return $items;
         }, 10, 2 );
-        
-        // ケース1: 上書きされるべきケース
+
+        // Case 1: Item should be overwritten by filter.
         $post1 = $this->factory->post->create_and_get( array(
             'post_status' => 'publish',
             'post_name' => 'should-overwritten',
@@ -68,8 +68,8 @@ public function test_overwrite_invalidation_item_by_post_name() {
             ),
             'Quantity' => 1
         ], $result[ 'InvalidationBatch' ][ 'Paths' ]);
-        
-        // ケース2: 上書きされないケース
+
+        // Case 2: Item should not be overwritten.
         $post2 = $this->factory->post->create_and_get( array(
             'post_status' => 'publish',
             'post_name' => 'should-not-overwritten',
@@ -101,6 +101,31 @@ public function test_get_the_un_published_post_invalidation_paths() {
         ) , $result[ 'InvalidationBatch' ][ 'Paths' ] );
     }
 
+    public function test_get_the_published_to_draft_post_invalidation_paths() {
+        $post_id = $this->factory->post->create( array(
+            'post_status' => 'publish',
+            'post_name'   => 'published-to-draft',
+            'post_type'   => 'post',
+        ) );
+
+        wp_update_post( array(
+            'ID'          => $post_id,
+            'post_status' => 'draft',
+        ) );
+
+        $post = get_post( $post_id );
+
+        $target = new AWS\Invalidation_Batch_Service();
+        $result = $target->create_batch_by_post( 'localhost', 'EXXX', $post );
+        $this->assertEquals( array(
+            'Items' => array(
+                'localhost',
+                '/published-to-draft/*',
+            ),
+            'Quantity' => 2
+        ), $result[ 'InvalidationBatch' ][ 'Paths' ] );
+    }
+
     public function test_get_invalidation_path_for_all() {
         $target = new AWS\Invalidation_Batch_Service();
         $result = $target->create_batch_for_all( 'EXXXX' );
@@ -113,7 +138,7 @@ public function test_get_invalidation_path_for_all() {
     }
 
     public function test_create_batch_by_posts() {
-        // ケース1: 1つの投稿
+        // Case 1: Single post.
         $post1 = $this->factory->post->create_and_get( array(
             'post_status' => 'publish',
             'post_name' => 'hello-world',
@@ -128,8 +153,8 @@ public function test_create_batch_by_posts() {
             ],
             "Quantity" => 2
         ], $result[ 'InvalidationBatch' ][ 'Paths' ]);
-        
-        // ケース2: 複数の投稿
+
+        // Case 2: Multiple posts.
         $post2 = $this->factory->post->create_and_get( array(
             'post_status' => 'publish',
             'post_name' => 'see-you',
@@ -138,7 +163,7 @@ public function test_create_batch_by_posts() {
             'post_status' => 'trash',
             'post_name' => 'good-bye',
         ) );
-        
+
         $result = $target->create_batch_by_posts( 'localhost', 'EXXXX', [$post2, $post3] );
         $this->assertEquals([
             "Items" => [
@@ -152,17 +177,17 @@ public function test_create_batch_by_posts() {
 
     /**
      * Test Case: c3_invalidation_post_batch_home_path filter hook functionality
-     * 
+     *
      * Overview:
      * This test verifies that the c3_invalidation_post_batch_home_path filter hook
      * correctly allows customization of the home path during single post invalidation.
-     * 
+     *
      * Expected Behavior:
      * - The filter should receive the original home path and post object as parameters
      * - When the post slug matches 'custom-home', the filter should return '/custom-homepage/'
      * - The invalidation batch should contain both the custom home path and the post-specific path
      * - Other posts should not be affected by this filter condition
-     * 
+     *
      * Test Method:
      * 1. Register a filter that modifies home path for posts with slug 'custom-home'
      * 2. Create a test post with the matching slug 'custom-home'
@@ -197,17 +222,17 @@ public function test_c3_invalidation_post_batch_home_path_filter() {
 
     /**
      * Test Case: c3_invalidation_posts_batch_home_path filter hook functionality
-     * 
+     *
      * Overview:
      * This test verifies that the c3_invalidation_posts_batch_home_path filter hook
      * correctly allows customization of the home path during multiple posts invalidation.
-     * 
+     *
      * Expected Behavior:
      * - The filter should receive the original home path and array of post objects as parameters
      * - When more than 1 post is being processed, the filter should return '/bulk-update-homepage/'
      * - The invalidation batch should contain the custom home path plus individual post paths
      * - Single post batches should not trigger this filter condition
-     * 
+     *
      * Test Method:
      * 1. Register a filter that modifies home path when processing multiple posts (count > 1)
      * 2. Create two test posts with different slugs ('post-one' and 'post-two')
@@ -247,17 +272,17 @@ public function test_c3_invalidation_posts_batch_home_path_filter() {
 
     /**
      * Test Case: c3_invalidation_manual_batch_all_path filter hook functionality
-     * 
+     *
      * Overview:
      * This test verifies that the c3_invalidation_manual_batch_all_path filter hook
      * correctly allows customization of the path pattern used for manual "clear all cache" operations.
-     * 
+     *
      * Expected Behavior:
      * - The filter should receive the default all-clear path pattern ('/*') as a parameter
      * - The filter should be able to return a custom path pattern for clearing all cache
      * - The invalidation batch should contain only the custom path pattern
      * - This provides more granular control over manual cache clearing operations
-     * 
+     *
      * Test Method:
      * 1. Register a filter that replaces the default '/*' pattern with '/custom-all-path/*'
      * 2. Call create_batch_for_all() method to trigger manual all-cache clearing
@@ -283,18 +308,18 @@ public function test_c3_invalidation_manual_batch_all_path_filter() {
 
     /**
      * Test Case: WordPress subdirectory installation support
-     * 
+     *
      * Overview:
      * This test verifies that the new path adjustment hooks correctly handle WordPress
      * installations in subdirectories by automatically including subdirectory paths
      * in invalidation requests through WordPress's standard home_url() function.
-     * 
+     *
      * Expected Behavior:
      * - When WordPress is installed in a subdirectory (e.g., /blog/), home_url() should return the subdirectory path
      * - The c3_invalidation_post_batch_home_path filter should receive the subdirectory path automatically
      * - Invalidation batches should include both the subdirectory home path and post-specific paths
      * - The plugin should work seamlessly without manual configuration for subdirectory installations
-     * 
+     *
      * Test Method:
      * 1. Mock WordPress home_url() to simulate a subdirectory installation (/blog/)
      * 2. Register a filter to verify the subdirectory path is correctly passed to the hook
@@ -335,17 +360,17 @@ public function test_subdirectory_installation_support() {
 
     /**
      * Test Case: Subdirectory-specific path customization
-     * 
+     *
      * Overview:
      * This test verifies that developers can customize invalidation paths specifically
      * for subdirectory installations using the new hooks, allowing for environment-specific
      * or subdirectory-specific cache invalidation strategies.
-     * 
+     *
      * Expected Behavior:
      * - Developers should be able to detect subdirectory installations in their filters
      * - Custom paths can be returned that are specific to the subdirectory environment
      * - The hooks should work correctly with both subdirectory and root installations
-     * 
+     *
      * Test Method:
      * 1. Create a filter that detects subdirectory installations and returns custom paths
      * 2. Test with both subdirectory and root installation scenarios

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@`
`10`	`10`	`}`
`11`	`11`	`},`
`12`	`12`	`"name": "trunk",`
`13`		`- "version": "7.3.0",`
	`13`	`+ "version": "7.3.1",`
`14`	`14`	`"main": "index.js",`
`15`	`15`	`"directories": {`
`16`	`16`	`"test": "tests"`