Changeset 51576

Timestamp:

08/07/2021 11:52:05 AM (2 months ago)

Author:

SergeyBiryukov

Message:

Tests: Replace expectException() for PHP native errors with calls to the dedicated PHPUnit 8.4+ methods.

The old manner of testing these is soft deprecated as of PHPUnit 8.4, hard deprecated as of PHPUnit 9.0 and will be removed in PHPUnit 10.0.

Most calls like this were already replaced in [51563], however, this particular one could not be changed yet due to the mismatch between the PHPUnit version and the PHP version on which the tests were being run. This is fixed now.

References:

• ​https://github.com/sebastianbergmann/phpunit/blob/8.4.3/ChangeLog-8.4.md#840---2019-10-04
• ​https://github.com/sebastianbergmann/phpunit/issues/3775

Follow-up to [51559-51575].

Props jrf.
See #46149.

File:

• trunk/tests/phpunit/tests/dependencies/scripts.php (modified) (1 diff)

trunk/tests/phpunit/tests/dependencies/scripts.php

@@ -1427 +1427 @@
                 $this->expectWarning();
             } else {
-                /*
-                 * As this exception will only be set on PHP 8 in combination with PHPUnit 7, this will work (for now).
-                 * Once the PHPUnit version constraints have been widened and a _supported_ PHPUnit version is
-                 * used to run the tests on PHP 8.x, this should be changed to `$this->expectError()`.
-                 */
-                $this->expectException( 'Error' );
+                $this->expectError();
             }
         }