com php-src: Merge branch 'PHP-7.3' into PHP-7.4: Zend/zend_p ortability.h ext/date/php_date.c

Commit: 1b411c039f5c7646eb14b7920bf4fa794c982de0 Author: Nikita Popov <nikita.ppv@gmail.com> Mon, 18 Mar 2019 10:14:03 +0100 Parents: 51ed4a8d8f0e50a182c3697df8242356f80dd460 c4464526cd8c7ef246ea4be145d798e084460d9d Branches: PHP-7.4 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=1b411c039f5c7646eb14b7920bf4fa794c982de0 Log: Merge branch 'PHP-7.3' into PHP-7.4 Changed paths: MM Zend/zend_portability.h MM ext/date/php_date.c Diff: diff --cc ext/date/php_date.c index ec3ead6,541fdaf..565e018 --- a/ext/date/php_date.c +++ b/ext/date/php_date.c @@@ -4735,20 -4736,19 +4735,19 @@@ PHP_METHOD(DatePeriod, getDateInterval */ PHP_METHOD(DatePeriod, getRecurrences) { - php_period_obj *dpobj; - php_date_obj *dateobj; - php_period_obj *dpobj; ++ php_period_obj *dpobj; - if (zend_parse_parameters_none() == FAILURE) { - return; - } + if (zend_parse_parameters_none() == FAILURE) { - return; ++ return; + } - dpobj = Z_PHPPERIOD_P(ZEND_THIS); - dpobj = Z_PHPPERIOD_P(getThis()); ++ dpobj = Z_PHPPERIOD_P(ZEND_THIS); - if (0 == dpobj->recurrences - dpobj->include_start_date) { - return; - } + if (0 == dpobj->recurrences - dpobj->include_start_date) { - return; ++ return; + } - RETURN_LONG(dpobj->recurrences - dpobj->include_start_date); + RETURN_LONG(dpobj->recurrences - dpobj->include_start_date); } /* }}} */