com php-src: Fixed bug #71053 (Type Hint about DateTime::diff does not match with informed): NEWS ext/date/php_date.c ext/date/t ests/bug71053.phpt

From: Date: Wed, 09 Dec 2015 03:40:47 +0000
Subject: com php-src: Fixed bug #71053 (Type Hint about DateTime::diff does not match with informed): NEWS ext/date/php_date.c ext/date/t ests/bug71053.phpt
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-90148@lists.php.net to get a copy of this message
Commit: 943b23dcf6666a708c2ad4470cad5db36d47683a Author: Reeze Xia <reeze@php.net> Wed, 9 Dec 2015 11:35:39 +0800 Parents: 0adbf6de774d9b1938a34b969c40ea2ac1982222 Branches: PHP-7.0 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=943b23dcf6666a708c2ad4470cad5db36d47683a Log: Fixed bug #71053 (Type Hint about DateTime::diff does not match with informed) Bugs: https://bugs.php.net/71053 Changed paths: M NEWS M ext/date/php_date.c A ext/date/tests/bug71053.phpt Diff: diff --git a/NEWS b/NEWS index 33bd38c..aae08f2 100644 --- a/NEWS +++ b/NEWS @@ -2,6 +2,10 @@ PHP NEWS ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| ?? Jan 2016 PHP 7.0.2 +- Date: + . Fixed bug #71053 (Type Hint about DateTime::diff does not match with + informed). (Reeze Xia) + - Mbstring: . Fixed bug #71066 (mb_send_mail: Program terminated with signal SIGSEGV, Segmentation fault). (Laruence) diff --git a/ext/date/php_date.c b/ext/date/php_date.c index 50c48eb..b3125a9 100644 --- a/ext/date/php_date.c +++ b/ext/date/php_date.c @@ -3579,9 +3579,9 @@ PHP_FUNCTION(date_diff) zval *object1, *object2; php_date_obj *dateobj1, *dateobj2; php_interval_obj *interval; - zend_long absolute = 0; + zend_bool absolute = 0; - if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "OO|l", &object1, date_ce_interface, &object2, date_ce_interface, &absolute) == FAILURE) { + if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "OO|b", &object1, date_ce_interface, &object2, date_ce_interface, &absolute) == FAILURE) { RETURN_FALSE; } dateobj1 = Z_PHPDATE_P(object1); diff --git a/ext/date/tests/bug71053.phpt b/ext/date/tests/bug71053.phpt new file mode 100644 index 0000000..2c86f9f --- /dev/null +++ b/ext/date/tests/bug71053.phpt @@ -0,0 +1,13 @@ +--TEST-- +Bug #71053 (Type Hint about DateTime::diff does not match with informed) +--FILE-- +<?php +declare(strict_types=1); + +$date1 = new \DateTime(); +$date2 = clone $date1; + +var_dump(count($date1->diff($date2 , true)) > 0); +?> +--EXPECT-- +bool(true)

« previous php.cvs (#90148) next »