Cleanup

Author: danog

.github/nightly.php

@@ -123,15 +123,6 @@ function (): void {
     "",
     function (): void {
         e("php ./phpunit install");
-
-        // Test causes a heap-buffer-overflow but I cannot reproduce it locally...
-        $c = file_get_contents("src/Symfony/Component/HtmlSanitizer/Tests/HtmlSanitizerCustomTest.php");
-        $c = str_replace("public function testSanitizeDeepNestedString()", "/** @group skip */\n    public function testSanitizeDeepNestedString()", $c);
-        file_put_contents("src/Symfony/Component/HtmlSanitizer/Tests/HtmlSanitizerCustomTest.php", $c);
-        // Buggy FFI test in Symfony, see https://github.com/symfony/symfony/issues/47668
-        $c = file_get_contents("src/Symfony/Component/VarDumper/Tests/Caster/FFICasterTest.php"); 
-        $c = str_replace("*/\n    public function testCastNonTrailingCharPointer()", "* @group skip\n     */\n    public function testCastNonTrailingCharPointer()", $c);
-        file_put_contents("src/Symfony/Component/VarDumper/Tests/Caster/FFICasterTest.php", $c);
     },
     function (): iterable {
         $it = new RecursiveDirectoryIterator("src/Symfony");

Zend/zend_portability.h

@@ -164,7 +164,7 @@
 
 # if defined(RTLD_GROUP) && defined(RTLD_WORLD) && defined(RTLD_PARENT)
 #  define DL_LOAD(libname)			dlopen(libname, PHP_RTLD_MODE | RTLD_GLOBAL | RTLD_GROUP | RTLD_WORLD | RTLD_PARENT)
-# elif defined(RTLD_DEEPBIND) && !defined(__SANITIZE_ADDRESS__) && !__has_feature(memory_sanitizer) && defined(PHP_USE_RTLD_DEEPBIND)
+# elif defined(RTLD_DEEPBIND) && !defined(__SANITIZE_ADDRESS__) && !__has_feature(memory_sanitizer)
 #  define DL_LOAD(libname)			dlopen(libname, PHP_RTLD_MODE | RTLD_GLOBAL | RTLD_DEEPBIND)
 # else
 #  define DL_LOAD(libname)			dlopen(libname, PHP_RTLD_MODE | RTLD_GLOBAL)

configure.ac

@@ -868,23 +868,6 @@ AS_VAR_IF([PHP_RTLD_NOW], [yes],
     [Define to 1 if 'dlopen()' uses the 'RTLD_NOW' mode flag instead of
     'RTLD_LAZY'.])])
 
-if test "$PHP_SAPI" = "apache2handler"; then
-  PHP_RTLD_DEEPBIND_DEFAULT=yes
-else
-  PHP_RTLD_DEEPBIND_DEFAULT=no
-fi
-
-PHP_ARG_ENABLE([rtld-deepbind],
-  [whether to dlopen extensions with RTLD_DEEPBIND],
-  [AS_HELP_STRING([--enable-rtld-deepbind],
-    [Use dlopen with RTLD_DEEPBIND])],
-  [$PHP_RTLD_DEEPBIND_DEFAULT],
-  [$PHP_RTLD_DEEPBIND_DEFAULT])
-
-if test "$PHP_RTLD_DEEPBIND" = "yes"; then
-  AC_DEFINE(PHP_USE_RTLD_DEEPBIND, 1, [ Use dlopen with RTLD_DEEPBIND ])
-fi
-
 PHP_ARG_WITH([layout],
   [layout of installed files],
   [AS_HELP_STRING([--with-layout=TYPE],