Skip to content

Commit 121dddb

Browse files
marc-mabemarc-mabe
committed
Use zend_argument_error
1 parent ff3e317 commit 121dddb

File tree

2 files changed

+30
-28
lines changed

2 files changed

+30
-28
lines changed

‎ext/date/php_date.c

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3856,9 +3856,10 @@ PHP_METHOD(DateTimeImmutable, setMicroseconds)
38563856
}
38573857

38583858
if (UNEXPECTED(us < 0 || us > 999999)) {
3859-
zend_throw_error(
3859+
zend_argument_error(
38603860
date_ce_date_range_error,
3861-
"Microseconds must be between 0 and 999999, "ZEND_LONG_FMT" given",
3861+
1,
3862+
"must be between 0 and 999999, " ZEND_LONG_FMT " given",
38623863
us
38633864
);
38643865
RETURN_THROWS();
@@ -3889,9 +3890,10 @@ PHP_METHOD(DateTime, setMicroseconds)
38893890
}
38903891

38913892
if (UNEXPECTED(us < 0 || us > 999999)) {
3892-
zend_throw_error(
3893+
zend_argument_error(
38933894
date_ce_date_range_error,
3894-
"Microseconds must be between 0 and 999999, "ZEND_LONG_FMT" given",
3895+
1,
3896+
"must be between 0 and 999999, " ZEND_LONG_FMT " given",
38953897
us
38963898
);
38973899
RETURN_THROWS();

‎ext/date/tests/getSetMicroseconds.phpt

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -33,35 +33,35 @@ var_dump($myDti);
3333
foreach ($microsecondsList as $microseconds) {
3434
echo "##################################\n";
3535

36-
echo 'DateTime::setMicroseconds('.var_export($microseconds, true).'):';
36+
echo 'DateTime::setMicroseconds('.var_export($microseconds, true).'): ';
3737
try {
3838
var_dump($dt->setMicroseconds($microseconds));
3939
} catch (Throwable $e) {
40-
echo get_class($e) . ' ' . $e->getMessage() . "\n";
40+
echo get_class($e) . ': ' . $e->getMessage() . "\n";
4141
}
4242
echo 'DateTime::getMicroseconds(): ' . var_export($dt->getMicroseconds(), true) . "\n";
4343

44-
echo 'DateTimeImmutable::setMicroseconds('.var_export($microseconds, true).'):';
44+
echo 'DateTimeImmutable::setMicroseconds('.var_export($microseconds, true).'): ';
4545
try {
4646
var_dump($dti->setMicroseconds($microseconds));
4747
} catch (Throwable $e) {
48-
echo get_class($e) . ' ' . $e->getMessage() . "\n";
48+
echo get_class($e) . ': ' . $e->getMessage() . "\n";
4949
}
5050
echo 'DateTimeImmutable::getMicroseconds(): ' . var_export($dti->getMicroseconds(), true) . "\n";
5151

52-
echo 'MyDateTime::setMicroseconds('.var_export($microseconds, true).'):';
52+
echo 'MyDateTime::setMicroseconds('.var_export($microseconds, true).'): ';
5353
try {
5454
var_dump($myDt->setMicroseconds($microseconds));
5555
} catch (Throwable $e) {
56-
echo get_class($e) . ' ' . $e->getMessage() . "\n";
56+
echo get_class($e) . ': ' . $e->getMessage() . "\n";
5757
}
5858
echo 'MyDateTime::getMicroseconds(): ' . var_export($myDt->getMicroseconds(), true) . "\n";
5959

60-
echo 'MyDateTimeImmutable::setMicroseconds('.var_export($microseconds, true).'):';
60+
echo 'MyDateTimeImmutable::setMicroseconds('.var_export($microseconds, true).'): ';
6161
try {
6262
var_dump($myDti->setMicroseconds($microseconds));
6363
} catch (Throwable $e) {
64-
echo get_class($e) . ' ' . $e->getMessage() . "\n";
64+
echo get_class($e) . ': ' . $e->getMessage() . "\n";
6565
}
6666
echo 'MyDateTimeImmutable::getMicroseconds(): ' . var_export($myDti->getMicroseconds(), true) . "\n";
6767
}
@@ -104,7 +104,7 @@ object(MyDateTimeImmutable)#%d (3) {
104104
string(6) "+00:00"
105105
}
106106
##################################
107-
DateTime::setMicroseconds(0):object(DateTime)#%d (3) {
107+
DateTime::setMicroseconds(0): object(DateTime)#%d (3) {
108108
["date"]=>
109109
string(26) "2023-04-05 06:07:08.000000"
110110
["timezone_type"]=>
@@ -113,7 +113,7 @@ DateTime::setMicroseconds(0):object(DateTime)#%d (3) {
113113
string(6) "+00:00"
114114
}
115115
DateTime::getMicroseconds(): 0
116-
DateTimeImmutable::setMicroseconds(0):object(DateTimeImmutable)#%d (3) {
116+
DateTimeImmutable::setMicroseconds(0): object(DateTimeImmutable)#%d (3) {
117117
["date"]=>
118118
string(26) "2023-04-05 06:07:08.000000"
119119
["timezone_type"]=>
@@ -122,7 +122,7 @@ DateTimeImmutable::setMicroseconds(0):object(DateTimeImmutable)#%d (3) {
122122
string(6) "+00:00"
123123
}
124124
DateTimeImmutable::getMicroseconds(): 901234
125-
MyDateTime::setMicroseconds(0):object(MyDateTime)#%d (3) {
125+
MyDateTime::setMicroseconds(0): object(MyDateTime)#%d (3) {
126126
["date"]=>
127127
string(26) "2023-04-05 06:07:08.000000"
128128
["timezone_type"]=>
@@ -131,7 +131,7 @@ MyDateTime::setMicroseconds(0):object(MyDateTime)#%d (3) {
131131
string(6) "+00:00"
132132
}
133133
MyDateTime::getMicroseconds(): 0
134-
MyDateTimeImmutable::setMicroseconds(0):object(MyDateTimeImmutable)#%d (3) {
134+
MyDateTimeImmutable::setMicroseconds(0): object(MyDateTimeImmutable)#%d (3) {
135135
["date"]=>
136136
string(26) "2023-04-05 06:07:08.000000"
137137
["timezone_type"]=>
@@ -141,7 +141,7 @@ MyDateTimeImmutable::setMicroseconds(0):object(MyDateTimeImmutable)#%d (3) {
141141
}
142142
MyDateTimeImmutable::getMicroseconds(): 901234
143143
##################################
144-
DateTime::setMicroseconds(999999):object(DateTime)#%d (3) {
144+
DateTime::setMicroseconds(999999): object(DateTime)#%d (3) {
145145
["date"]=>
146146
string(26) "2023-04-05 06:07:08.999999"
147147
["timezone_type"]=>
@@ -150,7 +150,7 @@ DateTime::setMicroseconds(999999):object(DateTime)#%d (3) {
150150
string(6) "+00:00"
151151
}
152152
DateTime::getMicroseconds(): 999999
153-
DateTimeImmutable::setMicroseconds(999999):object(DateTimeImmutable)#%d (3) {
153+
DateTimeImmutable::setMicroseconds(999999): object(DateTimeImmutable)#%d (3) {
154154
["date"]=>
155155
string(26) "2023-04-05 06:07:08.999999"
156156
["timezone_type"]=>
@@ -159,7 +159,7 @@ DateTimeImmutable::setMicroseconds(999999):object(DateTimeImmutable)#%d (3) {
159159
string(6) "+00:00"
160160
}
161161
DateTimeImmutable::getMicroseconds(): 901234
162-
MyDateTime::setMicroseconds(999999):object(MyDateTime)#%d (3) {
162+
MyDateTime::setMicroseconds(999999): object(MyDateTime)#%d (3) {
163163
["date"]=>
164164
string(26) "2023-04-05 06:07:08.999999"
165165
["timezone_type"]=>
@@ -168,7 +168,7 @@ MyDateTime::setMicroseconds(999999):object(MyDateTime)#%d (3) {
168168
string(6) "+00:00"
169169
}
170170
MyDateTime::getMicroseconds(): 999999
171-
MyDateTimeImmutable::setMicroseconds(999999):object(MyDateTimeImmutable)#%d (3) {
171+
MyDateTimeImmutable::setMicroseconds(999999): object(MyDateTimeImmutable)#%d (3) {
172172
["date"]=>
173173
string(26) "2023-04-05 06:07:08.999999"
174174
["timezone_type"]=>
@@ -178,20 +178,20 @@ MyDateTimeImmutable::setMicroseconds(999999):object(MyDateTimeImmutable)#%d (3)
178178
}
179179
MyDateTimeImmutable::getMicroseconds(): 901234
180180
##################################
181-
DateTime::setMicroseconds(-1):DateRangeError Microseconds must be between 0 and 999999, -1 given
181+
DateTime::setMicroseconds(-1): DateRangeError: DateTime::setMicroseconds(): Argument #1 ($microseconds) must be between 0 and 999999, -1 given
182182
DateTime::getMicroseconds(): 999999
183-
DateTimeImmutable::setMicroseconds(-1):DateRangeError Microseconds must be between 0 and 999999, -1 given
183+
DateTimeImmutable::setMicroseconds(-1): DateRangeError: DateTimeImmutable::setMicroseconds(): Argument #1 ($microseconds) must be between 0 and 999999, -1 given
184184
DateTimeImmutable::getMicroseconds(): 901234
185-
MyDateTime::setMicroseconds(-1):DateRangeError Microseconds must be between 0 and 999999, -1 given
185+
MyDateTime::setMicroseconds(-1): DateRangeError: DateTime::setMicroseconds(): Argument #1 ($microseconds) must be between 0 and 999999, -1 given
186186
MyDateTime::getMicroseconds(): 999999
187-
MyDateTimeImmutable::setMicroseconds(-1):DateRangeError Microseconds must be between 0 and 999999, -1 given
187+
MyDateTimeImmutable::setMicroseconds(-1): DateRangeError: DateTimeImmutable::setMicroseconds(): Argument #1 ($microseconds) must be between 0 and 999999, -1 given
188188
MyDateTimeImmutable::getMicroseconds(): 901234
189189
##################################
190-
DateTime::setMicroseconds(1000000):DateRangeError Microseconds must be between 0 and 999999, 1000000 given
190+
DateTime::setMicroseconds(1000000): DateRangeError: DateTime::setMicroseconds(): Argument #1 ($microseconds) must be between 0 and 999999, 1000000 given
191191
DateTime::getMicroseconds(): 999999
192-
DateTimeImmutable::setMicroseconds(1000000):DateRangeError Microseconds must be between 0 and 999999, 1000000 given
192+
DateTimeImmutable::setMicroseconds(1000000): DateRangeError: DateTimeImmutable::setMicroseconds(): Argument #1 ($microseconds) must be between 0 and 999999, 1000000 given
193193
DateTimeImmutable::getMicroseconds(): 901234
194-
MyDateTime::setMicroseconds(1000000):DateRangeError Microseconds must be between 0 and 999999, 1000000 given
194+
MyDateTime::setMicroseconds(1000000): DateRangeError: DateTime::setMicroseconds(): Argument #1 ($microseconds) must be between 0 and 999999, 1000000 given
195195
MyDateTime::getMicroseconds(): 999999
196-
MyDateTimeImmutable::setMicroseconds(1000000):DateRangeError Microseconds must be between 0 and 999999, 1000000 given
196+
MyDateTimeImmutable::setMicroseconds(1000000): DateRangeError: DateTimeImmutable::setMicroseconds(): Argument #1 ($microseconds) must be between 0 and 999999, 1000000 given
197197
MyDateTimeImmutable::getMicroseconds(): 901234

0 commit comments

Comments
 (0)