Address second round of PR review feedback

Author: arcangelini

src/wp-includes/comment.php

@@ -3201,13 +3201,12 @@ function wp_should_disable_pings_for_environment() {
  * priority 10 callbacks. Does not remove `do_all_enclosures`.
  *
  * @since 7.1.0
- * @access private
  */
-function wp_disable_outgoing_pings_for_environment() {
+function wp_maybe_disable_outgoing_pings_for_environment() {
 	if ( wp_should_disable_pings_for_environment() ) {
-		remove_action( 'do_all_pings', 'do_all_pingbacks', 10 );
-		remove_action( 'do_all_pings', 'do_all_trackbacks', 10 );
-		remove_action( 'do_all_pings', 'generic_ping', 10 );
+		remove_action( 'do_all_pings', 'do_all_pingbacks' );
+		remove_action( 'do_all_pings', 'do_all_trackbacks' );
+		remove_action( 'do_all_pings', 'generic_ping' );
 	}
 }
 
@@ -3219,9 +3218,8 @@ function wp_disable_outgoing_pings_for_environment() {
  * response and terminates the request.
  *
  * @since 7.1.0
- * @access private
  */
-function wp_disable_trackback_for_environment() {
+function wp_maybe_disable_trackback_for_environment() {
 	if ( wp_should_disable_pings_for_environment() ) {
 		trackback_response( 1, __( 'Trackbacks are disabled in non-production environments.' ) );
 	}
@@ -3231,12 +3229,11 @@ function wp_disable_trackback_for_environment() {
  * Removes the pingback XML-RPC method in non-production environments.
  *
  * @since 7.1.0
- * @access private
  *
  * @param string[] $methods An array of XML-RPC methods, keyed by their methodName.
  * @return string[] Modified array of XML-RPC methods.
  */
-function wp_disable_xmlrpc_pingback_for_environment( $methods ) {
+function wp_maybe_disable_xmlrpc_pingback_for_environment( $methods ) {
 	if ( wp_should_disable_pings_for_environment() ) {
 		unset( $methods['pingback.ping'] );
 	}

src/wp-includes/default-filters.php

@@ -423,9 +423,9 @@
 add_action( 'do_all_pings', 'generic_ping', 10, 0 );
 
 // 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, 0 );
-add_filter( 'xmlrpc_methods', 'wp_disable_xmlrpc_pingback_for_environment' );
+add_action( 'do_all_pings', 'wp_maybe_disable_outgoing_pings_for_environment', 1, 0 );
+add_action( 'pre_trackback_post', 'wp_maybe_disable_trackback_for_environment', 10, 0 );
+add_filter( 'xmlrpc_methods', 'wp_maybe_disable_xmlrpc_pingback_for_environment' );
 
 add_action( 'do_robots', 'do_robots' );
 add_action( 'do_favicon', 'do_favicon' );

tests/phpunit/tests/comment/disablePingsForEnvironment.php

@@ -5,9 +5,9 @@
  *
  * @group comment
  * @covers ::wp_should_disable_pings_for_environment
- * @covers ::wp_disable_outgoing_pings_for_environment
- * @covers ::wp_disable_trackback_for_environment
- * @covers ::wp_disable_xmlrpc_pingback_for_environment
+ * @covers ::wp_maybe_disable_outgoing_pings_for_environment
+ * @covers ::wp_maybe_disable_trackback_for_environment
+ * @covers ::wp_maybe_disable_xmlrpc_pingback_for_environment
  *
  * @ticket 64837
  */
@@ -118,7 +118,7 @@ public function test_outgoing_pingbacks_removed_in_non_production() {
 		add_action( 'do_all_pings', 'do_all_pingbacks', 10, 0 );
 
 		// Fire the priority-1 callback.
-		wp_disable_outgoing_pings_for_environment();
+		wp_maybe_disable_outgoing_pings_for_environment();
 
 		$this->assertFalse( has_action( 'do_all_pings', 'do_all_pingbacks' ) );
 	}
@@ -131,7 +131,7 @@ public function test_outgoing_trackbacks_removed_in_non_production() {
 
 		add_action( 'do_all_pings', 'do_all_trackbacks', 10, 0 );
 
-		wp_disable_outgoing_pings_for_environment();
+		wp_maybe_disable_outgoing_pings_for_environment();
 
 		$this->assertFalse( has_action( 'do_all_pings', 'do_all_trackbacks' ) );
 	}
@@ -144,7 +144,7 @@ public function test_outgoing_generic_ping_removed_in_non_production() {
 
 		add_action( 'do_all_pings', 'generic_ping', 10, 0 );
 
-		wp_disable_outgoing_pings_for_environment();
+		wp_maybe_disable_outgoing_pings_for_environment();
 
 		$this->assertFalse( has_action( 'do_all_pings', 'generic_ping' ) );
 	}
@@ -157,9 +157,9 @@ public function test_enclosures_not_removed_in_non_production() {
 
 		add_action( 'do_all_pings', 'do_all_enclosures', 10, 0 );
 
-		wp_disable_outgoing_pings_for_environment();
+		wp_maybe_disable_outgoing_pings_for_environment();
 
-		$this->assertSame( 10, has_action( 'do_all_pings', 'do_all_enclosures' ) );
+		$this->assertTrue( has_action( 'do_all_pings', 'do_all_enclosures', 10 ) );
 	}
 
 	/**
@@ -172,18 +172,18 @@ public function test_outgoing_pings_preserved_in_production() {
 		add_action( 'do_all_pings', 'do_all_trackbacks', 10, 0 );
 		add_action( 'do_all_pings', 'generic_ping', 10, 0 );
 
-		wp_disable_outgoing_pings_for_environment();
+		wp_maybe_disable_outgoing_pings_for_environment();
 
-		$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.' );
+		$this->assertTrue( has_action( 'do_all_pings', 'do_all_pingbacks', 10 ), 'do_all_pingbacks should still be hooked at priority 10.' );
+		$this->assertTrue( has_action( 'do_all_pings', 'do_all_trackbacks', 10 ), 'do_all_trackbacks should still be hooked at priority 10.' );
+		$this->assertTrue( has_action( 'do_all_pings', 'generic_ping', 10 ), 'generic_ping should still be hooked at priority 10.' );
 	}
 
 	/**
 	 * @ticket 64837
 	 */
 	public function test_trackback_hook_is_registered() {
-		$this->assertSame( 10, has_action( 'pre_trackback_post', 'wp_disable_trackback_for_environment' ) );
+		$this->assertTrue( has_action( 'pre_trackback_post', 'wp_maybe_disable_trackback_for_environment', 10 ) );
 	}
 
 	/**
@@ -211,7 +211,7 @@ public function test_xmlrpc_pingback_removed_in_non_production() {
 			'wp.getUsersBlogs'                 => 'this:wp_getUsersBlogs',
 		);
 
-		$filtered = wp_disable_xmlrpc_pingback_for_environment( $methods );
+		$filtered = wp_maybe_disable_xmlrpc_pingback_for_environment( $methods );
 
 		$this->assertArrayNotHasKey( 'pingback.ping', $filtered );
 	}
@@ -227,7 +227,7 @@ public function test_xmlrpc_pingback_preserved_in_production() {
 			'wp.getUsersBlogs' => 'this:wp_getUsersBlogs',
 		);
 
-		$filtered = wp_disable_xmlrpc_pingback_for_environment( $methods );
+		$filtered = wp_maybe_disable_xmlrpc_pingback_for_environment( $methods );
 
 		$this->assertArrayHasKey( 'pingback.ping', $filtered );
 	}
@@ -245,7 +245,7 @@ public function test_xmlrpc_other_methods_preserved_in_non_production() {
 			'wp.getPost'                       => 'this:wp_getPost',
 		);
 
-		$filtered = wp_disable_xmlrpc_pingback_for_environment( $methods );
+		$filtered = wp_maybe_disable_xmlrpc_pingback_for_environment( $methods );
 
 		$this->assertArrayHasKey( 'pingback.extensions.getPingbacks', $filtered );
 		$this->assertArrayHasKey( 'wp.getUsersBlogs', $filtered );