From: Xinchen Hui <laruence@php.net>
Date: Thu, 22 Mar 2012 09:17:42 +0000 (+0800)
Subject: Merge branch 'PHP-5.3' into PHP-5.4
X-Git-Tag: php-5.4.1RC1~44^2~8
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2dbced096a3c3bc88cb0017ec1c3c0ade19e7951;p=php

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
---

2dbced096a3c3bc88cb0017ec1c3c0ade19e7951
diff --cc ext/fileinfo/tests/finfo_open_error.phpt
index 80a6bfd637,aae229f777..6f5e79f293
--- a/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===