Changeset 40876 for branches/4.7

Timestamp:

06/05/2017 10:41:02 AM (8 years ago)

Author:

johnbillion

Message:

Build/Test Tools: Fix PHP 5.2 compatibility for grandchild methods which expect exceptions to be raised.

This is due to is_callable( 'parent::setExpectedException' ) not being supported on PHP 5.2 when the method being checked only exists on the grandparent class.

See #39822

Merges [40872] and [40873] to the 4.7 branch.

Location:

branches/4.7

Files:

• . (modified) (1 prop)
• tests/phpunit/includes/testcase-ajax.php (modified) (1 diff)
• tests/phpunit/includes/testcase.php (modified) (1 diff)

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

branches/4.7/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 ( method_exists( 'PHPUnit_Framework_TestCase', 'setExpectedException' ) ) {
+            parent::setExpectedException( $exception, $message, $code );
+        } else {
+            $this->expectException( $exception );
+            if ( '' !== $message ) {
+                $this->expectExceptionMessage( $message );
+            }
+            if ( null !== $code ) {
+                $this->expectExceptionCode( $code );
+            }
+        }
     }