WordPress.org
Get WordPress

Make WordPress Core


Ignore:
Timestamp:
07/19/2021 02:00:11 PM (2 years 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/comment-submission.php

    r49603 r51462  
    441441        $this->assertNotWPError( $comment );
    442442        $this->assertInstanceOf( 'WP_Comment', $comment );
    443         $this->assertNotContains( '<script', $comment->comment_content );
     443        $this->assertStringNotContainsString( '<script', $comment->comment_content );
    444444
    445445    }
    … …  
    459459        $this->assertNotWPError( $comment );
    460460        $this->assertInstanceOf( 'WP_Comment', $comment );
    461         $this->assertNotContains( '<script', $comment->comment_content );
     461        $this->assertStringNotContainsString( '<script', $comment->comment_content );
    462462
    463463    }
    … …  
    483483        $this->assertNotWPError( $comment );
    484484        $this->assertInstanceOf( 'WP_Comment', $comment );
    485         $this->assertNotContains( '<script', $comment->comment_content );
     485        $this->assertStringNotContainsString( '<script', $comment->comment_content );
    486486
    487487    }
    … …  
    515515        $this->assertNotWPError( $comment );
    516516        $this->assertInstanceOf( 'WP_Comment', $comment );
    517         $this->assertContains( '<script', $comment->comment_content );
     517        $this->assertStringContainsString( '<script', $comment->comment_content );
    518518
    519519    }
    … …  
    539539        $this->assertNotWPError( $comment );
    540540        $this->assertInstanceOf( 'WP_Comment', $comment );
    541         $this->assertNotContains( '<script', $comment->comment_content );
     541        $this->assertStringNotContainsString( '<script', $comment->comment_content );
    542542
    543543    }
Note: See TracChangeset for help on using the changeset viewer.