Merge branch 'PHP-7.3' into PHP-7.4

Author: nikic

Zend/zend_portability.h

@@ -444,12 +444,8 @@ char *alloca();
 #define MAX(a, b)  (((a)>(b))?(a):(b))
 #define MIN(a, b)  (((a)<(b))?(a):(b))
 
-/* x86 instructions BT, SHL, SHR don't require masking */
-#if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__)) || defined(ZEND_WIN32)
-# define ZEND_BIT_TEST(bits, bit) (((bits)[(bit) / (sizeof((bits)[0])*8)] >> (bit)) & 1)
-#else
-# define ZEND_BIT_TEST(bits, bit) (((bits)[(bit) / (sizeof((bits)[0])*8)] >> ((bit) & (sizeof((bits)[0])*8-1))) & 1)
-#endif
+#define ZEND_BIT_TEST(bits, bit) \
+	(((bits)[(bit) / (sizeof((bits)[0])*8)] >> ((bit) & (sizeof((bits)[0])*8-1))) & 1)
 
 /* We always define a function, even if there's a macro or expression we could
  * alias, so that using it in contexts where we can't make function calls

ext/date/php_date.c

@@ -4735,20 +4735,19 @@ PHP_METHOD(DatePeriod, getDateInterval)
 */
 PHP_METHOD(DatePeriod, getRecurrences)
 {
-        php_period_obj   *dpobj;
-        php_date_obj     *dateobj;
+	php_period_obj   *dpobj;
 
-        if (zend_parse_parameters_none() == FAILURE) {
-                return;
-        }
+	if (zend_parse_parameters_none() == FAILURE) {
+			return;
+	}
 
-        dpobj = Z_PHPPERIOD_P(ZEND_THIS);
+	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_LONG(dpobj->recurrences - dpobj->include_start_date);
+	RETURN_LONG(dpobj->recurrences - dpobj->include_start_date);
 }
 /* }}} */