johannes Mon, 25 Jan 2010 14:07:05 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=293981
Log: merge -r292574: - Update tests to reflect current behavior after fix for bug #50185 (srinatar) Bug: http://bugs.php.net/50185 (Closed) ldap_get_entries() return false instead of an empty array when there is no error Changed paths: _U php/php-src/branches/PHP_5_3_2/ U php/php-src/branches/PHP_5_3_2/ext/ldap/tests/ldap_get_entries_variation.phpt U php/php-src/branches/PHP_5_3_2/ext/ldap/tests/ldap_mod_del_basic.phpt _U php/php-src/branches/PHP_5_3_2/ext/tidy/tests/ _U php/php-src/branches/PHP_5_3_2/tests/security/open_basedir_parse_ini_file.phpt Property changes on: php/php-src/branches/PHP_5_3_2 ___________________________________________________________________ Modified: svn:mergeinfo - /php/php-src/branches/PHP_5_3:292504 /php/php-src/trunk:284726 + /php/php-src/branches/PHP_5_3:292504,292574 /php/php-src/trunk:284726 Modified: php/php-src/branches/PHP_5_3_2/ext/ldap/tests/ldap_get_entries_variation.phpt =================================================================== --- php/php-src/branches/PHP_5_3_2/ext/ldap/tests/ldap_get_entries_variation.phpt 2010-01-25 14:02:09 UTC (rev 293980) +++ php/php-src/branches/PHP_5_3_2/ext/ldap/tests/ldap_get_entries_variation.phpt 2010-01-25 14:07:05 UTC (rev 293981) @@ -29,5 +29,8 @@ remove_dummy_data($link); ?> --EXPECT-- -NULL +array(1) { + ["count"]=> + int(0) +} ===DONE=== Modified: php/php-src/branches/PHP_5_3_2/ext/ldap/tests/ldap_mod_del_basic.phpt =================================================================== --- php/php-src/branches/PHP_5_3_2/ext/ldap/tests/ldap_mod_del_basic.phpt 2010-01-25 14:02:09 UTC (rev 293980) +++ php/php-src/branches/PHP_5_3_2/ext/ldap/tests/ldap_mod_del_basic.phpt 2010-01-25 14:07:05 UTC (rev 293981) @@ -36,5 +36,8 @@ ?> --EXPECT-- bool(true) -NULL +array(1) { + ["count"]=> + int(0) +} ===DONE=== Property changes on: php/php-src/branches/PHP_5_3_2/ext/tidy/tests ___________________________________________________________________ Modified: svn:mergeinfo - /php/php-src/trunk/ext/tidy/tests:284726,287798-287941 + /php/php-src/branches/PHP_5_3/ext/tidy/tests:292562,292566,292571,292574 /php/php-src/trunk/ext/tidy/tests:284726,287798-287941 Property changes on: php/php-src/branches/PHP_5_3_2/tests/security/open_basedir_parse_ini_file.phpt ___________________________________________________________________ Modified: svn:mergeinfo - /php/php-src/trunk/tests/security/open_basedir_parse_ini_file.phpt:265951 + /php/php-src/branches/PHP_5_3/tests/security/open_basedir_parse_ini_file.phpt:292562,292566,292571,292574 /php/php-src/trunk/tests/security/open_basedir_parse_ini_file.phpt:265951
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
