Bump minimum version to PHP 7.2 (#1139)

* Bump minimum version to PHP 7.2+

* Upgrade phpunit

* Fix tests for WP 5.9

---------

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

Author: obenland

.github/workflows/phpunit.yml

@@ -15,13 +15,11 @@ jobs:
        options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=10s --health-retries=10
     strategy:
       matrix:
-        php-versions: ['7.0', '7.1', '7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3', '8.4']
+        php-versions: ['7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3', '8.4']
         include:
           - wp-version: latest
-          - wp-version: '6.5'
-            php-versions: '7.0'
-          - wp-version: '6.5'
-            php-versions: '7.1'
+          - wp-version: '5.9'
+            php-versions: '7.2'
     steps:
       - name: Install svn
         run: |

CHANGELOG.md

@@ -14,6 +14,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Changed
 
 * Hide ActivityPub post meta keys from the custom Fields UI
+* Bumped minimum required PHP version to 7.2
 
 ### Fixed
 

activitypub.php

@@ -8,7 +8,7 @@
  * Author URI: https://automattic.com/
  * License: MIT
  * License URI: http://opensource.org/licenses/MIT
- * Requires PHP: 7.0
+ * Requires PHP: 7.2
  * Text Domain: activitypub
  * Domain Path: /languages
  *

composer.json

@@ -3,11 +3,11 @@
     "description": "The ActivityPub protocol is a decentralized social networking protocol based upon the ActivityStreams 2.0 data format.",
     "type": "wordpress-plugin",
     "require": {
-        "php": ">=7.0",
+        "php": ">=7.2",
         "composer/installers": "^1.0 || ^2.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "^5.7.21 || ^6.5 || ^7.5 || ^8",
+        "phpunit/phpunit": "^8 || ^9",
         "phpcompatibility/php-compatibility": "*",
         "phpcompatibility/phpcompatibility-wp": "*",
         "squizlabs/php_codesniffer": "3.*",

phpcs.xml

@@ -14,9 +14,9 @@
 	<arg name="parallel" value="50"/>
 
 	<rule ref="PHPCompatibility"/>
-	<config name="testVersion" value="7.0-"/>
+	<config name="testVersion" value="7.2-"/>
 	<rule ref="PHPCompatibilityWP"/>
-	<config name="minimum_supported_wp_version" value="4.7"/>
+	<config name="minimum_supported_wp_version" value="5.5"/>
 
 	<config name="text_domain" value="activitypub,default"/>
 

phpunit.xml.dist

@@ -11,9 +11,7 @@
 			<directory prefix="class-test-" suffix=".php">./tests</directory>
 		</testsuite>
 	</testsuites>
-	<!--
 	<listeners>
 		<listener class="Activitypub\Tests\Activitypub_Testcase_Timer" file="tests/class-activitypub-testcase-timer.php" />
 	</listeners>
-	-->
 </phpunit>

readme.txt

@@ -4,7 +4,7 @@ Tags: OStatus, fediverse, activitypub, activitystream
 Requires at least: 5.5
 Tested up to: 6.7
 Stable tag: 4.6.0
-Requires PHP: 7.0
+Requires PHP: 7.2
 License: MIT
 License URI: http://opensource.org/licenses/MIT
 
@@ -136,6 +136,7 @@ For reasons of data protection, it is not possible to see the followers of other
 
 * Added: A filter to make custom comment types manageable in WP.com Calypso
 * Changed: Hide ActivityPub post meta keys from the custom Fields UI
+* Changed: Bumped minimum required PHP version to 7.2
 * Fixed: Undefined array key warnings in various places
 * Fixed: Fetching replies from the same instance for Enable Mastodon Apps
 * Fixed: Image captions not being included in the ActivityPub representation when the image is attached to the post

tests/includes/collection/class-test-followers.php

@@ -129,8 +129,8 @@ public function test_add_follower() {
 		$db_followers  = Followers::get_followers( 1 );
 		$db_followers2 = Followers::get_followers( 2 );
 
-		$this->assertContains( $follower, $db_followers );
-		$this->assertContains( $follower2, $db_followers2 );
+		$this->assertStringContainsString( $follower, serialize( $db_followers ) ); // phpcs:ignore WordPress.PHP.DiscouragedPHPFunctions.serialize_serialize
+		$this->assertStringContainsString( $follower2, serialize( $db_followers2 ) );  // phpcs:ignore WordPress.PHP.DiscouragedPHPFunctions.serialize_serialize
 	}
 
 	/**
@@ -329,7 +329,7 @@ public function test_add_duplicate_follower() {
 
 		$db_followers = Followers::get_followers( 1 );
 
-		$this->assertContains( $follower, $db_followers );
+		$this->assertStringContainsString( $follower, serialize( $db_followers ) ); // phpcs:ignore WordPress.PHP.DiscouragedPHPFunctions.serialize_serialize
 
 		$follower = current( $db_followers );
 		$meta     = get_post_meta( $follower->get__id(), '_activitypub_user_id', false );

tests/includes/rest/class-test-signature-verification.php

@@ -47,7 +47,7 @@ public function test_activity_signature() {
 		$date      = gmdate( 'D, d M Y H:i:s T' );
 		$signature = Signature::generate_signature( 1, 'POST', $remote_actor, $date, $digest );
 
-		$this->assertRegExp( '/keyId="http:\/\/example\.org\/\?author=1#main-key",algorithm="rsa-sha256",headers="\(request-target\) host date digest",signature="[^"]*"/', $signature );
+		$this->assertMatchesRegularExpression( '/keyId="http:\/\/example\.org\/\?author=1#main-key",algorithm="rsa-sha256",headers="\(request-target\) host date digest",signature="[^"]*"/', $signature );
 
 		// Signed headers.
 		$url_parts = wp_parse_url( $remote_actor );

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

@@ -370,6 +370,16 @@ 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(