WordPress.org

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-comments-controller.php

    r51461 r51462  
    823823        );
    824824        $this->assertStringNotContainsString( 'rel="prev"', $headers['Link'] );
    825         $this->assertContains( '<' . $next_link . '>; rel="next"', $headers['Link'] );
     825        $this->assertStringContainsString( '<' . $next_link . '>; rel="next"', $headers['Link'] );
    826826
    827827        // 3rd page.
     
    845845            rest_url( '/wp/v2/comments' )
    846846        );
    847         $this->assertContains( '<' . $prev_link . '>; rel="prev"', $headers['Link'] );
     847        $this->assertStringContainsString( '<' . $prev_link . '>; rel="prev"', $headers['Link'] );
    848848        $next_link = add_query_arg(
    849849            array(
     
    852852            rest_url( '/wp/v2/comments' )
    853853        );
    854         $this->assertContains( '<' . $next_link . '>; rel="next"', $headers['Link'] );
     854        $this->assertStringContainsString( '<' . $next_link . '>; rel="next"', $headers['Link'] );
    855855
    856856        // Last page.
     
    867867            rest_url( '/wp/v2/comments' )
    868868        );
    869         $this->assertContains( '<' . $prev_link . '>; rel="prev"', $headers['Link'] );
     869        $this->assertStringContainsString( '<' . $prev_link . '>; rel="prev"', $headers['Link'] );
    870870        $this->assertStringNotContainsString( 'rel="next"', $headers['Link'] );
    871871
     
    883883            rest_url( '/wp/v2/comments' )
    884884        );
    885         $this->assertContains( '<' . $prev_link . '>; rel="prev"', $headers['Link'] );
     885        $this->assertStringContainsString( '<' . $prev_link . '>; rel="prev"', $headers['Link'] );
    886886        $this->assertStringNotContainsString( 'rel="next"', $headers['Link'] );
    887887    }
Note: See TracChangeset for help on using the changeset viewer.