danielc Tue, 13 Sep 2011 20:31:02 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=316685
Log: Separate test for %a is no longer needed. Changed paths: U php/php-src/branches/PHP_5_4/ext/date/tests/DateInterval_format.phpt D php/php-src/branches/PHP_5_4/ext/date/tests/DateInterval_format_a.phpt U php/php-src/trunk/ext/date/tests/DateInterval_format.phpt D php/php-src/trunk/ext/date/tests/DateInterval_format_a.phpt Modified: php/php-src/branches/PHP_5_4/ext/date/tests/DateInterval_format.phpt =================================================================== --- php/php-src/branches/PHP_5_4/ext/date/tests/DateInterval_format.phpt 2011-09-13 20:25:15 UTC (rev 316684) +++ php/php-src/branches/PHP_5_4/ext/date/tests/DateInterval_format.phpt 2011-09-13 20:31:02 UTC (rev 316685) @@ -1,8 +1,5 @@ --TEST-- -DateInterval::format(), except %a ---DESCRIPTION-- -%a is covered in a separate test. -Don't want an XFAIL here to cause confusion if a real bug comes up. +DateInterval::format() --CREDITS-- Daniel Convissor <dani...@php.net> # TestFest 2010 BKTK @@ -32,6 +29,7 @@ echo $interval->format('i=%i') . "\n"; echo $interval->format('s=%s') . "\n"; echo $interval->format('r=%r') . "\n"; +echo $interval->format('a=%a') . "\n"; echo "\n"; @@ -63,6 +61,7 @@ i=5 s=6 r= +a=428 inverted R=- inverted r=- Deleted: php/php-src/branches/PHP_5_4/ext/date/tests/DateInterval_format_a.phpt =================================================================== --- php/php-src/branches/PHP_5_4/ext/date/tests/DateInterval_format_a.phpt 2011-09-13 20:25:15 UTC (rev 316684) +++ php/php-src/branches/PHP_5_4/ext/date/tests/DateInterval_format_a.phpt 2011-09-13 20:31:02 UTC (rev 316685) @@ -1,25 +0,0 @@ ---TEST-- -DateInterval::format(), %a ---CREDITS-- -Daniel Convissor <dani...@php.net> -# TestFest 2010 BKTK ---INI-- -date.timezone=UTC ---SKIPIF-- -<?php -if (!method_exists('DateInterval', 'format')) die("skip: method doesn't exist"); -if (substr(PHP_OS, 0, 3) != 'WIN') die("skip this test is for Windows platforms only"); -?> ---FILE-- -<?php - -$date1 = new DateTime('2000-01-01 00:00:00'); -$date2 = new DateTime('2001-03-04 04:05:06'); - -$interval = $date1->diff($date2); - -echo $interval->format('a=%a') . "\n"; - -?> ---EXPECT-- -a=428 Modified: php/php-src/trunk/ext/date/tests/DateInterval_format.phpt =================================================================== --- php/php-src/trunk/ext/date/tests/DateInterval_format.phpt 2011-09-13 20:25:15 UTC (rev 316684) +++ php/php-src/trunk/ext/date/tests/DateInterval_format.phpt 2011-09-13 20:31:02 UTC (rev 316685) @@ -1,8 +1,5 @@ --TEST-- -DateInterval::format(), except %a ---DESCRIPTION-- -%a is covered in a separate test. -Don't want an XFAIL here to cause confusion if a real bug comes up. +DateInterval::format() --CREDITS-- Daniel Convissor <dani...@php.net> # TestFest 2010 BKTK @@ -32,6 +29,7 @@ echo $interval->format('i=%i') . "\n"; echo $interval->format('s=%s') . "\n"; echo $interval->format('r=%r') . "\n"; +echo $interval->format('a=%a') . "\n"; echo "\n"; @@ -63,6 +61,7 @@ i=5 s=6 r= +a=428 inverted R=- inverted r=- Deleted: php/php-src/trunk/ext/date/tests/DateInterval_format_a.phpt =================================================================== --- php/php-src/trunk/ext/date/tests/DateInterval_format_a.phpt 2011-09-13 20:25:15 UTC (rev 316684) +++ php/php-src/trunk/ext/date/tests/DateInterval_format_a.phpt 2011-09-13 20:31:02 UTC (rev 316685) @@ -1,25 +0,0 @@ ---TEST-- -DateInterval::format(), %a ---CREDITS-- -Daniel Convissor <dani...@php.net> -# TestFest 2010 BKTK ---INI-- -date.timezone=UTC ---SKIPIF-- -<?php -if (!method_exists('DateInterval', 'format')) die("skip: method doesn't exist"); -if (substr(PHP_OS, 0, 3) != 'WIN') die("skip this test is for Windows platforms only"); -?> ---FILE-- -<?php - -$date1 = new DateTime('2000-01-01 00:00:00'); -$date2 = new DateTime('2001-03-04 04:05:06'); - -$interval = $date1->diff($date2); - -echo $interval->format('a=%a') . "\n"; - -?> ---EXPECT-- -a=428
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php