Merge branch 'PHP-5.5' into PHP-5.6

Author: laruence

Zend/tests/bug69212.phpt

@@ -21,7 +21,23 @@ try {
     echo "Caught!\n";
 }
 
+try {
+	$f = function () {};
+	$f->__invoke(do_throw());
+} catch (Exception $e) {
+	echo "Caught!\n";
+}
+
+try {
+	$t = new Test;
+	$f->__invoke($t->bar(Test::foo(do_throw())));
+} catch (Exception $e) {
+	echo "Caught!\n";
+}
+
 ?>
 --EXPECT--
 Caught!
 Caught!
+Caught!
+Caught!