Address PR review feedback

Author: arcangelini

src/wp-includes/comment.php

@@ -3170,7 +3170,7 @@ function generic_ping( $post_id = 0 ) {
  * notifications, as well as incoming pingbacks and trackbacks) are disabled
  * for non-production environments ('local', 'development', 'staging').
  *
- * @since 6.9.0
+ * @since 7.1.0
  *
  * @return bool True if pings should be disabled, false otherwise.
  */
@@ -3184,7 +3184,7 @@ function wp_should_disable_pings_for_environment() {
 	 * Returning false re-enables pings in non-production environments.
 	 * Returning true disables pings even in production.
 	 *
-	 * @since 6.9.0
+	 * @since 7.1.0
 	 *
 	 * @param bool   $should_disable  Whether pings should be disabled. Default true
 	 *                                for non-production environments, false for production.
@@ -3200,7 +3200,7 @@ function wp_should_disable_pings_for_environment() {
  * Hooked to `do_all_pings` at priority 1 so it runs before the default
  * priority 10 callbacks. Does not remove `do_all_enclosures`.
  *
- * @since 6.9.0
+ * @since 7.1.0
  * @access private
  */
 function wp_disable_outgoing_pings_for_environment() {
@@ -3218,22 +3218,19 @@ function wp_disable_outgoing_pings_for_environment() {
  * trackback is processed. Calls `trackback_response()` which sends an XML error
  * response and terminates the request.
  *
- * @since 6.9.0
+ * @since 7.1.0
  * @access private
- *
- * @param int    $post_id       Post ID related to the trackback.
- * @param string $trackback_url Trackback URL.
  */
-function wp_disable_trackback_for_environment( $post_id, $trackback_url ) {
+function wp_disable_trackback_for_environment() {
 	if ( wp_should_disable_pings_for_environment() ) {
-		trackback_response( 1, __( 'Sorry, trackbacks are closed for this item.' ) );
+		trackback_response( 1, __( 'Trackbacks are disabled in non-production environments.' ) );
 	}
 }
 
 /**
  * Removes the pingback XML-RPC method in non-production environments.
  *
- * @since 6.9.0
+ * @since 7.1.0
  * @access private
  *
  * @param string[] $methods An array of XML-RPC methods, keyed by their methodName.

src/wp-includes/default-filters.php

@@ -424,7 +424,7 @@
 
 // Disable pings (pingbacks, trackbacks, and ping service notifications) in non-production environments.
 add_action( 'do_all_pings', 'wp_disable_outgoing_pings_for_environment', 1, 0 );
-add_action( 'pre_trackback_post', 'wp_disable_trackback_for_environment', 10, 2 );
+add_action( 'pre_trackback_post', 'wp_disable_trackback_for_environment', 10, 0 );
 add_filter( 'xmlrpc_methods', 'wp_disable_xmlrpc_pingback_for_environment' );
 
 add_action( 'do_robots', 'do_robots' );

tests/phpunit/tests/comment/disablePingsForEnvironment.php

@@ -174,15 +174,15 @@ public function test_outgoing_pings_preserved_in_production() {
 
 		wp_disable_outgoing_pings_for_environment();
 
-		$this->assertSame( 10, has_action( 'do_all_pings', 'do_all_pingbacks' ) );
-		$this->assertSame( 10, has_action( 'do_all_pings', 'do_all_trackbacks' ) );
-		$this->assertSame( 10, has_action( 'do_all_pings', 'generic_ping' ) );
+		$this->assertSame( 10, has_action( 'do_all_pings', 'do_all_pingbacks' ), 'do_all_pingbacks should still be hooked.' );
+		$this->assertSame( 10, has_action( 'do_all_pings', 'do_all_trackbacks' ), 'do_all_trackbacks should still be hooked.' );
+		$this->assertSame( 10, has_action( 'do_all_pings', 'generic_ping' ), 'generic_ping should still be hooked.' );
 	}
 
 	/**
 	 * @ticket 64837
 	 */
-	public function test_trackback_hook_registered_in_non_production() {
+	public function test_trackback_hook_is_registered() {
 		$this->assertSame( 10, has_action( 'pre_trackback_post', 'wp_disable_trackback_for_environment' ) );
 	}