Skip to content

Add some ValueErrors to ext/date #5613

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 11 commits into from
Closed

Add some ValueErrors to ext/date #5613

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
68f47b6
Add some ValueErrors to ext/date
Girgias May 22, 2020
1e3509b
Fix null byte comment
Girgias Sep 10, 2020
b6fea36
Fix stubs/arginfo
Girgias Sep 10, 2020
6f8f866
Make notice in timezone_identifiers_list() into a ValueError
Girgias Sep 10, 2020
48240d5
Add warnings for when Epoch doesn't fit in a PHP integer
Girgias Sep 10, 2020
2e24885
Make epoch doesn't fit into PHP String a value error for date_timesta…
Girgias Sep 10, 2020
aa48d8e
Drop todo comment because it's impossible to find the new link to sai…
Girgias Sep 10, 2020
4f9cae2
Drop comment and rename error1 var
Girgias Sep 14, 2020
9362d5a
Revert idate() changes
Girgias Sep 14, 2020
a72f3cb
Fix OpCache
Girgias Sep 15, 2020
52593f5
Fix 32bit tests
Girgias Sep 15, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Revert idate() changes
  • Loading branch information
@Girgias
Girgias committed Sep 15, 2020
commit 9362d5a81287308030be53fce0a8db73fc331fe6
8 changes: 4 additions & 4 deletions ext/date/php_date.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -951,8 +951,8 @@ PHP_FUNCTION(idate)
ZEND_PARSE_PARAMETERS_END();

if (ZSTR_LEN(format) != 1) {
zend_argument_value_error(1, "must be one character");
RETURN_THROWS();
php_error_docref(NULL, E_WARNING, "idate format is one char");
RETURN_FALSE;
}

if (ts_is_null) {
Expand All @@ -961,8 +961,8 @@ PHP_FUNCTION(idate)

ret = php_idate(ZSTR_VAL(format)[0], ts, 0);
if (ret == -1) {
zend_argument_value_error(1, "must be a valid date format token");
RETURN_THROWS();
php_error_docref(NULL, E_WARNING, "Unrecognized date format token");
RETURN_FALSE;
}
RETURN_LONG(ret);
}
Expand Down
2 changes: 1 addition & 1 deletion ext/date/php_date.stub.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ function strtotime(string $datetime, ?int $baseTimestamp = null): int|false {}

function date(string $format, ?int $timestamp = null): string {}

function idate(string $format, ?int $timestamp = null): int {}
function idate(string $format, ?int $timestamp = null): int|false {}

function gmdate(string $format, ?int $timestamp = null): string {}

Expand Down
4 changes: 2 additions & 2 deletions ext/date/php_date_arginfo.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/* This is a generated file, edit the .stub.php file instead.
* Stub hash: eae561b0424a4837d35239b66be8c545d7ac2b04 */
* Stub hash: cb1532309655d85eb2644cdcfbf23063dfa1ddaf */

ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_strtotime, 0, 1, MAY_BE_LONG|MAY_BE_FALSE)
ZEND_ARG_TYPE_INFO(0, datetime, IS_STRING, 0)
Expand All @@ -11,7 +11,7 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_date, 0, 1, IS_STRING, 0)
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, timestamp, IS_LONG, 1, "null")
ZEND_END_ARG_INFO()

ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_idate, 0, 1, IS_LONG, 0)
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_idate, 0, 1, MAY_BE_LONG|MAY_BE_FALSE)
ZEND_ARG_TYPE_INFO(0, format, IS_STRING, 0)
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, timestamp, IS_LONG, 1, "null")
ZEND_END_ARG_INFO()
Expand Down
53 changes: 20 additions & 33 deletions ext/date/tests/005.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,42 +6,29 @@ date_default_timezone_set('UTC');

$t = mktime(0,0,0, 6, 27, 2006);

try {
var_dump(idate(1,1));
} catch (\ValueError $e) {
echo $e->getMessage() . \PHP_EOL;
}
try {
var_dump(idate(""));
} catch (\ValueError $e) {
echo $e->getMessage() . \PHP_EOL;
}
try {
var_dump(idate(0));
} catch (\ValueError $e) {
echo $e->getMessage() . \PHP_EOL;
}

var_dump(idate(1,1));
var_dump(idate(""));
var_dump(idate(0));
var_dump(idate("B", $t));

try {
var_dump(idate("[", $t));
} catch (\ValueError $e) {
echo $e->getMessage() . \PHP_EOL;
}
try {
var_dump(idate("'"));
} catch (\ValueError $e) {
echo $e->getMessage() . \PHP_EOL;
}
var_dump(idate("[", $t));
var_dump(idate("'"));

echo "Done\n";
?>
--EXPECT--
idate(): Argument #1 ($format) must be a valid date format token
idate(): Argument #1 ($format) must be one character
idate(): Argument #1 ($format) must be a valid date format token
--EXPECTF--
Warning: idate(): Unrecognized date format token in %s on line %d
bool(false)

Warning: idate(): idate format is one char in %s on line %d
bool(false)

Warning: idate(): Unrecognized date format token in %s on line %d
bool(false)
int(41)
idate(): Argument #1 ($format) must be a valid date format token
idate(): Argument #1 ($format) must be a valid date format token

Warning: idate(): Unrecognized date format token in %s on line %d
bool(false)

Warning: idate(): Unrecognized date format token in %s on line %d
bool(false)
Done