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/query/noFoundRows.php

    r46586 r51462  
    1212        );
    1313
    14         $this->assertContains( 'SQL_CALC_FOUND_ROWS', $q->request );
     14        $this->assertStringContainsString( 'SQL_CALC_FOUND_ROWS', $q->request );
    1515    }
    1616
     
    2323        );
    2424
    25         $this->assertContains( 'SQL_CALC_FOUND_ROWS', $q->request );
     25        $this->assertStringContainsString( 'SQL_CALC_FOUND_ROWS', $q->request );
    2626    }
    2727
     
    3434        );
    3535
    36         $this->assertContains( 'SQL_CALC_FOUND_ROWS', $q->request );
     36        $this->assertStringContainsString( 'SQL_CALC_FOUND_ROWS', $q->request );
    3737    }
    3838
     
    4545        );
    4646
    47         $this->assertContains( 'SQL_CALC_FOUND_ROWS', $q->request );
     47        $this->assertStringContainsString( 'SQL_CALC_FOUND_ROWS', $q->request );
    4848    }
    4949
     
    5656        );
    5757
    58         $this->assertNotContains( 'SQL_CALC_FOUND_ROWS', $q->request );
     58        $this->assertStringNotContainsString( 'SQL_CALC_FOUND_ROWS', $q->request );
    5959    }
    6060
     
    6767        );
    6868
    69         $this->assertNotContains( 'SQL_CALC_FOUND_ROWS', $q->request );
     69        $this->assertStringNotContainsString( 'SQL_CALC_FOUND_ROWS', $q->request );
    7070    }
    7171
     
    8383        );
    8484
    85         $this->assertNotContains( 'SQL_CALC_FOUND_ROWS', $q->request );
     85        $this->assertStringNotContainsString( 'SQL_CALC_FOUND_ROWS', $q->request );
    8686        $this->assertSame( 1, $q->found_posts );
    8787    }
     
    100100        );
    101101
    102         $this->assertNotContains( 'SQL_CALC_FOUND_ROWS', $q->request );
     102        $this->assertStringNotContainsString( 'SQL_CALC_FOUND_ROWS', $q->request );
    103103        $this->assertSame( 1, $q->found_posts );
    104104    }
Note: See TracChangeset for help on using the changeset viewer.