diff options
| author | Aaron Piotrowski <aaron@trowski.com> | 2015-06-14 18:53:11 -0500 |
|---|---|---|
| committer | Aaron Piotrowski <aaron@trowski.com> | 2015-06-14 18:53:11 -0500 |
| commit | 110e0a5a2cda3bfa7778bb871502ff2b50e59f76 (patch) | |
| tree | fa736924b4befce442cc72429b4e07812856c541 /tests/lang | |
| parent | 5c54bf015dc4fd930394709d80665d9a731f6f99 (diff) | |
| parent | 6cb7b48846d129f088b50c4a8c4b00b7dc886f5c (diff) | |
| download | php-git-110e0a5a2cda3bfa7778bb871502ff2b50e59f76.tar.gz | |
Merge branch 'master' into throwable-interface
# Conflicts:
# Zend/zend_language_scanner.c
# Zend/zend_language_scanner.l
# ext/simplexml/tests/SimpleXMLElement_xpath.phpt
Diffstat (limited to 'tests/lang')
| -rw-r--r-- | tests/lang/bug24658.phpt | 2 | ||||
| -rw-r--r-- | tests/lang/catchable_error_001.phpt | 2 | ||||
| -rw-r--r-- | tests/lang/string/unicode_escape_incomplete.phpt | 2 | ||||
| -rw-r--r-- | tests/lang/type_hints_001.phpt | 2 |
4 files changed, 4 insertions, 4 deletions
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 |