From da1db5e688c46a044bc0745c86cc34cc4e9ab808 Mon Sep 17 00:00:00 2001
From: Timm Friebe <thekid@thekid.de>
Date: Mon, 28 Apr 2014 21:44:24 +0200
Subject: [PATCH] Add tests for indirect calls to methods on non-objects
 http://news.php.net/php.internals/73823

---
 ...methods-on-non-objects-call-user-func.phpt | 13 ++++++
 Zend/tests/methods-on-non-objects-usort.phpt  | 43 +++++++++++++++++++
 2 files changed, 56 insertions(+)
 create mode 100644 Zend/tests/methods-on-non-objects-call-user-func.phpt
 create mode 100644 Zend/tests/methods-on-non-objects-usort.phpt

diff --git a/Zend/tests/methods-on-non-objects-call-user-func.phpt b/Zend/tests/methods-on-non-objects-call-user-func.phpt
new file mode 100644
index 00000000000..f76b7d43a09
--- /dev/null
+++ b/Zend/tests/methods-on-non-objects-call-user-func.phpt
@@ -0,0 +1,13 @@
+--TEST--
+call_user_func() in combination with "Call to a member function method() on a non-object"
+--FILE--
+<?php
+$comparator= null;
+var_dump(call_user_func([$comparator, 'compare'], 1, 2));
+echo "Alive\n";
+?>
+--EXPECTF--
+Warning: call_user_func() expects parameter 1 to be a valid callback, first array member is not a valid class name or object in %s on line %d
+NULL
+Alive
+
diff --git a/Zend/tests/methods-on-non-objects-usort.phpt b/Zend/tests/methods-on-non-objects-usort.phpt
new file mode 100644
index 00000000000..df702d3a9a5
--- /dev/null
+++ b/Zend/tests/methods-on-non-objects-usort.phpt
@@ -0,0 +1,43 @@
+--TEST--
+usort() in combination with "Call to a member function method() on a non-object"
+--FILE--
+<?php
+set_error_handler(function($code, $message) {
+  var_dump($code, $message);
+});
+
+$comparator= null;
+$list= [1, 4, 2, 3, -1];
+usort($list, function($a, $b) use ($comparator) {
+  return $comparator->compare($a, $b);
+});
+var_dump($list);
+echo "Alive\n";
+?>
+--EXPECTF--
+int(4096)
+string(51) "Call to a member function compare() on a non-object"
+int(4096)
+string(51) "Call to a member function compare() on a non-object"
+int(4096)
+string(51) "Call to a member function compare() on a non-object"
+int(4096)
+string(51) "Call to a member function compare() on a non-object"
+int(4096)
+string(51) "Call to a member function compare() on a non-object"
+int(4096)
+string(51) "Call to a member function compare() on a non-object"
+array(5) {
+  [0]=>
+  int(-1)
+  [1]=>
+  int(3)
+  [2]=>
+  int(2)
+  [3]=>
+  int(4)
+  [4]=>
+  int(1)
+}
+Alive
+