Changeset 40547

Timestamp:

04/24/2017 12:37:19 AM (7 years ago)

Author:

johnbillion

Message:

Build/Test Tools: Backport various recent changes to the 4.7 branch.

• Add support for PHPUnit 6+.
• Add Composer files to the cache on Travis.
• Remove HHVM from the test infrastructure on Travis.

Merges [40536], [40538], [40539], and [40546] to the 4.7 branch.

See #40539
Fixes #39822, #40548

Location:

branches/4.7

Files:

• . (modified) (1 prop)
• .travis.yml (modified) (5 diffs)
• tests/phpunit/includes/bootstrap.php (modified) (1 diff)
• tests/phpunit/includes/phpunit6-compat.php (copied) (copied from trunk/tests/phpunit/includes/phpunit6-compat.php)
• tests/phpunit/includes/testcase-ajax.php (modified) (1 diff)

branches/4.7/.travis.yml

@@ -5 +5 @@
   directories:
     - node_modules
+    - vendor
+    - $HOME/.composer/cache
 env:
   global:
@@ -22 +24 @@
   - php: 5.3
   - php: 5.2
-  - php: hhvm
-    sudo: required
-    dist: trusty
-    group: edge
-    addons:
-      apt:
-        packages:
-        - mysql-server-5.6
-        - mysql-client-core-5.6
-        - mysql-client-5.6
   - php: nightly
   allow_failures:
-  - php: hhvm
   - php: nightly
 before_install:
@@ -53 +44 @@
 before_script:
 - |
-  # Remove Xdebug for a huge performance increase, but not from nightly or hhvm:
+  # Remove Xdebug for a huge performance increase, but not from nightly:
   stable='^[0-9\.]+$'
   if [[ "$TRAVIS_PHP_VERSION" =~ $stable ]]; then
@@ -68 +59 @@
   if [[ "$WP_TRAVISCI" == "travis:phpunit" ]]; then
     case "$TRAVIS_PHP_VERSION" in
-      7.1|7.0|hhvm|nightly)
-        echo "Using PHPUnit 5.7"
-        composer global require "phpunit/phpunit=5.7.*"
+      7.1|7.0|nightly)
+        echo "Using PHPUnit 6.1"
+        composer global require "phpunit/phpunit=6.1.*"
         ;;
       5.6|5.5|5.4|5.3)
@@ -95 +86 @@
 - phpenv versions
 - php --version
-- |
-  # Debug PHP extensions, but not on HHVM because the command hangs indefinitely:
-  if [[ "$TRAVIS_PHP_VERSION" != 'hhvm' ]]; then
-    php -m
-  fi
+- php -m
 - npm --version
 - node --version

branches/4.7/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__ ) );

branches/4.7/tests/phpunit/includes/testcase-ajax.php

@@ -201 +201 @@
             $this->_last_response = $buffer;
     }
+
+    /**
+     * 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 );
+            }
+        }
+    }
 }