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 /Zend/tests/objects_022.phpt | |
| 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 'Zend/tests/objects_022.phpt')
| -rw-r--r-- | Zend/tests/objects_022.phpt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Zend/tests/objects_022.phpt b/Zend/tests/objects_022.phpt index 913de7d990..01f961bae1 100644 --- a/Zend/tests/objects_022.phpt +++ b/Zend/tests/objects_022.phpt @@ -38,6 +38,6 @@ object(baz)#%d (0) { Fatal error: Uncaught TypeError: Argument 1 passed to foo::testFoo() must be an instance of foo, instance of stdClass given, called in %s on line %d and defined in %s:%d Stack trace: -#0 %s(%d): foo->testFoo() +#0 %s(%d): foo->testFoo(Object(stdClass)) #1 {main} thrown in %s on line %d |