From: Nikita Popov <nikita.ppv@gmail.com>
Date: Mon, 18 Mar 2019 09:14:03 +0000 (+0100)
Subject: Merge branch 'PHP-7.3' into PHP-7.4
X-Git-Tag: php-7.4.0alpha1~737
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1b411c039f5c7646eb14b7920bf4fa794c982de0;p=php

Merge branch 'PHP-7.3' into PHP-7.4
---

1b411c039f5c7646eb14b7920bf4fa794c982de0
diff --cc ext/date/php_date.c
index ec3ead6f2a,541fdafea3..565e018538
--- 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);
  }
  /* }}} */