Support nested static calls

2 files changed, 24 insertions, 0 deletions

diff --git a/Zend/tests/methods-on-non-objects-nested-calls-static.phpt b/Zend/tests/methods-on-non-objects-nested-calls-static.phpt
new file mode 100755
index 0000000000..9e969b7d68
--- /dev/null
+++ b/Zend/tests/methods-on-non-objects-nested-calls-static.phpt
@@ -0,0 +1,22 @@
+--TEST--
+Catch method calls on non-objects with nested calls to static methods
+--FILE--
+<?php
+class Nesting {
+  static function nested() {
+    throw new LogicException('Should not be called');
+  }
+}
+set_error_handler(function($code, $message) {
+  static $i= 0;
+  echo 'Called #'.(++$i)."\n";
+});
+
+$x= null;
+var_dump($x->method(Nesting::nested()));
+echo "Alive\n";
+?>
+--EXPECTF--
+Called #1
+NULL
+Alive
diff --git a/Zend/tests/methods-on-non-objects-nested-calls.phpt b/Zend/tests/methods-on-non-objects-nested-calls.phpt
index 117e29f896..c92b0cb034 100644
--- a/Zend/tests/methods-on-non-objects-nested-calls.phpt
+++ b/Zend/tests/methods-on-non-objects-nested-calls.phpt
@@ -49,4 +49,6 @@ Called #10
 NULL
 Called #11
 NULL
+Called #12
+NULL
 Alive