Merge branch 'master' into throwable-interface

# Conflicts:
#	Zend/zend_language_scanner.c
#	Zend/zend_language_scanner.l
#	ext/simplexml/tests/SimpleXMLElement_xpath.phpt

10 files changed, 8 insertions, 40 deletions

diff --git a/tests/basic/bug51709_1.phpt b/tests/basic/bug51709_1.phpt
deleted file mode 100644
index 3f2d544e54..0000000000
--- a/tests/basic/bug51709_1.phpt
+++ /dev/null
@@ -1,16 +0,0 @@
---TEST--
-Bug #51709 (Can't use keywords as method names)
---FILE--
-<?php
-
-class foo {
-        static function for() {
-                echo "1";
-        }
-}
-
-?>
-===DONE===
-<?php exit(0); ?>
---EXPECTF--
-Parse error: syntax error, unexpected %s, expecting %s in %sbug51709_1.php on line %d
diff --git a/tests/basic/bug51709_2.phpt b/tests/basic/bug51709_2.phpt
deleted file mode 100644
index bb1f91cc4c..0000000000
--- a/tests/basic/bug51709_2.phpt
+++ /dev/null
@@ -1,16 +0,0 @@
---TEST--
-Bug #51709 (Can't use keywords as method names)
---FILE--
-<?php
-
-class foo {
-        static function goto() {
-                echo "1";
-        }
-}
-
-?>
-===DONE===
-<?php exit(0); ?>
---EXPECTF--
-Parse error: syntax error, unexpected %s, expecting %s in %sbug51709_2.php on line %d
diff --git a/tests/classes/autoload_009.phpt b/tests/classes/autoload_009.phpt
index 51d3e8f791..150f3ec201 100644
--- a/tests/classes/autoload_009.phpt
+++ b/tests/classes/autoload_009.phpt
@@ -16,6 +16,6 @@ Ensure type hints for unknown types do not trigger autoload.
 --EXPECTF--
 Fatal error: Uncaught TypeError: Argument 1 passed to f() must be an instance of UndefClass, instance of stdClass given, called in %s on line %d and defined in %s:%d
 Stack trace:
-#0 %s(%d): f()
+#0 %s(%d): f(Object(stdClass))
 #1 {main}
   thrown in %s on line %d
diff --git a/tests/classes/type_hinting_001.phpt b/tests/classes/type_hinting_001.phpt
index d9412293e9..28d1280b79 100644
--- a/tests/classes/type_hinting_001.phpt
+++ b/tests/classes/type_hinting_001.phpt
@@ -37,6 +37,6 @@ $a->b($b);
 
 Fatal error: Uncaught TypeError: Argument 1 passed to FooBar::a() must implement interface Foo, instance of Blort given, called in %s on line 27 and defined in %s:12
 Stack trace:
-#0 %s(%d): FooBar->a()
+#0 %s(%d): FooBar->a(Object(Blort))
 #1 {main}
   thrown in %s on line 12
diff --git a/tests/classes/type_hinting_002.phpt b/tests/classes/type_hinting_002.phpt
index 7486824d50..6fefcc8dd4 100644
--- a/tests/classes/type_hinting_002.phpt
+++ b/tests/classes/type_hinting_002.phpt
@@ -15,6 +15,6 @@ $o->a($o);
 --EXPECTF--
 Fatal error: Uncaught TypeError: Argument 1 passed to Foo::a() must be an instance of NonExisting, instance of Foo given, called in %s on line %d and defined in %s:%d
 Stack trace:
-#0 %s(%d): Foo->a()
+#0 %s(%d): Foo->a(Object(Foo))
 #1 {main}
   thrown in %s on line %d
diff --git a/tests/classes/type_hinting_003.phpt b/tests/classes/type_hinting_003.phpt
index 6038f25a50..50de31e44b 100644
--- a/tests/classes/type_hinting_003.phpt
+++ b/tests/classes/type_hinting_003.phpt
@@ -59,6 +59,6 @@ array(1) {
 
 Fatal error: Uncaught TypeError: Argument 1 passed to Test::f1() must be of the type array, integer given, called in %s on line %d and defined in %s:%d
 Stack trace:
-#0 %s(%d): Test::f1()
+#0 %s(%d): Test::f1(1)
 #1 {main}
   thrown in %s on line %d
diff --git a/tests/lang/bug24658.phpt b/tests/lang/bug24658.phpt
index 6229d52a64..b089569d91 100644
--- a/tests/lang/bug24658.phpt
+++ b/tests/lang/bug24658.phpt
@@ -55,7 +55,7 @@ object(foo)#%d (0) {
 
 Fatal error: Uncaught TypeError: Argument 1 passed to typehint() must be an instance of foo, integer given in %s:%d
 Stack trace:
-#0 [internal function]: typehint(1)
+#0 [internal function]: typehint(1, 1)
 #1 %s(%d): array_walk(Array, 'typehint')
 #2 {main}
   thrown in %s on line %d
diff --git a/tests/lang/catchable_error_001.phpt b/tests/lang/catchable_error_001.phpt
index e63e0d7ccc..b11a7c8d96 100644
--- a/tests/lang/catchable_error_001.phpt
+++ b/tests/lang/catchable_error_001.phpt
@@ -21,6 +21,6 @@ Catchable fatal error [1]
 --EXPECTF--
 Fatal error: Uncaught TypeError: Argument 1 passed to blah() must be an instance of Foo, instance of stdClass given, called in %scatchable_error_001.php on line 15 and defined in %scatchable_error_001.php:5
 Stack trace:
-#0 %s(%d): blah()
+#0 %s(%d): blah(Object(stdClass))
 #1 {main}
   thrown in %scatchable_error_001.php on line 5
diff --git a/tests/lang/string/unicode_escape_incomplete.phpt b/tests/lang/string/unicode_escape_incomplete.phpt
index b5baeffd6e..169e6a278c 100644
--- a/tests/lang/string/unicode_escape_incomplete.phpt
+++ b/tests/lang/string/unicode_escape_incomplete.phpt
@@ -3,6 +3,6 @@ Invalid Unicode escape sequence: Incomplete
 --FILE--
 <?php
 
-var_dunp("\u{blah");
+var_dump("\u{blah");
 --EXPECTF--
 Parse error: Invalid UTF-8 codepoint escape sequence in %s on line %d
diff --git a/tests/lang/type_hints_001.phpt b/tests/lang/type_hints_001.phpt
index d487a86a79..e8a2ffa9e3 100644
--- a/tests/lang/type_hints_001.phpt
+++ b/tests/lang/type_hints_001.phpt
@@ -25,6 +25,6 @@ type_hint_foo($bar);
 
 Fatal error: Uncaught TypeError: Argument 1 passed to type_hint_foo() must be an instance of Foo, instance of Bar given, called in %s on line 16 and defined in %s:9
 Stack trace:
-#0 %s(%d): type_hint_foo()
+#0 %s(%d): type_hint_foo(Object(Bar))
 #1 {main}
   thrown in %s on line 9