stas Sun, 12 Dec 2010 22:38:05 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=306307
Log: add & fix tests for lenient parsing Changed paths: U php/php-src/trunk/ext/date/tests/bug51866.phpt A php/php-src/trunk/ext/date/tests/date-lenient-create.phpt A php/php-src/trunk/ext/date/tests/date-lenient.phpt Modified: php/php-src/trunk/ext/date/tests/bug51866.phpt =================================================================== --- php/php-src/trunk/ext/date/tests/bug51866.phpt 2010-12-12 22:28:12 UTC (rev 306306) +++ php/php-src/trunk/ext/date/tests/bug51866.phpt 2010-12-12 22:38:05 UTC (rev 306307) @@ -48,7 +48,7 @@ ["timezone_type"]=> int(3) ["timezone"]=> - string(13) "Europe/London" + string(%d) "%s" } array(4) { ["warning_count"]=> @@ -74,7 +74,7 @@ ["timezone_type"]=> int(3) ["timezone"]=> - string(13) "Europe/London" + string(%d) "%s" } array(4) { ["warning_count"]=> @@ -100,7 +100,7 @@ ["timezone_type"]=> int(3) ["timezone"]=> - string(13) "Europe/London" + string(%d) "%s" } array(4) { ["warning_count"]=> @@ -143,7 +143,7 @@ ["timezone_type"]=> int(3) ["timezone"]=> - string(13) "Europe/London" + string(%d) "%s" } array(4) { ["warning_count"]=> Added: php/php-src/trunk/ext/date/tests/date-lenient-create.phpt =================================================================== --- php/php-src/trunk/ext/date/tests/date-lenient-create.phpt (rev 0) +++ php/php-src/trunk/ext/date/tests/date-lenient-create.phpt 2010-12-12 22:38:05 UTC (rev 306307) @@ -0,0 +1,149 @@ +--TEST-- +Test for + character in date format +--FILE-- +<?php +$tz = new DateTimeZone("UTC"); +$date = "06/08/04 12:00"; +echo "==\n"; +print_r( date_create_from_format( 'm/d/y', $date , $tz) ); +print_r( date_get_last_errors() ); +echo "==\n"; +print_r( date_create_from_format( 'm/d/y+', $date , $tz)->setTime(0, 0) ); +print_r( date_get_last_errors() ); +echo "==\n"; +print_r( date_create_from_format( '+m/d/y', $date , $tz)->setTime(0, 0) ); +print_r( date_get_last_errors() ); +echo "==\n"; +print_r( date_create_from_format( 'm/d/y++', $date , $tz)->setTime(0, 0) ); +print_r( date_get_last_errors() ); +echo "==\n"; + +$date = "06/08/04"; +print_r( date_create_from_format( 'm/d/y+', $date , $tz)->setTime(0, 0) ); +print_r( date_get_last_errors() ); +echo "==\n"; +print_r( date_create_from_format( '+m/d/y', $date , $tz)->setTime(0, 0) ); +print_r( date_get_last_errors() ); +echo "==\n"; + +?> +--EXPECT-- +== +Array +( + [warning_count] => 0 + [warnings] => Array + ( + ) + + [error_count] => 1 + [errors] => Array + ( + [8] => Trailing data + ) + +) +== +DateTime Object +( + [date] => 2004-06-08 00:00:00 + [timezone_type] => 3 + [timezone] => UTC +) +Array +( + [warning_count] => 1 + [warnings] => Array + ( + [8] => Trailing data + ) + + [error_count] => 0 + [errors] => Array + ( + ) + +) +== +DateTime Object +( + [date] => 2004-06-08 00:00:00 + [timezone_type] => 3 + [timezone] => UTC +) +Array +( + [warning_count] => 1 + [warnings] => Array + ( + [8] => Trailing data + ) + + [error_count] => 0 + [errors] => Array + ( + ) + +) +== +DateTime Object +( + [date] => 2004-06-08 00:00:00 + [timezone_type] => 3 + [timezone] => UTC +) +Array +( + [warning_count] => 1 + [warnings] => Array + ( + [8] => Trailing data + ) + + [error_count] => 0 + [errors] => Array + ( + ) + +) +== +DateTime Object +( + [date] => 2004-06-08 00:00:00 + [timezone_type] => 3 + [timezone] => UTC +) +Array +( + [warning_count] => 0 + [warnings] => Array + ( + ) + + [error_count] => 0 + [errors] => Array + ( + ) + +) +== +DateTime Object +( + [date] => 2004-06-08 00:00:00 + [timezone_type] => 3 + [timezone] => UTC +) +Array +( + [warning_count] => 0 + [warnings] => Array + ( + ) + + [error_count] => 0 + [errors] => Array + ( + ) + +) +== Added: php/php-src/trunk/ext/date/tests/date-lenient.phpt =================================================================== --- php/php-src/trunk/ext/date/tests/date-lenient.phpt (rev 0) +++ php/php-src/trunk/ext/date/tests/date-lenient.phpt 2010-12-12 22:38:05 UTC (rev 306307) @@ -0,0 +1,146 @@ +--TEST-- +Test for + character in date format +--FILE-- +<?php +$date = "06/08/04 12:00"; +print_r( date_parse_from_format( 'm/d/y', $date ) ); +print_r( date_parse_from_format( 'm/d/y+', $date ) ); +print_r( date_parse_from_format( '+m/d/y', $date ) ); +print_r( date_parse_from_format( 'm/d/y++', $date ) ); + +$date = "06/08/04"; +print_r( date_parse_from_format( 'm/d/y+', $date ) ); +print_r( date_parse_from_format( '+m/d/y', $date ) ); + +?> +--EXPECT-- +Array +( + [year] => 2004 + [month] => 6 + [day] => 8 + [hour] => + [minute] => + [second] => + [fraction] => + [warning_count] => 0 + [warnings] => Array + ( + ) + + [error_count] => 1 + [errors] => Array + ( + [8] => Trailing data + ) + + [is_localtime] => +) +Array +( + [year] => 2004 + [month] => 6 + [day] => 8 + [hour] => + [minute] => + [second] => + [fraction] => + [warning_count] => 1 + [warnings] => Array + ( + [8] => Trailing data + ) + + [error_count] => 0 + [errors] => Array + ( + ) + + [is_localtime] => +) +Array +( + [year] => 2004 + [month] => 6 + [day] => 8 + [hour] => + [minute] => + [second] => + [fraction] => + [warning_count] => 1 + [warnings] => Array + ( + [8] => Trailing data + ) + + [error_count] => 0 + [errors] => Array + ( + ) + + [is_localtime] => +) +Array +( + [year] => 2004 + [month] => 6 + [day] => 8 + [hour] => + [minute] => + [second] => + [fraction] => + [warning_count] => 1 + [warnings] => Array + ( + [8] => Trailing data + ) + + [error_count] => 0 + [errors] => Array + ( + ) + + [is_localtime] => +) +Array +( + [year] => 2004 + [month] => 6 + [day] => 8 + [hour] => + [minute] => + [second] => + [fraction] => + [warning_count] => 0 + [warnings] => Array + ( + ) + + [error_count] => 0 + [errors] => Array + ( + ) + + [is_localtime] => +) +Array +( + [year] => 2004 + [month] => 6 + [day] => 8 + [hour] => + [minute] => + [second] => + [fraction] => + [warning_count] => 0 + [warnings] => Array + ( + ) + + [error_count] => 0 + [errors] => Array + ( + ) + + [is_localtime] => +)
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php