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

diff --cc ext/fileinfo/tests/finfo_open_error.phpt
index 80a6bfd637e8ba1a713e1452d3a1a8d03b614d5d,aae229f777c18c403b20c498ec7aa5c901d835dc..6f5e79f2930eb0e224648939a84aaafd68e1a370
--- 1/ext/fileinfo/tests/finfo_open_error.phpt
--- 2/ext/fileinfo/tests/finfo_open_error.phpt
+++ b/ext/fileinfo/tests/finfo_open_error.phpt
@@@ -43,10 -37,9 +43,9 @@@ bool(false
  Notice: finfo_open(): Warning: using regular magic file `%s' in %s on line %d
  resource(%d) of type (file_info)
  
 -Warning: finfo_open() expects parameter 1 to be long, %unicode_string_optional% given in %s on line %d
 +Warning: finfo_open() expects parameter 1 to be long, string given in %s on line %d
  bool(false)
  
 -Warning: finfo::finfo() expects parameter 1 to be long, %unicode_string_optional% given in %s on line %d
 +Warning: finfo::finfo() expects parameter 1 to be long, string given in %s on line %d
- object(finfo)#%d (%d) {
- }
+ NULL
  ===DONE===