Changeset 63303

Timestamp:

08/15/2026 11:40:37 PM (17 hours ago)

Author:

SergeyBiryukov

Message:

Tests: Use the modern PHPUnit stubbing and matcher shorthands.

Two test cases still used the legacy PHPUnit stub API. This replaces them with the modern shorthands, which are what the rest of the suite already uses.

tests/phpunit/tests/pomo/pluralForms.php

// Before
->will( $this->returnValue( 1 ) );
// After
->willReturn( 1 );

tests/phpunit/tests/rest-api/rest-server.php

// Before
->with( $this->equalTo( 400 ) );
// After
->with( 400 );

Why this is safe

willReturn() is a direct shorthand for will( $this->returnValue() ) and has been available since PHPUnit 5.4. The test suite enforces a minimum of PHPUnit 5.7.21 in tests/phpunit/includes/bootstrap.php, so it is safe on every supported version, and the suite already contains 83 willReturn() calls.

with() wraps any non-Constraint argument in an equalTo() constraint itself, so passing 400 directly is identical in behaviour. The suite already has 43 with() calls that pass values directly.

Note on the first change: that line was originally written as willReturn( 1 ) and switched to the long form in r41725 because of the PHPUnit versions supported back then. That constraint no longer applies, so this effectively reverts an obsolete workaround.

Developed in ​https://github.com/WordPress/wordpress-develop/pull/13052.

Follow-up to r34928, r41725.

Props Soean.
See #65819.

Location:

trunk/tests/phpunit/tests

Files:

• pomo/pluralForms.php (modified) (1 diff)
• rest-api/rest-server.php (modified) (1 diff)

trunk/tests/phpunit/tests/pomo/pluralForms.php

@@ -234 +234 @@
                         ->method( 'execute' )
                         ->with( $this->identicalTo( 2 ) )
-                        ->will( $this->returnValue( 1 ) );
+                        ->willReturn( 1 );
 
                 $first  = $mock->get( 2 );

trunk/tests/phpunit/tests/rest-api/rest-server.php

@@ -653 +653 @@
                 $stub->expects( $this->once() )
                         ->method( 'set_status' )
-                        ->with( $this->equalTo( 400 ) );
+                        ->with( 400 );
 
                 $data     = array(