Make WordPress Core


Ignore:
Timestamp:
07/19/2021 02:00:11 PM (6 months ago)
Author:
SergeyBiryukov
Message:

Tests: Replace assertContains() with assertStringContainsString() when used with strings.

Using the assertContains() and assertNotContains() methods with string haystacks was deprecated in PHPUnit 8 and removed in PHPUnit 9.

While WordPress test suite currently only supports PHPUnit up to 7.5.x, this allows us to switch to newer assertions ahead of adding full support for PHPUnit 8+.

These methods introduced in PHPUnit 7.5 should be used as an alternative:

  • assertStringContainsString()
  • assertStringContainsStringIgnoringCase
  • assertStringNotContainsString()
  • assertStringNotContainsStringIgnoringCase

As WordPress currently uses PHPUnit 5.7.x to run tests on PHP 5.6, polyfills for these methods were added to the WP_UnitTestCase class for PHPUnit < 7.5.

Follow-up to [51331], [51451], [51461].

Props jrf, dd32, SergeyBiryukov.
See #53363, #46149.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/tests/phpunit/tests/rest-api/rest-users-controller.php

    r51461 r51462  
    323323        );
    324324        $this->assertStringNotContainsString( 'rel="prev"', $headers['Link'] );
    325         $this->assertContains( '<' . $next_link . '>; rel="next"', $headers['Link'] );
     325        $this->assertStringContainsString( '<' . $next_link . '>; rel="next"', $headers['Link'] );
    326326
    327327        // 3rd page.
     
    341341            rest_url( 'wp/v2/users' )
    342342        );
    343         $this->assertContains( '<' . $prev_link . '>; rel="prev"', $headers['Link'] );
     343        $this->assertStringContainsString( '<' . $prev_link . '>; rel="prev"', $headers['Link'] );
    344344        $next_link = add_query_arg(
    345345            array(
     
    348348            rest_url( 'wp/v2/users' )
    349349        );
    350         $this->assertContains( '<' . $next_link . '>; rel="next"', $headers['Link'] );
     350        $this->assertStringContainsString( '<' . $next_link . '>; rel="next"', $headers['Link'] );
    351351
    352352        // Last page.
     
    363363            rest_url( 'wp/v2/users' )
    364364        );
    365         $this->assertContains( '<' . $prev_link . '>; rel="prev"', $headers['Link'] );
     365        $this->assertStringContainsString( '<' . $prev_link . '>; rel="prev"', $headers['Link'] );
    366366        $this->assertStringNotContainsString( 'rel="next"', $headers['Link'] );
    367367
     
    379379            rest_url( 'wp/v2/users' )
    380380        );
    381         $this->assertContains( '<' . $prev_link . '>; rel="prev"', $headers['Link'] );
     381        $this->assertStringContainsString( '<' . $prev_link . '>; rel="prev"', $headers['Link'] );
    382382        $this->assertStringNotContainsString( 'rel="next"', $headers['Link'] );
    383383    }
     
    412412        );
    413413        $headers   = $response->get_headers();
    414         $this->assertContains( '<' . $prev_link . '>; rel="prev"', $headers['Link'] );
     414        $this->assertStringContainsString( '<' . $prev_link . '>; rel="prev"', $headers['Link'] );
    415415    }
    416416
Note: See TracChangeset for help on using the changeset viewer.