Closes sebastianbergmann#510.

joncave · Feb 27, 2012 · 03d7002 · 03d7002
1 parent 601cb79
commit 03d7002
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/ChangeLog.markdown b/ChangeLog.markdown
@@ -6,6 +6,7 @@ This is the list of changes for the PHPUnit 3.6 release series.
 PHPUnit 3.6.11
 --------------
 
+* Fixed #510: PHP 5.4 `callable` type hint raises `E_NOTICE` when object is mocked.
 * Fixed phpunit-selenium #72: Allow Selenium to have tests that have no concrete test methods.
 
 PHPUnit 3.6.10

diff --git a/PHPUnit/Util/Class.php b/PHPUnit/Util/Class.php
@@ -153,7 +153,14 @@ public static function getMethodParameters($method, $forCall = FALSE)
             if (!$forCall) {
                 if ($parameter->isArray()) {
                     $typeHint = 'array ';
-                } else {
+                }
+
+                else if (version_compare(PHP_VERSION, '5.4', '>') &&
+                         $parameter->isCallable()) {
+                    $typeHint = 'callable ';
+                }
+
+                else {
                     try {
                         $class = $parameter->getClass();
                     }