Changeset 40536

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

Location:

trunk

Files:

• .travis.yml (modified) (1 diff)
• tests/phpunit/includes/bootstrap.php (modified) (1 diff)
• tests/phpunit/includes/phpunit6-compat.php (added)
• tests/phpunit/includes/testcase.php (modified) (1 diff)

trunk/.travis.yml ¶

@@ -68 +68 @@
   if [[ "$WP_TRAVISCI" == "travis:phpunit" ]]; then
     case "$TRAVIS_PHP_VERSION" in
-      7.1|7.0|hhvm|nightly)
+      7.1|7.0|nightly)
+        echo "Using PHPUnit 6.1"
+        composer global require "phpunit/phpunit=6.1.*"
+        ;;
+      hhvm)
         echo "Using PHPUnit 5.7"
         composer global require "phpunit/phpunit=5.7.*"

trunk/tests/phpunit/includes/bootstrap.php ¶

@@ -4 +4 @@
  */
 
+/**
+ * Compatibility with PHPUnit 6+
+ */
+if ( class_exists( 'PHPUnit\Runner\Version' ) ) {
+    require_once dirname( __FILE__ ) . '/phpunit6-compat.php';
+}
 
 $config_file_path = dirname( dirname( __FILE__ ) );

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 );
+            }
+        }
     }