Fix PHP 8.3 ReflectionProperty::setValue() deprecation warnings (#3…

…4314) In PHP 8.3, calling `ReflectionProperty::setValue()` with a single argument (rather than passing `null` for the `$object`) is deprecated. We do this in a few tests, let's fix it in preparation for running PHP 8.3 in CI.
Automattic · Nov 28, 2023 · f5858fd · f5858fd
1 parent fabc62e
commit f5858fd
Show file tree

Hide file tree

Showing 10 changed files with 25 additions and 10 deletions.
diff --git a/projects/packages/image-cdn/changelog/fix-php-8.3-ReflectionProperty-setValue-deprecation b/projects/packages/image-cdn/changelog/fix-php-8.3-ReflectionProperty-setValue-deprecation
@@ -0,0 +1,5 @@
+Significance: patch
+Type: fixed
+Comment: Fix PHP 8.3 deprecation warnings about calling `ReflectionProperty::setValue()` with a single argument in tests. No change to the project itself.
+
+
diff --git a/projects/packages/image-cdn/package.json b/projects/packages/image-cdn/package.json
@@ -1,7 +1,7 @@
 {
 	"private": true,
 	"name": "@automattic/jetpack-image-cdn",
-	"version": "0.3.1",
+	"version": "0.3.2-alpha",
 	"description": "Serve images through Jetpack's powerful CDN",
 	"homepage": "https://github.com/Automattic/jetpack/tree/HEAD/projects/packages/image-cdn/#readme",
 	"bugs": {

diff --git a/projects/packages/image-cdn/src/class-image-cdn.php b/projects/packages/image-cdn/src/class-image-cdn.php
@@ -14,7 +14,7 @@
  */
 final class Image_CDN {
 
-	const PACKAGE_VERSION = '0.3.1';
+	const PACKAGE_VERSION = '0.3.2-alpha';
 
 	/**
 	 * Singleton.

diff --git a/projects/packages/image-cdn/tests/php/test_class.image_cdn.php b/projects/packages/image-cdn/tests/php/test_class.image_cdn.php
@@ -94,14 +94,14 @@ public function tear_down() {
 		// l337 h4X0Ring required:
 		$instance = new ReflectionProperty( Image_CDN::class, 'instance' );
 		$instance->setAccessible( true );
-		$instance->setValue( null );
+		$instance->setValue( null, null );
 
 		/**
 		 * Reset the `image_sizes` property, as it persists between class instantiations, since it's static.
 		 */
 		$instance = new ReflectionProperty( Image_CDN::class, 'image_sizes' );
 		$instance->setAccessible( true );
-		$instance->setValue( null );
+		$instance->setValue( null, null );
 
 		self::delete_author();
 

diff --git a/projects/packages/stats/changelog/fix-php-8.3-ReflectionProperty-setValue-deprecation b/projects/packages/stats/changelog/fix-php-8.3-ReflectionProperty-setValue-deprecation
@@ -0,0 +1,5 @@
+Significance: patch
+Type: fixed
+Comment: Fix PHP 8.3 deprecation warnings about calling `ReflectionProperty::setValue()` with a single argument in tests. No change to the project itself.
+
+
diff --git a/projects/packages/stats/tests/php/test-main.php b/projects/packages/stats/tests/php/test-main.php
@@ -48,12 +48,12 @@ public function tear_down() {
 		$reflected_class    = new \ReflectionClass( 'Automattic\Jetpack\Stats\Main' );
 		$reflected_property = $reflected_class->getProperty( 'instance' );
 		$reflected_property->setAccessible( true );
-		$reflected_property = $reflected_property->setValue( null );
+		$reflected_property = $reflected_property->setValue( null, null );
 
 		$reflected_class    = new \ReflectionClass( 'Automattic\Jetpack\Stats\XMLRPC_Provider' );
 		$reflected_property = $reflected_class->getProperty( 'instance' );
 		$reflected_property->setAccessible( true );
-		$reflected_property = $reflected_property->setValue( null );
+		$reflected_property = $reflected_property->setValue( null, null );
 	}
 
 	/**

diff --git a/projects/packages/stats/tests/php/test-options.php b/projects/packages/stats/tests/php/test-options.php
@@ -22,7 +22,7 @@ public function tear_down() {
 		$reflected_class    = new \ReflectionClass( 'Automattic\Jetpack\Stats\Options' );
 		$reflected_property = $reflected_class->getProperty( 'options' );
 		$reflected_property->setAccessible( true );
-		$reflected_property = $reflected_property->setValue( array() );
+		$reflected_property = $reflected_property->setValue( null, array() );
 
 		parent::tear_down();
 	}

diff --git a/projects/packages/stats/tests/php/test-xmlrpc-provider.php b/projects/packages/stats/tests/php/test-xmlrpc-provider.php
@@ -44,7 +44,7 @@ public function tear_down() {
 		$reflected_class    = new \ReflectionClass( 'Automattic\Jetpack\Stats\XMLRPC_Provider' );
 		$reflected_property = $reflected_class->getProperty( 'instance' );
 		$reflected_property->setAccessible( true );
-		$reflected_property = $reflected_property->setValue( null );
+		$reflected_property = $reflected_property->setValue( null, null );
 	}
 
 	/**

diff --git a/projects/plugins/jetpack/changelog/fix-php-8.3-ReflectionProperty-setValue-deprecation b/projects/plugins/jetpack/changelog/fix-php-8.3-ReflectionProperty-setValue-deprecation
@@ -0,0 +1,5 @@
+Significance: patch
+Type: other
+Comment: Fix PHP 8.3 deprecation warnings about calling `ReflectionProperty::setValue()` with a single argument in tests. No change to the project itself.
+
+
diff --git a/projects/plugins/jetpack/tests/php/sync/test-class.jetpack-sync-checksum.php b/projects/plugins/jetpack/tests/php/sync/test-class.jetpack-sync-checksum.php
@@ -118,15 +118,15 @@ public function test_checksum_with_disabled_sync_modules( $table, $enabled_modul
 
 		$prop = $reflection->getProperty( 'initialized_modules' );
 		$prop->setAccessible( true );
-		$prop->setValue( null );
+		$prop->setValue( null, null );
 
 		$this->sync_enabled_modules = $enabled_modules;
 		add_filter( 'jetpack_sync_modules', array( $this, 'sync_modules_filter' ), 100 );
 		new Table_Checksum( $table );
 		remove_filter( 'jetpack_sync_modules', array( $this, 'sync_modules_filter' ) );
 
 		// Clean-up.
-		$prop->setValue( null );
+		$prop->setValue( null, null );
 	}
 
 	/**