Ticket #39822: 39822.4.patch

tests/phpunit/includes/bootstrap.php

@@ -3 +3 @@
  * Installs WordPress for running the tests and loads WordPress and the test libraries
  */
 
+/**
+ * Migration fixer for PHPUnit 6
+ */
+if ( class_exists( 'PHPUnit\Runner\Version' ) ) {
+        require_once dirname( __FILE__ ) . '/phpunit6-compat.php';
+}
 
 $config_file_path = dirname( dirname( __FILE__ ) );
 if ( ! file_exists( $config_file_path . '/wp-tests-config.php' ) ) {

tests/phpunit/includes/phpunit6-compat.php

@@ +1 @@
+<?php
+
+if ( class_exists( 'PHPUnit\Runner\Version' ) && version_compare( PHPUnit\Runner\Version::id(), '6.0', '>=' ) ) {
+        class_alias( 'PHPUnit\Framework\TestCase', 'PHPUnit_Framework_TestCase' );
+        class_alias( 'PHPUnit\Framework\Exception', 'PHPUnit_Framework_Exception' );
+        class_alias( 'PHPUnit\Framework\ExpectationFailedException', 'PHPUnit_Framework_ExpectationFailedException' );
+        class_alias( 'PHPUnit\Framework\Error\Notice', 'PHPUnit_Framework_Error_Notice' );
+        class_alias( 'PHPUnit\Framework\Test', 'PHPUnit_Framework_Test' );
+        class_alias( 'PHPUnit\Framework\Warning', 'PHPUnit_Framework_Warning' );
+        class_alias( 'PHPUnit\Framework\AssertionFailedError', 'PHPUnit_Framework_AssertionFailedError' );
+        class_alias( 'PHPUnit\Framework\TestSuite', 'PHPUnit_Framework_TestSuite' );
+        class_alias( 'PHPUnit\Framework\TestListener', 'PHPUnit_Framework_TestListener' );
+        class_alias( 'PHPUnit\Util\GlobalState', 'PHPUnit_Util_GlobalState' );
+        class_alias( 'PHPUnit\Util\Getopt', 'PHPUnit_Util_Getopt' );
+
+        class PHPUnit_Util_Test extends PHPUnit\Util\Test {
+                public static function getTickets( $className, $methodName ) {
+                        $annotations = self::parseTestMethodAnnotations(
+                        $className, $methodName
+                        );
+
+                        $tickets = array();
+
+                        if (isset($annotations['class']['ticket'])) {
+                                $tickets = $annotations['class']['ticket'];
+                        }
+
+                        if (isset($annotations['method']['ticket'])) {
+                                $tickets = array_merge($tickets, $annotations['method']['ticket']);
+                        }
+
+                        return array_unique($tickets);
+                }
+        }
+}

tests/phpunit/includes/testcase-ajax.php

@@ -200 +200 @@
                 if ( !empty( $buffer ) )
                         $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 );
+                        }
+                }
+        }
 }