Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3: Fix test, which was broken by the fix for #61173 Conflicts: ext/fileinfo/tests/finfo_open_error.phpt
kpx-dev · Mar 22, 2012 · 2dbced0 · 2dbced0
2 parents c0e9767 + e96a172
commit 2dbced0
Showing 1 changed file with 1 addition and 2 deletions.
diff --git a/ext/fileinfo/tests/finfo_open_error.phpt b/ext/fileinfo/tests/finfo_open_error.phpt
@@ -47,6 +47,5 @@ Warning: finfo_open() expects parameter 1 to be long, string given in %s on line
 bool(false)
 
 Warning: finfo::finfo() expects parameter 1 to be long, string given in %s on line %d
-object(finfo)#%d (%d) {
-}
+NULL
 ===DONE===