Changeset 40536 for trunk/tests/phpunit/includes/testcase.php

Timestamp:

04/23/2017 02:05:12 AM (8 years ago)

Author:

johnbillion

Message:

Build/Test Tools: Add support for PHPUnit 6+.

This adds a compatibility shim for the new namespaced structure of PHPUnit and the removed setExpectedException() method. In addition, this updates the Travis config so PHPUnit 6.1 is used where appropriate.

Props miyauchi, gitlost.

Fixes #39822

File:

• trunk/tests/phpunit/includes/testcase.php (modified) (1 diff)

trunk/tests/phpunit/includes/testcase.php

@@ -414 +414 @@
     public function setExpectedIncorrectUsage( $doing_it_wrong ) {
         array_push( $this->expected_doing_it_wrong, $doing_it_wrong );
+    }
+
+    /**
+     * PHPUnit 6+ compatibility shim.
+     *
+     * @param mixed      $exception
+     * @param string     $message
+     * @param int|string $code
+     */
+    public function setExpectedException( $exception, $message = '', $code = null ) {
+        if ( is_callable( 'parent::setExpectedException' ) ) {
+            parent::setExpectedException( $exception, $message, $code );
+        } else {
+            $this->expectException( $exception );
+            if ( '' !== $message ) {
+                $this->expectExceptionMessage( $message );
+            }
+            if ( null !== $code ) {
+                $this->expectExceptionCode( $code );
+            }
+        }
     }