Merge branch 'PHP-7.3' into PHP-7.4

diff --cc Zend/zend_portability.h
Simple merge

diff --cc ext/date/php_date.c
index ec3ead6f2a0a3e318258332c07171298142961e4,541fdafea3aa347b5cbfc7c26d7ede73598aa778..565e0185382a6732513468f6ba24250c37793a96
--- 1/ext/date/php_date.c
--- 2/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);
  }
  /* }}} */