diff options
| author | Sergey Biryukov <sergeybiryukov@git.wordpress.org> | 2019-01-28 14:10:24 +0000 |
|---|---|---|
| committer | Sergey Biryukov <sergeybiryukov@git.wordpress.org> | 2019-01-28 14:10:24 +0000 |
| commit | 001c6498e891fe62e69963a4f02383f9ce57763f (patch) | |
| tree | 4750f8d976d0d61df313648826243c7f98c13614 /tests/phpunit/includes/testcase-canonical.php | |
| parent | 639f66aadeced5d3c764e0db947ed144017559c6 (diff) | |
| download | wordpress-001c6498e891fe62e69963a4f02383f9ce57763f.tar.gz wordpress-001c6498e891fe62e69963a4f02383f9ce57763f.zip | |
Build/Test Tools: Add support for PHPUnit 7.x.
* Create an abstract `WP_UnitTestCase_Base` class to share between PHPUnit 7.x and older versions.
* Add a speed-trap loader to determine which `SpeedTrapListener` class needs to be loaded for the current PHPUnit version.
* Remove unnecessary `PHPUnit\Util\Test` and `PHPUnit_Util_Getopt` inheritances.
* Update Travis CI config to use PHPUnit 7.x for PHP 7.1, 7.2, and nightly PHP versions.
Props jipmoors, netweb, desrosj, ayeshrajans, soulseekah, SergeyBiryukov.
See #43218.
git-svn-id: https://develop.svn.wordpress.org/trunk@44701 602fd350-edb4-49c9-b593-d223f7449a82
Diffstat (limited to 'tests/phpunit/includes/testcase-canonical.php')
| -rw-r--r-- | tests/phpunit/includes/testcase-canonical.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/phpunit/includes/testcase-canonical.php b/tests/phpunit/includes/testcase-canonical.php index 38a4a6f8f2..32da3eff54 100644 --- a/tests/phpunit/includes/testcase-canonical.php +++ b/tests/phpunit/includes/testcase-canonical.php @@ -236,7 +236,7 @@ class WP_Canonical_UnitTestCase extends WP_UnitTestCase { public function assertCanonical( $test_url, $expected, $ticket = 0, $expected_doing_it_wrong = array() ) { $this->expected_doing_it_wrong = array_merge( $this->expected_doing_it_wrong, (array) $expected_doing_it_wrong ); - $ticket_ref = ( $ticket > 0 ) ? 'Ticket #' . $ticket : null; + $ticket_ref = ( $ticket > 0 ) ? 'Ticket #' . $ticket : ''; if ( is_string( $expected ) ) { $expected = array( 'url' => $expected ); |