Bump Min WP Version to 6.4 (#1287)

* Bump Min WP Version to 6.4

* Add changelog

* Remove unneeded fallback

get_self_link() was introduced in 5.3.

* update changelog

* remove extra layer

* Add missing phpdoc

* Keep Tag Processor check for a while longer

---------

Co-authored-by: Matthias Pfefferle <[email protected]>

Author: obenland

.github/workflows/phpunit.yml

@@ -20,7 +20,7 @@ jobs:
         php-versions: ['7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3', '8.4']
         include:
           - wp-version: latest
-          - wp-version: '5.9'
+          - wp-version: '6.4'
             php-versions: '7.2'
     steps:
       - name: Install svn

CHANGELOG.md

@@ -35,6 +35,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 * Outbox now precesses the first batch of followers right away to avoid delays in processing new Activities.
 * Post bulk edits no longer create Outbox items, unless author or post status change.
+* Bumped minimum required WordPress version to 6.4.
 * Properly process `Update` activities on profiles and ensure all properties of a followed person are updated accordingly.
 * Outbox processing accounts for shared inboxes again.
 * Improved check for `?activitypub` query-var.

includes/compat.php

@@ -25,25 +25,6 @@ function str_starts_with( $haystack, $needle ) {
 	}
 }
 
-if ( ! function_exists( 'get_self_link' ) ) {
-	/**
-	 * Returns the link for the currently displayed feed.
-	 *
-	 * @return string Correct link for the atom:self element.
-	 */
-	function get_self_link() {
-		$host = wp_parse_url( home_url() );
-		$path = isset( $_SERVER['REQUEST_URI'] ) ? sanitize_text_field( wp_unslash( $_SERVER['REQUEST_URI'] ) ) : '';
-
-		/**
-		 * Filters the self link.
-		 *
-		 * @param string $link The self link.
-		 */
-		return esc_url( apply_filters( 'self_link', set_url_scheme( 'http://' . $host['host'] . $path ) ) );
-	}
-}
-
 if ( ! function_exists( 'is_countable' ) ) {
 	/**
 	 * Polyfill for `is_countable()` function added in PHP 7.3.

includes/functions.php

@@ -471,17 +471,6 @@ function is_single_user() {
  * @return boolean True if the site supports the block editor, false otherwise.
  */
 function site_supports_blocks() {
-	if ( \version_compare( \get_bloginfo( 'version' ), '5.9', '<' ) ) {
-		return false;
-	}
-
-	if (
-		! \function_exists( 'register_block_type_from_metadata' ) ||
-		! \function_exists( 'do_blocks' )
-	) {
-		return false;
-	}
-
 	/**
 	 * Allow plugins to disable block editor support,
 	 * thus disabling blocks registered by the ActivityPub plugin.

includes/transformer/class-post.php

@@ -315,7 +315,7 @@ protected function get_attachment() {
 		if ( site_supports_blocks() && \has_blocks( $this->item->post_content ) ) {
 			$media = $this->get_block_attachments( $media, $max_media );
 		} else {
-			$media = $this->get_classic_editor_images( $media, $max_media );
+			$media = $this->get_classic_editor_image_embeds( $media, $max_media );
 		}
 
 		$media      = $this->filter_media_by_object_type( $media, \get_post_format( $this->item ), $this->item );
@@ -785,47 +785,22 @@ function ( $id ) {
 	}
 
 	/**
-	 * Get post images from the classic editor.
-	 * Note that audio/video attachments are only supported in the block editor.
+	 * Get image embeds from the classic editor by parsing HTML.
 	 *
 	 * @param array $media      The media array grouped by type.
 	 * @param int   $max_images The maximum number of images to return.
 	 *
 	 * @return array The attachments.
 	 */
-	protected function get_classic_editor_images( $media, $max_images ) {
-		// Max images can't be negative or zero.
-		if ( $max_images <= 0 ) {
-			return array();
-		}
-
-		if ( \count( $media['image'] ) <= $max_images ) {
-			if ( \class_exists( '\WP_HTML_Tag_Processor' ) ) {
-				$media['image'] = \array_merge( $media['image'], $this->get_classic_editor_image_embeds( $max_images ) );
-			} else {
-				$media['image'] = \array_merge( $media['image'], $this->get_classic_editor_image_attachments( $max_images ) );
-			}
-		}
-
-		return $media;
-	}
-
-	/**
-	 * Get image embeds from the classic editor by parsing HTML.
-	 *
-	 * @param int $max_images The maximum number of images to return.
-	 *
-	 * @return array The attachments.
-	 */
-	protected function get_classic_editor_image_embeds( $max_images ) {
+	protected function get_classic_editor_image_embeds( $media, $max_images ) {
 		// If someone calls that function directly, bail.
 		if ( ! \class_exists( '\WP_HTML_Tag_Processor' ) ) {
-			return array();
+			return $media;
 		}
 
 		// Max images can't be negative or zero.
 		if ( $max_images <= 0 ) {
-			return array();
+			return $media;
 		}
 
 		$images  = array();
@@ -887,44 +862,11 @@ protected function get_classic_editor_image_embeds( $max_images ) {
 			}
 		}
 
-		return $images;
-	}
-
-	/**
-	 * Get image attachments from the classic editor.
-	 * This is imperfect as the contained images aren't necessarily the
-	 * same as the attachments.
-	 *
-	 * @param int $max_images The maximum number of images to return.
-	 *
-	 * @return array The attachment IDs.
-	 */
-	protected function get_classic_editor_image_attachments( $max_images ) {
-		// Max images can't be negative or zero.
-		if ( $max_images <= 0 ) {
-			return array();
-		}
-
-		$images = array();
-		$query  = new \WP_Query(
-			array(
-				'post_parent'    => $this->item->ID,
-				'post_status'    => 'inherit',
-				'post_type'      => 'attachment',
-				'post_mime_type' => 'image',
-				'order'          => 'ASC',
-				'orderby'        => 'menu_order ID',
-				'posts_per_page' => $max_images,
-			)
-		);
-
-		foreach ( $query->get_posts() as $attachment ) {
-			if ( ! \in_array( $attachment->ID, $images, true ) ) {
-				$images[] = array( 'id' => $attachment->ID );
-			}
+		if ( \count( $media['image'] ) <= $max_images ) {
+			$media['image'] = \array_merge( $media['image'], $images );
 		}
 
-		return $images;
+		return $media;
 	}
 
 	/**

phpcs.xml

@@ -17,7 +17,7 @@
 	<rule ref="PHPCompatibility"/>
 	<config name="testVersion" value="7.2-"/>
 	<rule ref="PHPCompatibilityWP"/>
-	<config name="minimum_supported_wp_version" value="5.5"/>
+	<config name="minimum_supported_wp_version" value="6.4"/>
 
 	<config name="text_domain" value="activitypub,default"/>
 

readme.txt

@@ -1,7 +1,7 @@
 === ActivityPub ===
 Contributors: automattic, pfefferle, mattwiebe, obenland, akirk, jeherve, mediaformat, nuriapena, cavalierlife, andremenrath
 Tags: OStatus, fediverse, activitypub, activitystream
-Requires at least: 5.5
+Requires at least: 6.4
 Tested up to: 6.7
 Stable tag: 5.3.0
 Requires PHP: 7.2
@@ -147,6 +147,7 @@ For reasons of data protection, it is not possible to see the followers of other
 * Added: Outbox Activity IDs can now be resolved when the ActivityPub `Accept header is used.
 * Added: Labels to add context to visibility settings in the block editor.
 * Added: WP CLI command to reschedule Outbox-Activities.
+* Changed: Bumped minimum required WordPress version to 6.4.
 * Changed: Properly process `Update` activities on profiles and ensure all properties of a followed person are updated accordingly.
 * Changed: Outbox now precesses the first batch of followers right away to avoid delays in processing new Activities.
 * Changed: Post bulk edits no longer create Outbox items, unless author or post status change.

tests/includes/collection/class-test-extra-fields.php

@@ -22,10 +22,6 @@ class Test_Extra_Fields extends \WP_UnitTestCase {
 	 * @covers ::get_attachment
 	 */
 	public function test_get_attachment() {
-		if ( ! class_exists( '\WP_HTML_Tag_Processor' ) ) {
-			$this->markTestSkipped( 'WP_HTML_Tag_Processor not available' );
-		}
-
 		$post = self::factory()->post->create_and_get(
 			array(
 				'post_type'    => Extra_Fields::BLOG_POST_TYPE,

tests/includes/rest/class-test-actors-controller.php

@@ -167,10 +167,6 @@ public function test_get_item_schema() {
 	 * @covers ::get_item_schema
 	 */
 	public function test_response_matches_schema() {
-		if ( ! class_exists( '\WP_HTML_Tag_Processor' ) ) {
-			$this->markTestSkipped( 'WP_HTML_Tag_Processor not available' );
-		}
-
 		$request  = new \WP_REST_Request( 'GET', '/' . ACTIVITYPUB_REST_NAMESPACE . '/users/' . self::$user_id );
 		$response = rest_get_server()->dispatch( $request );
 		$data     = $response->get_data();

tests/includes/transformer/class-test-post.php

@@ -370,16 +370,6 @@ public function test_block_attachments_with_fallback() {
 			)
 		);
 
-		// For WP versions 6.1 and prior, we only look for attached images.
-		if ( ! class_exists( 'WP_HTML_Tag_Processor' ) ) {
-			wp_update_post(
-				array(
-					'ID'          => $attachment_id,
-					'post_parent' => $post_id,
-				)
-			);
-		}
-
 		$object = Post::transform( get_post( $post_id ) )->to_object();
 
 		$this->assertEquals(