Skip to content

Commit ed808c5

Browse files
committed
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3: NEWS Revert "Fix #77609: Tests from mailparse extension fails"
2 parents fb109ba + 999370b commit ed808c5

File tree

1 file changed

+3
-4
lines changed

1 file changed

+3
-4
lines changed

build/Makefile.global

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -83,21 +83,20 @@ PHP_TEST_SHARED_EXTENSIONS = ` \
8383
. $$i; $(top_srcdir)/build/shtool echo -n -- " -d $(ZEND_EXT_TYPE)=$(top_builddir)/modules/$$dlname"; \
8484
done; \
8585
fi`
86-
PHP_FILTERED_DIRECTIVES_REGEX = '^(magic_quotes_(gpc|runtime|sybase)?|zend_extension(_debug)?(_ts)?)[\t\ ]*='
87-
PHP_EXTENSION_PATH_FIX_REGEX = "/^extension *= *[^/]/s,extension *= *,extension=$(EXTENSION_DIR)/,g"
86+
PHP_DEPRECATED_DIRECTIVES_REGEX = '^(magic_quotes_(gpc|runtime|sybase)?|(zend_)?extension(_debug)?(_ts)?)[\t\ ]*='
8887

8988
test: all
9089
@if test ! -z "$(PHP_EXECUTABLE)" && test -x "$(PHP_EXECUTABLE)"; then \
9190
INI_FILE=`$(PHP_EXECUTABLE) -d 'display_errors=stderr' -r 'echo php_ini_loaded_file();' 2> /dev/null`; \
9291
if test "$$INI_FILE"; then \
93-
$(EGREP) -h -v $(PHP_FILTERED_DIRECTIVES_REGEX) "$$INI_FILE" | $(SED) $(PHP_EXTENSION_PATH_FIX_REGEX) > $(top_builddir)/tmp-php.ini; \
92+
$(EGREP) -h -v $(PHP_DEPRECATED_DIRECTIVES_REGEX) "$$INI_FILE" > $(top_builddir)/tmp-php.ini; \
9493
else \
9594
echo > $(top_builddir)/tmp-php.ini; \
9695
fi; \
9796
INI_SCANNED_PATH=`$(PHP_EXECUTABLE) -d 'display_errors=stderr' -r '$$a = explode(",\n", trim(php_ini_scanned_files())); echo $$a[0];' 2> /dev/null`; \
9897
if test "$$INI_SCANNED_PATH"; then \
9998
INI_SCANNED_PATH=`$(top_srcdir)/build/shtool path -d $$INI_SCANNED_PATH`; \
100-
$(EGREP) -h -v $(PHP_FILTERED_DIRECTIVES_REGEX) "$$INI_SCANNED_PATH"/*.ini | $(SED) $(PHP_EXTENSION_PATH_FIX_REGEX) >> $(top_builddir)/tmp-php.ini; \
99+
$(EGREP) -h -v $(PHP_DEPRECATED_DIRECTIVES_REGEX) "$$INI_SCANNED_PATH"/*.ini >> $(top_builddir)/tmp-php.ini; \
101100
fi; \
102101
TEST_PHP_EXECUTABLE=$(PHP_EXECUTABLE) \
103102
TEST_PHP_SRCDIR=$(top_srcdir) \

0 commit comments

Comments
 (0)