diff options
author | Peter Kokot <peterkokot@gmail.com> | 2018-10-15 04:31:31 +0200 |
---|---|---|
committer | Peter Kokot <peterkokot@gmail.com> | 2018-10-15 04:31:31 +0200 |
commit | f1d7e3ca0b70f910fcecef0278de9c15440ca3c0 (patch) | |
tree | 70af7290bf6c0b06f223254537b502013ade302e /ext/date/tests | |
parent | f98c916845571deeab189fb2ab52a17aef49edb8 (diff) | |
download | php-git-f1d7e3ca0b70f910fcecef0278de9c15440ca3c0.tar.gz |
Sync leading and final newlines in *.phpt sections
This patch adds missing newlines, trims multiple redundant final
newlines into a single one, and trims redundant leading newlines in all
*.phpt sections.
According to POSIX, a line is a sequence of zero or more non-' <newline>'
characters plus a terminating '<newline>' character. [1] Files should
normally have at least one final newline character.
C89 [2] and later standards [3] mention a final newline:
"A source file that is not empty shall end in a new-line character,
which shall not be immediately preceded by a backslash character."
Although it is not mandatory for all files to have a final newline
fixed, a more consistent and homogeneous approach brings less of commit
differences issues and a better development experience in certain text
editors and IDEs.
[1] http://pubs.opengroup.org/onlinepubs/9699919799/basedefs/V1_chap03.html#tag_03_206
[2] https://port70.net/~nsz/c/c89/c89-draft.html#2.1.1.2
[3] https://port70.net/~nsz/c/c99/n1256.html#5.1.1.2
Diffstat (limited to 'ext/date/tests')
79 files changed, 53 insertions, 83 deletions
diff --git a/ext/date/tests/DateTimeZone_clone_basic1.phpt b/ext/date/tests/DateTimeZone_clone_basic1.phpt index a40efc7411..5f527202cd 100644 --- a/ext/date/tests/DateTimeZone_clone_basic1.phpt +++ b/ext/date/tests/DateTimeZone_clone_basic1.phpt @@ -43,5 +43,3 @@ object(DateTimeZone)#%d (2) { } TEST PASSED : Objects equal but not indetical ===DONE=== - - diff --git a/ext/date/tests/DateTimeZone_compare_basic1.phpt b/ext/date/tests/DateTimeZone_compare_basic1.phpt index 130b6fa754..790bb6cf7f 100644 --- a/ext/date/tests/DateTimeZone_compare_basic1.phpt +++ b/ext/date/tests/DateTimeZone_compare_basic1.phpt @@ -51,4 +51,4 @@ bool(false) bool(false) bool(false) bool(false) -===DONE===
\ No newline at end of file +===DONE=== diff --git a/ext/date/tests/DateTimeZone_extends_basic1.phpt b/ext/date/tests/DateTimeZone_extends_basic1.phpt index b7022ddb97..6065416dbd 100644 --- a/ext/date/tests/DateTimeZone_extends_basic1.phpt +++ b/ext/date/tests/DateTimeZone_extends_basic1.phpt @@ -31,4 +31,4 @@ echo $d . "\n"; -- Invoke __toString -- America/Los_Angeles -===DONE===
\ No newline at end of file +===DONE=== diff --git a/ext/date/tests/DateTimeZone_getName_basic1.phpt b/ext/date/tests/DateTimeZone_getName_basic1.phpt index ad59c8d9a1..c226aa39bb 100644 --- a/ext/date/tests/DateTimeZone_getName_basic1.phpt +++ b/ext/date/tests/DateTimeZone_getName_basic1.phpt @@ -29,4 +29,4 @@ var_dump( $tz3->getName() ); string(13) "Europe/London" string(16) "America/New_York" string(19) "America/Los_Angeles" -===DONE===
\ No newline at end of file +===DONE=== diff --git a/ext/date/tests/DateTimeZone_getOffset_basic1.phpt b/ext/date/tests/DateTimeZone_getOffset_basic1.phpt index 8c4e409498..ce1c04336e 100644 --- a/ext/date/tests/DateTimeZone_getOffset_basic1.phpt +++ b/ext/date/tests/DateTimeZone_getOffset_basic1.phpt @@ -30,4 +30,4 @@ var_dump( $tz3->getOffset($date) ); %rint\(0\)|int\(3600\)%r %rint\(-18000\)|int\(-14400\)%r %rint\(-28800\)|int\(-25200\)%r -===DONE===
\ No newline at end of file +===DONE=== diff --git a/ext/date/tests/DateTimeZone_getOffset_error.phpt b/ext/date/tests/DateTimeZone_getOffset_error.phpt index 58b852e44b..c2e6e4eed7 100644 --- a/ext/date/tests/DateTimeZone_getOffset_error.phpt +++ b/ext/date/tests/DateTimeZone_getOffset_error.phpt @@ -37,4 +37,4 @@ bool(false) Warning: DateTimeZone::getOffset() expects exactly 1 parameter, 2 given in %s on line %d bool(false) -===DONE===
\ No newline at end of file +===DONE=== diff --git a/ext/date/tests/DateTimeZone_getTransitions_basic1.phpt b/ext/date/tests/DateTimeZone_getTransitions_basic1.phpt index a88a34bf2d..ee88321fca 100644 --- a/ext/date/tests/DateTimeZone_getTransitions_basic1.phpt +++ b/ext/date/tests/DateTimeZone_getTransitions_basic1.phpt @@ -47,4 +47,4 @@ array(5) { ["abbr"]=> string(3) "BST" } -===DONE===
\ No newline at end of file +===DONE=== diff --git a/ext/date/tests/DateTimeZone_getTransitions_error.phpt b/ext/date/tests/DateTimeZone_getTransitions_error.phpt index e1d0a29420..f50a77ddb9 100644 --- a/ext/date/tests/DateTimeZone_getTransitions_error.phpt +++ b/ext/date/tests/DateTimeZone_getTransitions_error.phpt @@ -31,4 +31,4 @@ var_dump( $tz->getTransitions($timestamp_begin, $timestamp_end, $extra_arg) ); Warning: DateTimeZone::getTransitions() expects at most 2 parameters, 3 given in %s on line %d bool(false) -===DONE===
\ No newline at end of file +===DONE=== diff --git a/ext/date/tests/DateTimeZone_listIdentifiers_basic1.phpt b/ext/date/tests/DateTimeZone_listIdentifiers_basic1.phpt index 4421964d71..26a0c2fca2 100644 --- a/ext/date/tests/DateTimeZone_listIdentifiers_basic1.phpt +++ b/ext/date/tests/DateTimeZone_listIdentifiers_basic1.phpt @@ -33,4 +33,4 @@ bool(true) bool(true) bool(true) ===DONE=== -
\ No newline at end of file + diff --git a/ext/date/tests/DateTime_compare_basic1.phpt b/ext/date/tests/DateTime_compare_basic1.phpt index 7119f0f8dc..0d3f15360d 100644 --- a/ext/date/tests/DateTime_compare_basic1.phpt +++ b/ext/date/tests/DateTime_compare_basic1.phpt @@ -74,4 +74,4 @@ bool(false) bool(true) bool(true) bool(true) -===DONE===
\ No newline at end of file +===DONE=== diff --git a/ext/date/tests/DateTime_construct_variation2.phpt b/ext/date/tests/DateTime_construct_variation2.phpt index c4047b8e81..c761db7ec9 100644 --- a/ext/date/tests/DateTime_construct_variation2.phpt +++ b/ext/date/tests/DateTime_construct_variation2.phpt @@ -229,4 +229,3 @@ object(DateTime)#%d (3) { -- resource -- FAILED: DateTime::__construct() expects parameter 2 to be DateTimeZone, resource given ===DONE=== - diff --git a/ext/date/tests/DateTime_extends_basic2.phpt b/ext/date/tests/DateTime_extends_basic2.phpt index 026394af6a..0276e0536c 100644 --- a/ext/date/tests/DateTime_extends_basic2.phpt +++ b/ext/date/tests/DateTime_extends_basic2.phpt @@ -28,4 +28,4 @@ echo $d->format("F j, Y, g:i:s a") . "\n"; --EXPECTF-- *** Testing new DateTime() : with user space __construct magic method *** May 1, 1967, 10:30:41 pm -===DONE===
\ No newline at end of file +===DONE=== diff --git a/ext/date/tests/DateTime_format_basic1.phpt b/ext/date/tests/DateTime_format_basic1.phpt index 354911875c..883f9a7a8e 100644 --- a/ext/date/tests/DateTime_format_basic1.phpt +++ b/ext/date/tests/DateTime_format_basic1.phpt @@ -37,4 +37,4 @@ string(19) "it is the 14th day." string(28) "Thu Jul 14 22:30:41 BST 2005" string(19) "22:07:41 m is month" string(8) "22:30:41" -===DONE===
\ No newline at end of file +===DONE=== diff --git a/ext/date/tests/DateTime_getOffset_error.phpt b/ext/date/tests/DateTime_getOffset_error.phpt index 508ac7b940..2cf65f1979 100644 --- a/ext/date/tests/DateTime_getOffset_error.phpt +++ b/ext/date/tests/DateTime_getOffset_error.phpt @@ -30,4 +30,3 @@ var_dump( $datetime->getOffset($extra_arg) ); Warning: DateTime::getOffset() expects exactly 0 parameters, 1 given in %s on line %d bool(false) ===DONE=== - diff --git a/ext/date/tests/DateTime_modify_error.phpt b/ext/date/tests/DateTime_modify_error.phpt index 5f0df79884..2562324fd7 100644 --- a/ext/date/tests/DateTime_modify_error.phpt +++ b/ext/date/tests/DateTime_modify_error.phpt @@ -39,4 +39,3 @@ bool(false) Warning: DateTime::modify() expects exactly 1 parameter, 2 given in %s on line %d bool(false) ===DONE=== - diff --git a/ext/date/tests/DateTime_setDate_basic1.phpt b/ext/date/tests/DateTime_setDate_basic1.phpt index 581287faac..11b3952f6f 100644 --- a/ext/date/tests/DateTime_setDate_basic1.phpt +++ b/ext/date/tests/DateTime_setDate_basic1.phpt @@ -27,4 +27,4 @@ echo $datetime->format(DATE_RFC2822) . "\n"; *** Testing DateTime::setDate() : basic functionality *** Fri, 30 Jan 2009 19:34:10 +0000 Fri, 01 Feb 2008 19:34:10 +0000 -===DONE===
\ No newline at end of file +===DONE=== diff --git a/ext/date/tests/bug39782.phpt b/ext/date/tests/bug39782.phpt index 99abdd7bc8..99aaeaf380 100644 --- a/ext/date/tests/bug39782.phpt +++ b/ext/date/tests/bug39782.phpt @@ -16,4 +16,4 @@ echo $dttTest->format('D M j Y - H:i:s') . "\n"; --EXPECT-- Wed Dec 13 2006 - 00:00:00 Wed Dec 13 2006 - 12:00:00 -Wed Dec 13 2006 - 12:00:00
\ No newline at end of file +Wed Dec 13 2006 - 12:00:00 diff --git a/ext/date/tests/bug45543.phpt b/ext/date/tests/bug45543.phpt index 8e36e6287c..42a97ab20c 100644 --- a/ext/date/tests/bug45543.phpt +++ b/ext/date/tests/bug45543.phpt @@ -31,4 +31,3 @@ foreach ($test_dates as $test_date) 2008-01-01T12:00:00+0000 2008-01-01T12:00:00+0200 2008-01-01T14:00:00+0200 - diff --git a/ext/date/tests/bug48187.phpt b/ext/date/tests/bug48187.phpt index 78c0fb2a60..2fadc3609f 100644 --- a/ext/date/tests/bug48187.phpt +++ b/ext/date/tests/bug48187.phpt @@ -25,4 +25,4 @@ if (time() - $begin_t < 1) { ?> --EXPECTF-- string(36) "microtime() difference less 1 second" -string(31) "time() difference less 1 second"
\ No newline at end of file +string(31) "time() difference less 1 second" diff --git a/ext/date/tests/bug48476.phpt b/ext/date/tests/bug48476.phpt index 2daa594871..1335025c76 100644 --- a/ext/date/tests/bug48476.phpt +++ b/ext/date/tests/bug48476.phpt @@ -29,5 +29,3 @@ bool(false) Warning: timezone_location_get(): The DateTimeZone object has not been correctly initialized by its constructor in %sbug48476.php on line 18 bool(false) - - diff --git a/ext/date/tests/bug50475.phpt b/ext/date/tests/bug50475.phpt index 454e86c6b5..3cb5e89d5a 100644 --- a/ext/date/tests/bug50475.phpt +++ b/ext/date/tests/bug50475.phpt @@ -15,4 +15,4 @@ var_dump($date->format('Y-m-d H:i:s')); ?> --EXPECT-- string(19) "2009-02-02 00:00:00" -string(19) "2009-02-02 08:00:00"
\ No newline at end of file +string(19) "2009-02-02 08:00:00" diff --git a/ext/date/tests/bug52062.phpt b/ext/date/tests/bug52062.phpt index d8517e6a13..a2f812f49b 100644 --- a/ext/date/tests/bug52062.phpt +++ b/ext/date/tests/bug52062.phpt @@ -28,4 +28,4 @@ string(12) "100000000000" Warning: DateTime::setTimestamp() expects parameter 1 to be integer, float given in %s on line %d string(32) "5138-11-16 09:46:40 100000000000" bool(false) -string(10) "1215752192"
\ No newline at end of file +string(10) "1215752192" diff --git a/ext/date/tests/bug52290.phpt b/ext/date/tests/bug52290.phpt index 78ede1387c..36411a0a6c 100644 --- a/ext/date/tests/bug52290.phpt +++ b/ext/date/tests/bug52290.phpt @@ -24,4 +24,4 @@ var_dump($dt->format('o-\WW-N | Y-m-d | H:i:s | U')); string(47) "2005-W52-7 | 2006-01-01 | 00:00:00 | 1136073600" string(47) "2005-W52-1 | 2005-12-26 | 00:00:00 | 1135555200" string(47) "2007-W41-3 | 2007-10-10 | 00:00:00 | 1191974400" -string(47) "2007-W41-3 | 2007-10-10 | 20:30:40 | 1192048240"
\ No newline at end of file +string(47) "2007-W41-3 | 2007-10-10 | 20:30:40 | 1192048240" diff --git a/ext/date/tests/bug62852.phpt b/ext/date/tests/bug62852.phpt index a1b5190281..77c92ce55f 100644 --- a/ext/date/tests/bug62852.phpt +++ b/ext/date/tests/bug62852.phpt @@ -9,7 +9,6 @@ $s1 = 'O:8:"DateTime":3:{s:4:"date";s:20:"10007-06-07 03:51:49";s:13:"timezone_t try { unserialize( $s1 ); } catch ( Exception $e ) {} - --EXPECTF-- Fatal error: Uncaught Error: Invalid serialization data for DateTime object in %sbug62852.php:%d Stack trace: diff --git a/ext/date/tests/bug62852_var2.phpt b/ext/date/tests/bug62852_var2.phpt index 9d742d9363..afec265d50 100644 --- a/ext/date/tests/bug62852_var2.phpt +++ b/ext/date/tests/bug62852_var2.phpt @@ -20,7 +20,6 @@ try { unserialize( $s2 ); } catch ( Exception $e ) {} var_dump( $foo ); - --EXPECTF-- Fatal error: Uncaught Error: Invalid serialization data for DateTime object in %sbug62852_var2.php:%d Stack trace: diff --git a/ext/date/tests/bug62852_var3.phpt b/ext/date/tests/bug62852_var3.phpt index bef8d4ec6b..5dbc1efa3f 100644 --- a/ext/date/tests/bug62852_var3.phpt +++ b/ext/date/tests/bug62852_var3.phpt @@ -20,7 +20,6 @@ try { unserialize( $s2 ); } catch ( Exception $e ) {} var_dump( $foo ); - --EXPECTF-- Fatal error: Uncaught Error: Invalid serialization data for DateTime object in %sbug62852_var3.php:%d Stack trace: diff --git a/ext/date/tests/bug67118.phpt b/ext/date/tests/bug67118.phpt index 4884d77bac..332142856e 100644 --- a/ext/date/tests/bug67118.phpt +++ b/ext/date/tests/bug67118.phpt @@ -23,7 +23,5 @@ class mydt extends datetime new mydt("Funktionsansvarig rÄdgivning och juridik", "UTC"); ?> --EXPECTF-- - Warning: DateTime::format(): The DateTime object has not been correctly initialized by its constructor in %s on line %d Bad date - diff --git a/ext/date/tests/bug67253.phpt b/ext/date/tests/bug67253.phpt index b28cbe63c1..02ffa265f2 100644 --- a/ext/date/tests/bug67253.phpt +++ b/ext/date/tests/bug67253.phpt @@ -41,4 +41,3 @@ array(12) { ["is_localtime"]=> bool(false) } - diff --git a/ext/date/tests/bug68406.phpt b/ext/date/tests/bug68406.phpt index a6a41c1078..f2181d1006 100644 --- a/ext/date/tests/bug68406.phpt +++ b/ext/date/tests/bug68406.phpt @@ -17,7 +17,6 @@ if($tz2 == $d->getTimezone()) { else { echo "no"; } - --EXPECT-- object(DateTimeZone)#4 (2) { ["timezone_type"]=> diff --git a/ext/date/tests/bug71525.phpt b/ext/date/tests/bug71525.phpt index d0c99e4f84..9a9d10342d 100644 --- a/ext/date/tests/bug71525.phpt +++ b/ext/date/tests/bug71525.phpt @@ -8,7 +8,6 @@ $date = new DateTime('2011-12-25 00:00:00'); $date->modify('first day of next month'); $date->setDate('2012', '1', '29'); var_dump($date); - --EXPECTF-- object(DateTime)#%d (3) { ["date"]=> diff --git a/ext/date/tests/bug71635.phpt b/ext/date/tests/bug71635.phpt index 8c5ae25db3..422dee60e4 100644 --- a/ext/date/tests/bug71635.phpt +++ b/ext/date/tests/bug71635.phpt @@ -8,4 +8,4 @@ $period = new DatePeriod(new DateTimeImmutable("now"), new DateInterval("P2Y4DT6 var_dump($period->getEndDate()); ?> --EXPECT-- -NULL
\ No newline at end of file +NULL diff --git a/ext/date/tests/checkdate_variation1.phpt b/ext/date/tests/checkdate_variation1.phpt index 176054311b..104c3e736f 100644 --- a/ext/date/tests/checkdate_variation1.phpt +++ b/ext/date/tests/checkdate_variation1.phpt @@ -199,4 +199,3 @@ bool(false) Warning: checkdate() expects parameter 1 to be integer, resource given in %s on line %d bool(false) ===DONE=== - diff --git a/ext/date/tests/checkdate_variation2.phpt b/ext/date/tests/checkdate_variation2.phpt index 8e2955311b..91d2ad4919 100644 --- a/ext/date/tests/checkdate_variation2.phpt +++ b/ext/date/tests/checkdate_variation2.phpt @@ -199,4 +199,3 @@ bool(false) Warning: checkdate() expects parameter 2 to be integer, resource given in %s on line %d bool(false) ===DONE=== - diff --git a/ext/date/tests/date_add_basic2.phpt b/ext/date/tests/date_add_basic2.phpt index 5beef23f45..a54c63658e 100644 --- a/ext/date/tests/date_add_basic2.phpt +++ b/ext/date/tests/date_add_basic2.phpt @@ -11,4 +11,4 @@ display_errors=false var_dump(date_add()); // invalid parameters ?> --EXPECT-- -bool(false)
\ No newline at end of file +bool(false) diff --git a/ext/date/tests/date_basic1.phpt b/ext/date/tests/date_basic1.phpt index 2b94ac34e7..088bdce6d5 100644 --- a/ext/date/tests/date_basic1.phpt +++ b/ext/date/tests/date_basic1.phpt @@ -38,4 +38,3 @@ string(28) "Fri Feb 27 10:44:30 GMT 2009" string(19) "10:02:30 m is month" string(8) "10:44:30" ===DONE=== - diff --git a/ext/date/tests/date_create_from_format_basic.phpt b/ext/date/tests/date_create_from_format_basic.phpt index 592692b5a7..823a4ccbeb 100644 --- a/ext/date/tests/date_create_from_format_basic.phpt +++ b/ext/date/tests/date_create_from_format_basic.phpt @@ -11,4 +11,4 @@ display_errors=false var_dump(date_create_from_format()); // invalid parameters ?> --EXPECT-- -bool(false)
\ No newline at end of file +bool(false) diff --git a/ext/date/tests/date_create_from_format_basic2.phpt b/ext/date/tests/date_create_from_format_basic2.phpt index 2b220a7275..61c553ddd4 100644 --- a/ext/date/tests/date_create_from_format_basic2.phpt +++ b/ext/date/tests/date_create_from_format_basic2.phpt @@ -10,4 +10,4 @@ date.timezone=UTC var_dump(date_create_from_format('Y-m-d', '2009---01')); // invalid date ?> --EXPECT-- -bool(false)
\ No newline at end of file +bool(false) diff --git a/ext/date/tests/date_default_timezone_get_error.phpt b/ext/date/tests/date_default_timezone_get_error.phpt index bf8bc8ef6e..b1b5b1bf17 100644 --- a/ext/date/tests/date_default_timezone_get_error.phpt +++ b/ext/date/tests/date_default_timezone_get_error.phpt @@ -24,4 +24,4 @@ var_dump( date_default_timezone_get($extra_arg)); -- Testing date_create() function with more than expected no. of arguments -- string(3) "UTC" -===Done===
\ No newline at end of file +===Done=== diff --git a/ext/date/tests/date_get_last_errors_basic.phpt b/ext/date/tests/date_get_last_errors_basic.phpt index 5e83a5272f..26e470a7d8 100644 --- a/ext/date/tests/date_get_last_errors_basic.phpt +++ b/ext/date/tests/date_get_last_errors_basic.phpt @@ -10,4 +10,4 @@ date.timezone=UTC var_dump(date_get_last_errors()); // no date was parsed, so no errors ?> --EXPECT-- -bool(false)
\ No newline at end of file +bool(false) diff --git a/ext/date/tests/date_interval_create_from_date_string.phpt b/ext/date/tests/date_interval_create_from_date_string.phpt index 97cfce0b8c..9537c34dea 100644 --- a/ext/date/tests/date_interval_create_from_date_string.phpt +++ b/ext/date/tests/date_interval_create_from_date_string.phpt @@ -31,4 +31,4 @@ int(14) int(3) int(4) int(1) -int(1)
\ No newline at end of file +int(1) diff --git a/ext/date/tests/date_interval_create_from_date_string_wrongparam_001.phpt b/ext/date/tests/date_interval_create_from_date_string_wrongparam_001.phpt index 15db956553..fa675fa2fe 100644 --- a/ext/date/tests/date_interval_create_from_date_string_wrongparam_001.phpt +++ b/ext/date/tests/date_interval_create_from_date_string_wrongparam_001.phpt @@ -8,4 +8,4 @@ $wrong_parameter = array(); $i = date_interval_create_from_date_string($wrong_parameter); ?> --EXPECTF-- -Warning: date_interval_create_from_date_string() expects parameter 1 to be string, array given in %s on line %d
\ No newline at end of file +Warning: date_interval_create_from_date_string() expects parameter 1 to be string, array given in %s on line %d diff --git a/ext/date/tests/date_parse_from_format_basic.phpt b/ext/date/tests/date_parse_from_format_basic.phpt index 644949a2e8..717dfabe21 100644 --- a/ext/date/tests/date_parse_from_format_basic.phpt +++ b/ext/date/tests/date_parse_from_format_basic.phpt @@ -11,4 +11,4 @@ display_errors=false var_dump(date_parse_from_format()); // invalid parameters ?> --EXPECT-- -bool(false)
\ No newline at end of file +bool(false) diff --git a/ext/date/tests/date_sun_info_error.phpt b/ext/date/tests/date_sun_info_error.phpt index 8d572479f3..0b27757309 100644 --- a/ext/date/tests/date_sun_info_error.phpt +++ b/ext/date/tests/date_sun_info_error.phpt @@ -43,4 +43,4 @@ bool(false) Warning: date_create() expects at most 2 parameters, 4 given in %s on line %d bool(false) -===Done===
\ No newline at end of file +===Done=== diff --git a/ext/date/tests/date_sunrise_variation9.phpt b/ext/date/tests/date_sunrise_variation9.phpt index 7c95e8734f..561dbdcc36 100644 --- a/ext/date/tests/date_sunrise_variation9.phpt +++ b/ext/date/tests/date_sunrise_variation9.phpt @@ -58,4 +58,4 @@ bool(false) Warning: date_sunrise() expects parameter 1 to be integer, float given in %s on line %d bool(false) -===DONE===
\ No newline at end of file +===DONE=== diff --git a/ext/date/tests/date_timestamp_set.phpt b/ext/date/tests/date_timestamp_set.phpt index 42b91573f1..906c5bab2f 100644 --- a/ext/date/tests/date_timestamp_set.phpt +++ b/ext/date/tests/date_timestamp_set.phpt @@ -16,4 +16,4 @@ date_timestamp_set($dtms021, 1234567890); var_dump(date_format($dtms021, 'B => (U) => T Y-M-d H:i:s')); ?> --EXPECTF-- -string(47) "021 => (1234567890) => UTC 2009-Feb-13 23:31:30"
\ No newline at end of file +string(47) "021 => (1234567890) => UTC 2009-Feb-13 23:31:30" diff --git a/ext/date/tests/date_timestamp_set_nullparam.phpt b/ext/date/tests/date_timestamp_set_nullparam.phpt index 04cde83346..27b105c998 100644 --- a/ext/date/tests/date_timestamp_set_nullparam.phpt +++ b/ext/date/tests/date_timestamp_set_nullparam.phpt @@ -14,4 +14,4 @@ $dtms021 = date_create(); date_timestamp_set(null, 1234567890); ?> --EXPECTF-- -Warning: date_timestamp_set() expects parameter 1 to be DateTime, null given in %s on line %d
\ No newline at end of file +Warning: date_timestamp_set() expects parameter 1 to be DateTime, null given in %s on line %d diff --git a/ext/date/tests/date_timestamp_set_nullparam2.phpt b/ext/date/tests/date_timestamp_set_nullparam2.phpt index 0f2198b9ac..56d0af6096 100644 --- a/ext/date/tests/date_timestamp_set_nullparam2.phpt +++ b/ext/date/tests/date_timestamp_set_nullparam2.phpt @@ -21,4 +21,4 @@ object(DateTime)#1 (3) { int(3) ["timezone"]=> string(3) "UTC" -}
\ No newline at end of file +} diff --git a/ext/date/tests/date_timestamp_set_wrongparam_001.phpt b/ext/date/tests/date_timestamp_set_wrongparam_001.phpt index 43fec3796a..a7af0572f3 100644 --- a/ext/date/tests/date_timestamp_set_wrongparam_001.phpt +++ b/ext/date/tests/date_timestamp_set_wrongparam_001.phpt @@ -14,4 +14,4 @@ $dtms021 = array(); date_timestamp_set($dtms021, 123456789); ?> --EXPECTF-- -Warning: date_timestamp_set() expects parameter 1 to be DateTime, array given in %s on line %d
\ No newline at end of file +Warning: date_timestamp_set() expects parameter 1 to be DateTime, array given in %s on line %d diff --git a/ext/date/tests/date_timestamp_set_wrongparam_002.phpt b/ext/date/tests/date_timestamp_set_wrongparam_002.phpt index 27ff8a1cd0..fe0f88232f 100644 --- a/ext/date/tests/date_timestamp_set_wrongparam_002.phpt +++ b/ext/date/tests/date_timestamp_set_wrongparam_002.phpt @@ -12,4 +12,4 @@ $dftz021 = date_default_timezone_get(); //UTC date_timestamp_set(987654321, 123456789); ?> --EXPECTF-- -Warning: date_timestamp_set() expects parameter 1 to be DateTime, integer given in %s on line %d
\ No newline at end of file +Warning: date_timestamp_set() expects parameter 1 to be DateTime, integer given in %s on line %d diff --git a/ext/date/tests/date_timestamp_set_wrongparam_003.phpt b/ext/date/tests/date_timestamp_set_wrongparam_003.phpt index 48e9c5a351..516ce553ff 100644 --- a/ext/date/tests/date_timestamp_set_wrongparam_003.phpt +++ b/ext/date/tests/date_timestamp_set_wrongparam_003.phpt @@ -16,4 +16,4 @@ $wrong_parameter = array(); date_timestamp_set($dtms021, $wrong_parameter); ?> --EXPECTF-- -Warning: date_timestamp_set() expects parameter 2 to be integer, array given in %s on line %d
\ No newline at end of file +Warning: date_timestamp_set() expects parameter 2 to be integer, array given in %s on line %d diff --git a/ext/date/tests/date_timestamp_set_wrongparam_004.phpt b/ext/date/tests/date_timestamp_set_wrongparam_004.phpt index a9aab110e2..3a6d304561 100644 --- a/ext/date/tests/date_timestamp_set_wrongparam_004.phpt +++ b/ext/date/tests/date_timestamp_set_wrongparam_004.phpt @@ -14,4 +14,4 @@ $dtms021 = new DateTime(); date_timestamp_set($dtms021, 123456789, 'error'); ?> --EXPECTF-- -Warning: date_timestamp_set() expects exactly 2 parameters, 3 given in %s on line %d
\ No newline at end of file +Warning: date_timestamp_set() expects exactly 2 parameters, 3 given in %s on line %d diff --git a/ext/date/tests/date_timezone_get_basic1.phpt b/ext/date/tests/date_timezone_get_basic1.phpt index 9c6085243b..e5882d1b89 100644 --- a/ext/date/tests/date_timezone_get_basic1.phpt +++ b/ext/date/tests/date_timezone_get_basic1.phpt @@ -32,4 +32,4 @@ var_dump( timezone_name_get($tz) ); string(13) "Europe/London" string(16) "America/New_York" string(19) "America/Los_Angeles" -===DONE===
\ No newline at end of file +===DONE=== diff --git a/ext/date/tests/date_timezone_set_basic1.phpt b/ext/date/tests/date_timezone_set_basic1.phpt index 8f07434552..fc94b643ae 100644 --- a/ext/date/tests/date_timezone_set_basic1.phpt +++ b/ext/date/tests/date_timezone_set_basic1.phpt @@ -31,4 +31,3 @@ echo "New timezone: " . timezone_name_get($tz) . "\n"; Default timezone: Europe/London New timezone: America/Los_Angeles ===DONE=== - diff --git a/ext/date/tests/date_timezone_set_variation1.phpt b/ext/date/tests/date_timezone_set_variation1.phpt index 6d5fd56b20..00043f5b2a 100644 --- a/ext/date/tests/date_timezone_set_variation1.phpt +++ b/ext/date/tests/date_timezone_set_variation1.phpt @@ -251,4 +251,3 @@ bool(false) Warning: date_timezone_set() expects parameter 1 to be DateTime, resource given in %s on line %d bool(false) ===DONE=== - diff --git a/ext/date/tests/date_variation1.phpt b/ext/date/tests/date_variation1.phpt index 0a3b9d4189..533d0d3d7c 100644 --- a/ext/date/tests/date_variation1.phpt +++ b/ext/date/tests/date_variation1.phpt @@ -205,4 +205,3 @@ string(0) "" Warning: date() expects parameter 1 to be string, resource given in %s on line %d bool(false) ===DONE=== - diff --git a/ext/date/tests/date_variation2.phpt b/ext/date/tests/date_variation2.phpt index 96140b621d..8f1ef58c30 100644 --- a/ext/date/tests/date_variation2.phpt +++ b/ext/date/tests/date_variation2.phpt @@ -219,4 +219,3 @@ string(24) "January 1, 1970, 1:00 am" Warning: date() expects parameter 2 to be integer, resource given in %s on line %d bool(false) ===DONE=== - diff --git a/ext/date/tests/getdate_variation7.phpt b/ext/date/tests/getdate_variation7.phpt index c764f3c8b3..896a289ea1 100644 --- a/ext/date/tests/getdate_variation7.phpt +++ b/ext/date/tests/getdate_variation7.phpt @@ -34,4 +34,4 @@ bool(false) Warning: getdate() expects parameter 1 to be integer, float given in %s on line %d bool(false) -===DONE===
\ No newline at end of file +===DONE=== diff --git a/ext/date/tests/gmdate_variation14.phpt b/ext/date/tests/gmdate_variation14.phpt index 3067b65c1e..0a62f369d1 100644 --- a/ext/date/tests/gmdate_variation14.phpt +++ b/ext/date/tests/gmdate_variation14.phpt @@ -37,4 +37,4 @@ bool(false) Warning: gmdate() expects parameter 2 to be integer, float given in %s on line %d bool(false) -===DONE===
\ No newline at end of file +===DONE=== diff --git a/ext/date/tests/idate_error.phpt b/ext/date/tests/idate_error.phpt index b9a8354923..ff277ecd6a 100644 --- a/ext/date/tests/idate_error.phpt +++ b/ext/date/tests/idate_error.phpt @@ -34,4 +34,3 @@ bool(false) Warning: idate() expects at most 2 parameters, 3 given in %s on line %d bool(false) ===DONE=== - diff --git a/ext/date/tests/idate_variation3.phpt b/ext/date/tests/idate_variation3.phpt index 4587106855..9e07837d5c 100644 --- a/ext/date/tests/idate_variation3.phpt +++ b/ext/date/tests/idate_variation3.phpt @@ -38,4 +38,4 @@ bool(false) Warning: idate() expects parameter 2 to be integer, float given in %s on line %d bool(false) -===DONE===
\ No newline at end of file +===DONE=== diff --git a/ext/date/tests/localtime_error.phpt b/ext/date/tests/localtime_error.phpt index 0224c3538e..4c9dee85f7 100644 --- a/ext/date/tests/localtime_error.phpt +++ b/ext/date/tests/localtime_error.phpt @@ -30,4 +30,3 @@ var_dump( localtime($timestamp, $assoc, $extra_arg) ); Warning: localtime() expects at most 2 parameters, 3 given in %s on line %d bool(false) ===DONE=== - diff --git a/ext/date/tests/microtime_error.phpt b/ext/date/tests/microtime_error.phpt index a537a146a2..f84190cb3d 100644 --- a/ext/date/tests/microtime_error.phpt +++ b/ext/date/tests/microtime_error.phpt @@ -31,7 +31,6 @@ foreach ($bad_args as $bad_arg) { ?> ===DONE=== --EXPECTF-- - -- Too many arguments -- Warning: microtime() expects at most 1 parameter, 2 given in %s on line 11 @@ -69,4 +68,4 @@ NULL --> bad arg: int(1) float(%s) -===DONE===
\ No newline at end of file +===DONE=== diff --git a/ext/date/tests/mktime-3.phpt b/ext/date/tests/mktime-3.phpt index 4347826aa0..ce1a203a20 100644 --- a/ext/date/tests/mktime-3.phpt +++ b/ext/date/tests/mktime-3.phpt @@ -56,4 +56,4 @@ Y: 1999 - January 1999-01-01T01:01:01+0100 Y: 2000 - January 2000-01-01T01:01:01+0100 Y: 2001 - January 2001-01-01T01:01:01+0100 -===Done===
\ No newline at end of file +===Done=== diff --git a/ext/date/tests/mktime_basic1.phpt b/ext/date/tests/mktime_basic1.phpt index afb289815d..22d2d2f91b 100644 --- a/ext/date/tests/mktime_basic1.phpt +++ b/ext/date/tests/mktime_basic1.phpt @@ -39,4 +39,3 @@ int(%i) int(%i) int(%i) ===DONE=== - diff --git a/ext/date/tests/mktime_variation1.phpt b/ext/date/tests/mktime_variation1.phpt index 7ea8f83f76..e688d9c356 100644 --- a/ext/date/tests/mktime_variation1.phpt +++ b/ext/date/tests/mktime_variation1.phpt @@ -221,4 +221,4 @@ int(%i) Warning: mktime() expects parameter 1 to be integer, resource given in %s on line %d bool(false) -===DONE===
\ No newline at end of file +===DONE=== diff --git a/ext/date/tests/mktime_variation6.phpt b/ext/date/tests/mktime_variation6.phpt index c9e3507b7f..7eca0169e3 100644 --- a/ext/date/tests/mktime_variation6.phpt +++ b/ext/date/tests/mktime_variation6.phpt @@ -220,4 +220,3 @@ int(%i) Warning: mktime() expects parameter 6 to be integer, resource given in %s on line %d bool(false) ===DONE=== - diff --git a/ext/date/tests/strftime_variation23.phpt b/ext/date/tests/strftime_variation23.phpt index 9ac6edfbbe..d153f4f173 100644 --- a/ext/date/tests/strftime_variation23.phpt +++ b/ext/date/tests/strftime_variation23.phpt @@ -39,4 +39,4 @@ bool(false) Warning: strftime() expects parameter 2 to be integer, float given in %s on line %d bool(false) -===DONE===
\ No newline at end of file +===DONE=== diff --git a/ext/date/tests/strtotime-mysql-64bit.phpt b/ext/date/tests/strtotime-mysql-64bit.phpt index 38e7f15dff..c511d626e9 100644 --- a/ext/date/tests/strtotime-mysql-64bit.phpt +++ b/ext/date/tests/strtotime-mysql-64bit.phpt @@ -25,4 +25,3 @@ foreach($d as $date) { string(31) "Fri, 23 May 1997 09:15:28 +0000" string(31) "Sun, 31 Dec 2000 18:58:59 +0000" string(31) "Wed, 10 Apr 2080 10:10:10 +0000" - diff --git a/ext/date/tests/strtotime_basic2.phpt b/ext/date/tests/strtotime_basic2.phpt index f90e66da87..5f9bcd552e 100644 --- a/ext/date/tests/strtotime_basic2.phpt +++ b/ext/date/tests/strtotime_basic2.phpt @@ -10,4 +10,4 @@ date.timezone=UTC var_dump(strtotime('mayy 2 2009')); // misspelled month name ?> --EXPECT-- -bool(false)
\ No newline at end of file +bool(false) diff --git a/ext/date/tests/time_basic.phpt b/ext/date/tests/time_basic.phpt index 7b93e9dac2..0ff2f0120c 100644 --- a/ext/date/tests/time_basic.phpt +++ b/ext/date/tests/time_basic.phpt @@ -13,4 +13,4 @@ var_dump(time()); ===DONE=== --EXPECTF-- int(%d) -===DONE===
\ No newline at end of file +===DONE=== diff --git a/ext/date/tests/time_error.phpt b/ext/date/tests/time_error.phpt index 5f6f52f81d..4103ff7d8b 100644 --- a/ext/date/tests/time_error.phpt +++ b/ext/date/tests/time_error.phpt @@ -16,4 +16,4 @@ var_dump (time($extra_arg)); --EXPECTF-- Too many arguments int(%d) -===DONE===
\ No newline at end of file +===DONE=== diff --git a/ext/date/tests/timezone_identifiers_list_basic1.phpt b/ext/date/tests/timezone_identifiers_list_basic1.phpt index 3d591b5e7e..3367702ef4 100644 --- a/ext/date/tests/timezone_identifiers_list_basic1.phpt +++ b/ext/date/tests/timezone_identifiers_list_basic1.phpt @@ -33,4 +33,4 @@ bool(true) bool(true) bool(true) ===DONE=== -
\ No newline at end of file + diff --git a/ext/date/tests/timezone_identifiers_list_wrong_constructor.phpt b/ext/date/tests/timezone_identifiers_list_wrong_constructor.phpt index 5b8493ba11..39c71ab1db 100644 --- a/ext/date/tests/timezone_identifiers_list_wrong_constructor.phpt +++ b/ext/date/tests/timezone_identifiers_list_wrong_constructor.phpt @@ -12,4 +12,4 @@ print_r(timezone_identifiers_list(4096)); ?> --EXPECTF-- -Notice: timezone_identifiers_list(): A two-letter ISO 3166-1 compatible country code is expected in %s on line %d
\ No newline at end of file +Notice: timezone_identifiers_list(): A two-letter ISO 3166-1 compatible country code is expected in %s on line %d diff --git a/ext/date/tests/timezone_location_get.phpt b/ext/date/tests/timezone_location_get.phpt index 93f7ed6d75..a74bf7fd73 100644 --- a/ext/date/tests/timezone_location_get.phpt +++ b/ext/date/tests/timezone_location_get.phpt @@ -21,4 +21,3 @@ array(4) { ["comments"]=> string(0) "" } - diff --git a/ext/date/tests/timezone_name_from_abbr_error.phpt b/ext/date/tests/timezone_name_from_abbr_error.phpt index 75e09ede61..8550933ee4 100644 --- a/ext/date/tests/timezone_name_from_abbr_error.phpt +++ b/ext/date/tests/timezone_name_from_abbr_error.phpt @@ -39,4 +39,4 @@ bool(false) Warning: timezone_name_from_abbr() expects at most 3 parameters, 4 given in %s on line %d bool(false) -===DONE===
\ No newline at end of file +===DONE=== diff --git a/ext/date/tests/timezone_offset_get_basic1.phpt b/ext/date/tests/timezone_offset_get_basic1.phpt index 90fc4bb9a3..c7e197af85 100644 --- a/ext/date/tests/timezone_offset_get_basic1.phpt +++ b/ext/date/tests/timezone_offset_get_basic1.phpt @@ -31,4 +31,4 @@ var_dump(timezone_offset_get($tz, $date)); %rint\(0\)|int\(3600\)%r %rint\(-18000\)|int\(-14400\)%r %rint\(-28800\)|int\(-25200\)%r -===DONE===
\ No newline at end of file +===DONE=== diff --git a/ext/date/tests/timezone_transitions_get_basic1.phpt b/ext/date/tests/timezone_transitions_get_basic1.phpt index 3189e35074..2fd44a430d 100644 --- a/ext/date/tests/timezone_transitions_get_basic1.phpt +++ b/ext/date/tests/timezone_transitions_get_basic1.phpt @@ -50,4 +50,4 @@ array(5) { ["abbr"]=> string(3) "BST" } -===DONE===
\ No newline at end of file +===DONE=== diff --git a/ext/date/tests/timezone_version_get.phpt b/ext/date/tests/timezone_version_get.phpt index 2c75de7ebc..c6e88e7bb3 100644 --- a/ext/date/tests/timezone_version_get.phpt +++ b/ext/date/tests/timezone_version_get.phpt @@ -10,4 +10,4 @@ date_default_timezone_set("America/Sao_Paulo"); var_dump(timezone_version_get()); ?> --EXPECTREGEX-- -string\([6-7]\) \"20[0-9][0-9]\.[1-9][0-9]?\"
\ No newline at end of file +string\([6-7]\) \"20[0-9][0-9]\.[1-9][0-9]?\" diff --git a/ext/date/tests/timezone_version_get_basic1.phpt b/ext/date/tests/timezone_version_get_basic1.phpt index ba0ac00715..f008486b1f 100644 --- a/ext/date/tests/timezone_version_get_basic1.phpt +++ b/ext/date/tests/timezone_version_get_basic1.phpt @@ -9,4 +9,4 @@ date.timezone=UTC <?php $versionTimezone = timezone_version_get(); echo $versionTimezone; ?> --EXPECTREGEX-- -^[12][0-9]{3}.[0-9]+$
\ No newline at end of file +^[12][0-9]{3}.[0-9]+$ |