Skip to content

Commit 2cc6fda

Browse files
committed
Merge branch 'PHP-8.5' into PHP-8.6
* PHP-8.5: Make timezone and mail tests independent of php.ini (#20031)
2 parents 6eca1d0 + 8cb0b5e commit 2cc6fda

6 files changed

Lines changed: 8 additions & 2 deletions

File tree

‎Zend/tests/inheritance/deprecation_to_exception_during_inheritance_can_be_caught.phpt‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ Deprecation promoted to exception during inheritance
44
<?php
55
if (getenv('SKIP_PRELOAD')) die('skip Error handler not active during preloading');
66
?>
7+
--INI--
8+
date.timezone=UTC
79
--FILE--
810
<?php
911

‎ext/date/tests/multiple_calls_date_period_iterator_current.phpt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
Multiple calls to DatePeriod iterator current() leak objects
33
--FILE--
44
<?php
5-
$start = new DateTime('2018-12-31 00:00:00');
6-
$end = new DateTime('2019-12-31 00:00:00');
5+
$start = new DateTime('2018-12-31 00:00:00 UTC');
6+
$end = new DateTime('2019-12-31 00:00:00 UTC');
77

88
$interval = new DateInterval('P1M');
99
$period = new DatePeriod($start, $interval, 1);

‎ext/standard/tests/mail/gh19188_cr_lf_mode.phpt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ GH-19188: new INI mail.cr_lf_mode
33
--INI--
44
sendmail_path={MAIL:gh19188_cr_lf_mode.out}
55
mail.cr_lf_mode=crlf
6+
mail.add_x_header=off
67
--FILE--
78
<?php
89

‎ext/standard/tests/mail/gh19188_lf_mode.phpt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ GH-19188: mail.cr_lf_mode=lf
33
--INI--
44
sendmail_path={MAIL:gh19188_lf_mode.out}
55
mail.cr_lf_mode=lf
6+
mail.add_x_header=off
67
--FILE--
78
<?php
89

‎ext/standard/tests/mail/gh19188_mixed_mode.phpt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ GH-19188: mail.cr_lf_mode=mixed
33
--INI--
44
sendmail_path={MAIL:gh19188_mixed_mode.out}
55
mail.cr_lf_mode=mixed
6+
mail.add_x_header=off
67
--FILE--
78
<?php
89
var_dump(mail('user@example.com', 'Test Subject', 'A Message', 'X-Test: mixed'));

‎ext/standard/tests/mail/gh19188_os_mode_unix.phpt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ if (PHP_OS_FAMILY === 'Windows') die("skip Non-Windows only");
77
--INI--
88
sendmail_path={MAIL:gh19188_os_mode.out}
99
mail.cr_lf_mode=os
10+
mail.add_x_header=off
1011
--FILE--
1112
<?php
1213
var_dump(mail('user@example.com', 'Test Subject', 'A Message', 'X-Test: os'));

0 commit comments

Comments
 (0)