Janitorial: Disparate cleanup tasks (#40200)

* Remove Phan suppression now that PHPDoc is correct in supported WP versions * Remove WP 6.5 polyfill (see #38428) * Remove is_callable check for wp_trigger_error() * setMethods → onlyMethods * static → const property * Add type hinting * Throw exception instead of triggering deprecation notice * Remove now-unneeded CSS * Updated comment * Add future todo * Remove fallbacks * Add changelogs * Remove composer downgrade logic * CRM requires PHP 7.4 already * Super Cache has previously required WP 6.5 * Vaultpress has previous required WP 5.2 * Get realpath of temp dir * Fix changelogger tests * Add changelogs * Fix typo * Adjust comment * Simplify logic * See if this sates tests * Jetpack::is_connection_ready has been around in its current state since JP 9.7 * Remove checks for more long-present calls * Clean up Phan suppressions * Update changelog Co-authored-by: Brad Jorsch <[email protected]> * Update changelog Co-authored-by: Brad Jorsch <[email protected]> * Remove old comment --------- Co-authored-by: Brad Jorsch <[email protected]>
Automattic · Nov 18, 2024 · d4ff610 · d4ff610
1 parent 62e385b
commit d4ff610
Show file tree

Hide file tree

Showing 40 changed files with 116 additions and 200 deletions.
diff --git a/.github/actions/tool-setup/action.yml b/.github/actions/tool-setup/action.yml
@@ -21,11 +21,6 @@ runs:
         # Read tool versions
         . .github/versions.sh
 
-        if [[ "${INPUT_PHP:-$PHP_VERSION}" == 7.[01] ]]; then
-          printf "Downgrading composer for PHP %s\n\n" "${INPUT_PHP:-$PHP_VERSION}"
-          COMPOSER_VERSION=2.2.24
-        fi
-
         printf "\n\e[1mSelected tool versions\e[0m\n"
         echo " PHP: ${INPUT_PHP:-$PHP_VERSION}"
         echo "php-version=${INPUT_PHP:-$PHP_VERSION}" >> "$GITHUB_OUTPUT"

diff --git a/projects/packages/assets/changelog/remove-pre_wp6.6_and_php7.2_code b/projects/packages/assets/changelog/remove-pre_wp6.6_and_php7.2_code
@@ -0,0 +1,4 @@
+Significance: major
+Type: removed
+
+Remove JSX runtime polyfill, now that we've dropped support for WordPress < 6.6.
diff --git a/projects/packages/assets/src/class-assets.php b/projects/packages/assets/src/class-assets.php
@@ -537,12 +537,6 @@ public static function wp_default_scripts_hook( $wp_scripts ) {
 		$wp_scripts->add( 'wp-jp-i18n-state', false, array( 'wp-deprecated', $handle ) );
 		$wp_scripts->add_inline_script( 'wp-jp-i18n-state', 'wp.deprecated( "wp-jp-i18n-state", { alternative: "wp-jp-i18n-loader" } );' );
 		$wp_scripts->add_inline_script( 'wp-jp-i18n-state', 'wp.jpI18nState = wp.jpI18nLoader.state;' );
-
-		// Register the React JSX runtime script - used as a polyfill until we can update JSX transforms. See https://github.com/Automattic/jetpack/issues/38424.
-		// @todo Remove this when we drop support for WordPress 6.5, as well as the script inclusion in test_wp_default_scripts_hook.
-		$jsx_url = self::normalize_path( plugins_url( '../build/react-jsx-runtime.js', __FILE__ ) );
-		$wp_scripts->add( 'react-jsx-runtime', $jsx_url, array( 'react' ), '18.3.1', true );
-		$wp_scripts->add_data( 'react-jsx-runtime', 'group', 1 );
 	}
 
 	// endregion .

diff --git a/projects/packages/assets/tests/php/test-assets.php b/projects/packages/assets/tests/php/test-assets.php
@@ -755,8 +755,7 @@ function ( $value ) use ( $value_sets, $i ) {
 			return $funcs;
 		};
 
-		// @todo: Remove `react-jsx-runtime` from the list of dependencies once we drop support for WordPress 6.5 and remove the dependency from wp_default_scripts_hook.
-		$mock->expects( $this->exactly( 3 ) )->method( 'add' )
+		$mock->expects( $this->exactly( 2 ) )->method( 'add' )
 			->with(
 				...$with_consecutive(
 					array(
@@ -767,12 +766,7 @@ function ( $value ) use ( $value_sets, $i ) {
 						),
 						array( 'wp-i18n' ),
 					),
-					array( 'wp-jp-i18n-state', false, array( 'wp-deprecated', 'wp-jp-i18n-loader' ) ),
-					array(
-						'react-jsx-runtime',
-						'http://www.example.com/wp-content/plugins/jetpack/packages/assets/build/react-jsx-runtime.js',
-						array( 'react' ),
-					)
+					array( 'wp-jp-i18n-state', false, array( 'wp-deprecated', 'wp-jp-i18n-loader' ) )
 				)
 			);
 		$mock->expects( $this->exactly( 3 ) )->method( 'add_inline_script' )
@@ -783,11 +777,10 @@ function ( $value ) use ( $value_sets, $i ) {
 					array( 'wp-jp-i18n-state', 'wp.jpI18nState = wp.jpI18nLoader.state;' )
 				)
 			);
-		$mock->expects( $this->exactly( 2 ) )->method( 'add_data' )
+		$mock->expects( $this->once() )->method( 'add_data' )
 			->with(
 				...$with_consecutive(
-					array( 'wp-jp-i18n-loader', 'group', 1 ),
-					array( 'react-jsx-runtime', 'group', 1 )
+					array( 'wp-jp-i18n-loader', 'group', 1 )
 				)
 			);
 

diff --git a/projects/packages/assets/webpack.config.js b/projects/packages/assets/webpack.config.js
@@ -61,23 +61,4 @@ module.exports = [
 			} ),
 		],
 	},
-	{
-		entry: {
-			'react-jsx-runtime': {
-				import: 'react/jsx-runtime',
-			},
-		},
-		output: {
-			...jetpackWebpackConfig.output,
-			path: path.resolve( './build' ),
-			filename: 'react-jsx-runtime.js',
-			library: {
-				name: 'ReactJSXRuntime',
-				type: 'window',
-			},
-		},
-		externals: {
-			react: 'React',
-		},
-	},
 ];
diff --git a/projects/packages/autoloader/changelog/remove-pre_wp6.6_and_php7.2_code b/projects/packages/autoloader/changelog/remove-pre_wp6.6_and_php7.2_code
@@ -0,0 +1,4 @@
+Significance: major
+Type: removed
+
+Remove support for WordPress 6.5 and earlier.
diff --git a/projects/packages/autoloader/src/class-latest-autoloader-guard.php b/projects/packages/autoloader/src/class-latest-autoloader-guard.php
@@ -131,41 +131,23 @@ public function check_for_conflicting_autoloaders() {
 				foreach ( $composer_autoloader->getClassMap() as $classname => $path ) {
 					if ( $jetpack_autoloader_loader->find_class_file( $classname ) ) {
 						$msg = "A Composer autoloader is registered with a higher priority than the Jetpack Autoloader and would also handle some of the classes we handle (e.g. $classname => $path). This may cause strange and confusing problems.";
-						// @todo Remove the is_callable check once we drop support for WP 6.5.
-						if ( is_callable( 'wp_trigger_error' ) ) {
-							wp_trigger_error( '', $msg );
-						} else {
-							// phpcs:ignore WordPress.PHP.DevelopmentFunctions.error_log_trigger_error
-							trigger_error( $msg );
-						}
+						wp_trigger_error( '', $msg );
 						continue 2;
 					}
 				}
 				foreach ( $composer_autoloader->getPrefixesPsr4() as $prefix => $paths ) {
 					if ( isset( $prefixes[ $prefix ] ) ) {
 						$path = array_pop( $paths );
 						$msg  = "A Composer autoloader is registered with a higher priority than the Jetpack Autoloader and would also handle some of the namespaces we handle (e.g. $prefix => $path). This may cause strange and confusing problems.";
-						// @todo Remove the is_callable check once we drop support for WP 6.5.
-						if ( is_callable( 'wp_trigger_error' ) ) {
-							wp_trigger_error( '', $msg );
-						} else {
-							// phpcs:ignore WordPress.PHP.DevelopmentFunctions.error_log_trigger_error
-							trigger_error( $msg );
-						}
+						wp_trigger_error( '', $msg );
 						continue 2;
 					}
 				}
 				foreach ( $composer_autoloader->getPrefixes() as $prefix => $paths ) {
 					if ( isset( $prefixes[ $prefix ] ) ) {
 						$path = array_pop( $paths );
 						$msg  = "A Composer autoloader is registered with a higher priority than the Jetpack Autoloader and would also handle some of the namespaces we handle (e.g. $prefix => $path). This may cause strange and confusing problems.";
-						// @todo Remove the is_callable check once we drop support for WP 6.5.
-						if ( is_callable( 'wp_trigger_error' ) ) {
-							wp_trigger_error( '', $msg );
-						} else {
-							// phpcs:ignore WordPress.PHP.DevelopmentFunctions.error_log_trigger_error
-							trigger_error( $msg );
-						}
+						wp_trigger_error( '', $msg );
 						continue 2;
 					}
 				}

diff --git a/projects/packages/autoloader/src/class-php-autoloader.php b/projects/packages/autoloader/src/class-php-autoloader.php
@@ -88,13 +88,7 @@ public static function load_class( $class_name ) {
 		) {
 			// phpcs:ignore WordPress.PHP.DevelopmentFunctions.error_log_wp_debug_backtrace_summary -- This is a debug log message.
 			$msg = "Jetpack Autoloader: Autoloading `$class_name` before the plugins_loaded hook may cause strange and confusing problems. " . wp_debug_backtrace_summary( '', 1 );
-			// @todo Remove the is_callable check once we drop support for WP 6.5.
-			if ( is_callable( 'wp_trigger_error' ) ) {
-				wp_trigger_error( '', $msg );
-			} else {
-				// phpcs:ignore WordPress.PHP.DevelopmentFunctions.error_log_trigger_error
-				trigger_error( $msg );
-			}
+			wp_trigger_error( '', $msg );
 		}
 
 		require $file;

diff --git a/projects/packages/changelogger/changelog/remove-pre_wp6.6_and_php7.2_code b/projects/packages/changelogger/changelog/remove-pre_wp6.6_and_php7.2_code
@@ -0,0 +1,5 @@
+Significance: patch
+Type: removed
+Comment: Additional cleanup of old PHP + WP version support.
+
+
diff --git a/projects/packages/changelogger/changelog/upgrade_deprecation_to_exception b/projects/packages/changelogger/changelog/upgrade_deprecation_to_exception
@@ -0,0 +1,4 @@
+Significance: minor
+Type: deprecated
+
+Using getChangesBySubheading() with a param now throws an exception.
diff --git a/projects/packages/changelogger/lib/ChangelogEntry.php b/projects/packages/changelogger/lib/ChangelogEntry.php
@@ -268,31 +268,30 @@ public function appendChange( ChangeEntry $change ) {
 	/**
 	 * Get the changes grouped by subheading.
 	 *
-	 * @param string|null $subheading Subheading to retrieve. @deprecated since 4.2.0. Do `->getChangesBySubheading()[ $subheading ]` instead.
+	 * @param string|null $subheading Subheading to retrieve. @deprecated since 4.2.0; now throws error. Do `->getChangesBySubheading()[ $subheading ]` instead.
 	 * @return array<string,ChangeEntry[]> Change entries by subheading.
-	 *   Returns just the `ChangeEntry[]` if the deprecated `$subheading` parameter is used.
+	 * @throws \InvalidArgumentException If the deprecated `$subheading` parameter is used.
 	 */
 	public function getChangesBySubheading( $subheading = null ) {
 		if ( $subheading !== null ) {
-			// @todo Sometime for a major version bump, have this throw instead. Then remove it for a major bump after that.
-			// phpcs:ignore WordPress.PHP.DevelopmentFunctions.error_log_trigger_error
-			trigger_error( 'Passing a value for $subheading is deprecated. Do `->getChangesBySubheading()[ $subheading ]` instead.', E_USER_DEPRECATED );
+			// @todo Remove this next major version bump.
+			throw new \InvalidArgumentException( 'Passing a value for $subheading is deprecated. Do `->getChangesBySubheading()[ $subheading ]` instead.' );
 		}
 
 		$ret = array();
 		foreach ( $this->changes as $entry ) {
 			$ret[ $entry->getSubheading() ][] = $entry;
 		}
 
-		return null === $subheading
-			? $ret
-			: ( $ret[ $subheading ] ?? array() );
+		return $ret;
 	}
 
 	/**
 	 * Return data for serializing to JSON.
 	 *
 	 * @return array
+	 *
+	 * @todo Once we drop support for PHP <7.4, we should remove the attribute and add a `mixed` return type to match JsonSerializable.
 	 */
 	#[\ReturnTypeWillChange]
 	public function jsonSerialize() {

diff --git a/projects/packages/changelogger/tests/php/tests/lib/ChangelogEntryTest.php b/projects/packages/changelogger/tests/php/tests/lib/ChangelogEntryTest.php
@@ -98,12 +98,15 @@ public function testChanges() {
 
 		$this->assertSame( array(), $entry->getChanges() );
 		$this->assertSame( array(), $entry->getChangesBySubheading() );
-		error_clear_last();
-		$this->assertSame( array(), @$entry->getChangesBySubheading( 'B' ) );
-		$err = error_get_last();
-		$this->assertNotNull( $err );
-		$this->assertSame( E_USER_DEPRECATED, $err['type'] );
-		$this->assertSame( 'Passing a value for $subheading is deprecated. Do `->getChangesBySubheading()[ $subheading ]` instead.', $err['message'] );
+
+		try {
+			$entry->getChangesBySubheading( 'B' );
+		} catch ( \InvalidArgumentException $e ) {
+			$this->assertSame(
+				'Passing a value for $subheading is deprecated. Do `->getChangesBySubheading()[ $subheading ]` instead.',
+				$e->getMessage()
+			);
+		}
 
 		$this->assertSame( $entry, $entry->setChanges( $changes ) );
 		$this->assertSame( $changes, $entry->getChanges() );
@@ -116,13 +119,6 @@ public function testChanges() {
 			$entry->getChangesBySubheading()
 		);
 
-		error_clear_last();
-		$this->assertSame( array( $changes[1], $changes[2] ), @$entry->getChangesBySubheading( 'B' ) );
-		$err = error_get_last();
-		$this->assertNotNull( $err );
-		$this->assertSame( E_USER_DEPRECATED, $err['type'] );
-		$this->assertSame( 'Passing a value for $subheading is deprecated. Do `->getChangesBySubheading()[ $subheading ]` instead.', $err['message'] );
-
 		$c1 = new ChangeEntry(
 			array(
 				'subheading' => 'B',
@@ -155,13 +151,6 @@ public function testChanges() {
 			$entry->getChangesBySubheading()
 		);
 
-		error_clear_last();
-		$this->assertSame( array( $c2, $changes[1], $c1, $changes[2] ), @$entry->getChangesBySubheading( 'B' ) );
-		$err = error_get_last();
-		$this->assertNotNull( $err );
-		$this->assertSame( E_USER_DEPRECATED, $err['type'] );
-		$this->assertSame( 'Passing a value for $subheading is deprecated. Do `->getChangesBySubheading()[ $subheading ]` instead.', $err['message'] );
-
 		$entry = new ChangelogEntry( '1.0' );
 		$this->assertSame( $entry, $entry->appendChange( $c1 )->appendChange( $c2 )->appendChange( $c3 ) );
 		$this->assertSame( array( $c1, $c2, $c3 ), $entry->getChanges() );

diff --git a/projects/packages/changelogger/tests/php/tests/src/UtilsTest.php b/projects/packages/changelogger/tests/php/tests/src/UtilsTest.php
@@ -65,7 +65,7 @@ public function testRunCommand( $cmd, $options, $expectExitCode, $expectStdout,
 	 * Data provider for testRunCommand.
 	 */
 	public function provideRunCommand() {
-		$tmp = sys_get_temp_dir();
+		$tmp = realpath( sys_get_temp_dir() );
 
 		return array(
 			'true'                      => array(

diff --git a/projects/packages/jetpack-mu-wpcom/changelog/remove-pre_wp6.6_and_php7.2_code b/projects/packages/jetpack-mu-wpcom/changelog/remove-pre_wp6.6_and_php7.2_code
@@ -0,0 +1,5 @@
+Significance: patch
+Type: removed
+Comment: Additional cleanup of old PHP + WP version support.
+
+
diff --git a/projects/packages/jetpack-mu-wpcom/src/features/custom-css/custom-css.php b/projects/packages/jetpack-mu-wpcom/src/features/custom-css/custom-css.php
@@ -987,8 +987,7 @@ public static function update_custom_css_data( $args ) {
 		public static function editor_max_image_size( $dims, $size = 'medium', $context = null ) {
 			list( $width, $height ) = $dims;
 
-			// @phan-suppress-next-line PhanUndeclaredClassInCallable
-			if ( class_exists( 'Jetpack' ) && is_callable( 'Jetpack::get_content_width' ) && 'large' === $size && 'edit' === $context ) {
+			if ( class_exists( 'Jetpack' ) && 'large' === $size && 'edit' === $context ) {
 				// @phan-suppress-next-line PhanUndeclaredClassMethod
 				$width = Jetpack::get_content_width();
 			}
@@ -1029,8 +1028,7 @@ public static function set_content_width() {
 				return;
 			}
 
-			// @phan-suppress-next-line PhanUndeclaredClassInCallable
-			if ( class_exists( 'Jetpack' ) && is_callable( 'Jetpack::get_content_width' ) ) {
+			if ( class_exists( 'Jetpack' ) ) {
 				// @phan-suppress-next-line PhanUndeclaredClassMethod
 				$GLOBALS['content_width'] = Jetpack::get_content_width();
 			}
@@ -1078,8 +1076,7 @@ public static function load_revision_php() {
 		 * Enable CSS module.
 		 */
 		public static function custom_css_loaded() {
-			// @phan-suppress-next-line PhanUndeclaredClassInCallable
-			if ( class_exists( 'Jetpack' ) && is_callable( 'Jetpack::enable_module_configurable' ) ) {
+			if ( class_exists( 'Jetpack' ) ) {
 				// @phan-suppress-next-line PhanUndeclaredClassMethod
 				Jetpack::enable_module_configurable( __FILE__ );
 			}
@@ -1252,4 +1249,4 @@ public function subvalue() { // phpcs:ignore MediaWiki.Usage.NestedFunctions.Nes
 			}
 		}
 	}
-endif;
+endif;
diff --git a/...ackages/jetpack-mu-wpcom/src/features/replace-site-visibility/replace-site-visibility.php b/...ackages/jetpack-mu-wpcom/src/features/replace-site-visibility/replace-site-visibility.php
@@ -11,8 +11,8 @@
  * @return bool
  */
 function is_jetpack_connected() {
-	// @phan-suppress-next-line PhanUndeclaredClassMethod, PhanUndeclaredClassInCallable
-	return class_exists( 'Jetpack' ) && is_callable( 'Jetpack::is_connection_ready' ) && Jetpack::is_connection_ready();
+	// @phan-suppress-next-line PhanUndeclaredClassMethod
+	return class_exists( 'Jetpack' ) && Jetpack::is_connection_ready();
 }
 
 /**

diff --git a/projects/packages/jetpack-mu-wpcom/src/features/wpcom-blocks/event-countdown/editor.scss b/projects/packages/jetpack-mu-wpcom/src/features/wpcom-blocks/event-countdown/editor.scss
@@ -22,10 +22,3 @@
 		width: 100%;
 	}
 }
-
-// Fix so datetime picker doesn't have horizontal scrollbar.
-// This is a global fix, unscoped, and not very nice.
-// @todo: It won't be necessary once https://github.com/WordPress/gutenberg/pull/18235/files gets merged.
-.components-datetime {
-	padding: 8px;
-}
diff --git a/projects/packages/masterbar/changelog/remove-pre_wp6.6_and_php7.2_code b/projects/packages/masterbar/changelog/remove-pre_wp6.6_and_php7.2_code
@@ -0,0 +1,5 @@
+Significance: patch
+Type: removed
+Comment: Additional cleanup of old PHP + WP version support.
+
+
diff --git a/projects/packages/masterbar/tests/php/test-class-atomic-additional-css-manager.php b/projects/packages/masterbar/tests/php/test-class-atomic-additional-css-manager.php
@@ -49,10 +49,9 @@ public function tear_down() {
 	 * Check if the nudge contains the proper url and message copy.
 	 */
 	public function test_it_generates_proper_url_and_nudge() {
-		// @phan-suppress-next-line PhanDeprecatedFunction -- Keep using setMethods until we drop PHP 7.0 support.
 		$manager = $this->getMockBuilder( Atomic_Additional_CSS_Manager::class )
 			->setConstructorArgs( array( 'foo.com' ) )
-			->setMethods( array( 'get_plan_name' ) )
+			->onlyMethods( array( 'get_plan_name' ) )
 			->getMock();
 
 		$manager->method( 'get_plan_name' )->willReturn( 'Business' );

diff --git a/projects/packages/masterbar/tests/php/test-class-wpcom-additional-css-manager.php b/projects/packages/masterbar/tests/php/test-class-wpcom-additional-css-manager.php
@@ -40,10 +40,9 @@ public function set_up() {
 	 * Check if the manager constructs the proper url and copy message.
 	 */
 	public function test_it_generates_proper_url_and_nudge() {
-		// @phan-suppress-next-line PhanDeprecatedFunction -- Keep using setMethods until we drop PHP 7.0 support.
 		$manager = $this->getMockBuilder( WPCOM_Additional_CSS_Manager::class )
 			->setConstructorArgs( array( 'foo.com' ) )
-			->setMethods( array( 'get_plan' ) )
+			->onlyMethods( array( 'get_plan' ) )
 			->getMock();
 
 		$manager->method( 'get_plan' )->willReturn(

diff --git a/projects/packages/status/changelog/remove-pre_wp6.6_and_php7.2_code b/projects/packages/status/changelog/remove-pre_wp6.6_and_php7.2_code
@@ -0,0 +1,5 @@
+Significance: patch
+Type: removed
+Comment: Additional cleanup of old PHP + WP version support.
+
+
diff --git a/projects/packages/status/src/class-status.php b/projects/packages/status/src/class-status.php
@@ -45,8 +45,7 @@ public function is_offline_mode() {
 		/**
 		 * Filters Jetpack's offline mode.
 		 *
-		 * @see https://jetpack.com/support/development-mode/
-		 * @todo Update documentation ^^.
+		 * @see https://jetpack.com/support/offline-mode/
 		 *
 		 * @since 1.3.0
 		 *

diff --git a/projects/plugins/beta/changelog/remove-pre_wp6.6_and_php7.2_code b/projects/plugins/beta/changelog/remove-pre_wp6.6_and_php7.2_code
@@ -0,0 +1,5 @@
+Significance: patch
+Type: removed
+Comment: Additional cleanup of old PHP + WP version support.
+
+