Macos ci counter test (hakre/php-src)

.github/actions/apt-x32/action.yml

@@ -33,13 +33,11 @@ runs:
           libsodium-dev:i386 \
           libsqlite3-dev:i386 \
           libssl-dev:i386 \
-          libtidy-dev:i386 \
           libwebp-dev:i386 \
           libxml2-dev:i386 \
           libxml2-dev:i386 \
           libxpm-dev:i386 \
           libxslt1-dev:i386 \
-          libzip-dev:i386 \
           locales \
           make \
           pkg-config:i386 \

.github/actions/brew/action.yml

@@ -13,7 +13,7 @@ runs:
 
         # Some packages exist on x86 but not arm, or vice versa.
         # Install them with reinstall to avoid warnings.
-        brew reinstall autoconf webp tidy-html5 libzip libsodium icu4c
+        brew reinstall autoconf webp tidy-html5 libzip libsodium icu4c curl
         brew install \
           bison \
           re2c

.github/actions/configure-macos/action.yml

@@ -18,6 +18,7 @@ runs:
         export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:$BREW_OPT/libxslt/lib/pkgconfig"
         export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:$BREW_OPT/zlib/lib/pkgconfig"
         export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:$BREW_OPT/icu4c/lib/pkgconfig"
+        export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:$BREW_OPT/openldap/lib/pkgconfig"
         ./buildconf --force
         ./configure \
           --enable-option-checking=fatal \

.github/actions/configure-x32/action.yml

@@ -10,6 +10,7 @@ runs:
       run: |
         set -x
 
+        export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:/usr/lib/i386-linux-gnu/pkgconfig"
         ./buildconf --force
         export CFLAGS="-m32 -msse2"
         export CXXFLAGS="-m32 -msse2"
@@ -33,12 +34,10 @@ runs:
             --with-freetype \
             --with-xpm \
             --enable-exif \
-            --with-zip \
             --with-zlib \
             --enable-soap \
             --enable-xmlreader \
             --with-xsl \
-            --with-tidy \
             --enable-sysvsem \
             --enable-sysvshm \
             --enable-shmop \

.github/workflows/push.yml

@@ -1,7 +1,7 @@
 name: Push
 on:
   push:
-    paths-ignore:
+    paths-ignore: &paths-ignore
       - docs/**
       - NEWS
       - UPGRADING
@@ -18,16 +18,7 @@ on:
       - PHP-8.4
       - master
   pull_request:
-    paths-ignore:
-      - docs/**
-      - NEWS
-      - UPGRADING
-      - UPGRADING.INTERNALS
-      - '**/README.*'
-      - CONTRIBUTING.md
-      - CODING_STANDARDS.md
-      - .cirrus.yml
-      - .circleci/**
+    paths-ignore: *paths-ignore
     branches:
       - '**'
   workflow_dispatch: ~
@@ -78,7 +69,7 @@ jobs:
             zts: true
             asan: true
     name: "LINUX_X64_${{ matrix.debug && 'DEBUG' || 'RELEASE' }}_${{ matrix.zts && 'ZTS' || 'NTS' }}${{ matrix.asan && '_ASAN' || '' }}"
-    runs-on: ubuntu-${{ !matrix.asan && '22' || '24' }}.04
+    runs-on: ubuntu-24.04
     timeout-minutes: 50
     steps:
       - name: git checkout
@@ -142,7 +133,7 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: 50
     container:
-      image: ubuntu:20.04
+      image: ubuntu:24.04
     env:
       MYSQL_TEST_HOST: mysql
       PDO_MYSQL_TEST_DSN: mysql:host=mysql;dbname=test
@@ -255,7 +246,7 @@ jobs:
   BENCHMARKING:
     name: BENCHMARKING
     if: github.repository == 'php/php-src' || github.event_name == 'pull_request'
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     timeout-minutes: 50
     steps:
       - name: git checkout

.github/workflows/root.yml

@@ -46,12 +46,17 @@ jobs:
       matrix:
         branch: ${{ fromJson(needs.GENERATE_MATRIX.outputs.branches) }}
     with:
-      asan_ubuntu_version: '20.04'
+      asan_ubuntu_version: ${{
+        (((matrix.branch.version[0] == 8 && matrix.branch.version[1] >= 5) || matrix.branch.version[0] >= 9) && '24.04')
+        || '20.04' }}
       branch: ${{ matrix.branch.ref }}
       community_verify_type_inference: ${{ (matrix.branch.version[0] == 8 && matrix.branch.version[1] >= 4) || matrix.branch.version[0] >= 9 }}
       libmysqlclient_with_mysqli: ${{ (matrix.branch.version[0] == 8 && matrix.branch.version[1] == 1) }}
       run_alpine: ${{ (matrix.branch.version[0] == 8 && matrix.branch.version[1] >= 4) || matrix.branch.version[0] >= 9 }}
       run_macos_arm64: ${{ (matrix.branch.version[0] == 8 && matrix.branch.version[1] >= 4) || matrix.branch.version[0] >= 9 }}
-      ubuntu_version: ${{ ((matrix.branch.version[0] == 8 && matrix.branch.version[1] >= 3) || matrix.branch.version[0] >= 9) && '22.04' || '20.04' }}
+      ubuntu_version: ${{
+        (((matrix.branch.version[0] == 8 && matrix.branch.version[1] >= 5) || matrix.branch.version[0] >= 9) && '24.04')
+        || ((matrix.branch.version[0] == 8 && matrix.branch.version[1] >= 3) && '22.04')
+        || '20.04' }}
       windows_version: ${{ ((matrix.branch.version[0] == 8 && matrix.branch.version[1] >= 4) || matrix.branch.version[0] >= 9) && '2022' || '2019' }}
     secrets: inherit

NEWS

@@ -14,6 +14,7 @@ PHP                                                                        NEWS
 
 - DOM:
   . Added Dom\Element::$outerHTML. (nielsdos)
+  . Added Dom\Element::insertAdjacentHTML(). (nielsdos)
 
 - Output:
   . Fixed calculation of aligned buffer size. (cmb)
@@ -36,10 +37,22 @@ PHP                                                                        NEWS
 - Random:
   . Moves from /dev/urandom usage to arc4random_buf on Haiku. (David Carlier)
 
+- Reflection:
+  . Added ReflectionConstant::getExtension() and ::getExtensionName().
+    (DanielEScherzer)
+
 - SOAP:
   . Fixed bug #49169 (SoapServer calls wrong function, although "SOAP action"
     header is correct). (nielsdos)
 
+- Standard:
+  . Fixed crypt() tests on musl when using --with-external-libcrypt
+    (Michael Orlitzky).
+
+- Windows:
+  . Fixed bug GH-10992 (Improper long path support for relative paths). (cmb,
+    nielsdos)
+
 - XMLWriter:
   . Improved performance and reduce memory consumption. (nielsdos)
 

UPGRADING

@@ -92,13 +92,18 @@ PHP 8.5 UPGRADE NOTES
     attached to a CurlMultiHandle. This includes both handles added using
     curl_multi_add_handle() and handles accepted by CURLMOPT_PUSHFUNCTION.
 
+- DOM:
+  . Added Dom\Element::insertAdjacentHTML().
+
 - PGSQL:
   . pg_close_stmt offers an alternative way to close a prepared
     statement from the DEALLOCATE sql command in that we can reuse
     its name afterwards.
 
 - Reflection:
   . ReflectionConstant::getFileName() was introduced.
+  . ReflectionConstant::getExtension() and
+    ReflectionConstant::getExtensionName() were introduced.
 
 ========================================
 7. New Classes and Interfaces

Zend/zend_constants.c

@@ -504,11 +504,12 @@ ZEND_API zend_result zend_register_constant(zend_constant *c)
 		name = c->name;
 	}
 
-	zend_string *filename = zend_get_executed_filename_ex();
-	if (filename == NULL) {
-		c->filename = NULL;
-	} else {
-		c->filename = zend_string_copy(filename);
+	c->filename = NULL;
+	if (ZEND_CONSTANT_MODULE_NUMBER(c) == PHP_USER_CONSTANT) {
+		zend_string *filename = zend_get_executed_filename_ex();
+		if (filename) {
+			c->filename = zend_string_copy(filename);
+		}
 	}
 
 	/* Check if the user is trying to define any special constant */

Zend/zend_portability.h

@@ -515,6 +515,13 @@ extern "C++" {
 # undef HAVE_FUNC_ATTRIBUTE_IFUNC
 #endif
 
+#if __has_feature(memory_sanitizer)
+# include <sanitizer/msan_interface.h>
+# define MSAN_UNPOISON(value) __msan_unpoison(&(value), sizeof(value))
+#else
+# define MSAN_UNPOISON(value)
+#endif
+
 /* Only use ifunc resolvers if we have __builtin_cpu_supports() and __builtin_cpu_init(),
  * otherwise the use of zend_cpu_supports() may not be safe inside ifunc resolvers. */
 #if defined(HAVE_FUNC_ATTRIBUTE_IFUNC) && defined(HAVE_FUNC_ATTRIBUTE_TARGET) && \

Zend/zend_strtod.c

@@ -3605,13 +3605,20 @@ rv_alloc(i) int i;
 rv_alloc(int i)
 #endif
 {
-	int k, *r;
 
-	size_t j = sizeof(ULong);
+	int j, k, *r;
+	size_t rem;
+
+	rem = sizeof(Bigint) - sizeof(ULong) - sizeof(int);
+
+
+	j = sizeof(ULong);
+	if (i > ((INT_MAX >> 2) + rem))
+		i = (INT_MAX >> 2) + rem;
 	for(k = 0;
-		sizeof(Bigint) - sizeof(ULong) - sizeof(int) + j <= (size_t)i;
-		j <<= 1)
+		rem + j <= (size_t)i; j <<= 1)
 			k++;
+
 	r = (int*)Balloc(k);
 	*r = k;
 	return

build/genif.sh

@@ -32,7 +32,7 @@ header_list=
 olddir=$(pwd)
 
 # Go to project root.
-cd $(CDPATH= cd -- "$(dirname -- "$0")/../" && pwd -P)
+cd "$(CDPATH='' cd -- "$(dirname -- "$0")/../" && pwd -P)" || exit
 
 module_ptrs="$(echo $extensions | $AWK -f ./build/order_by_dep.awk)"
 

buildconf

@@ -8,9 +8,9 @@ force=0
 debug=0
 
 # Go to project root.
-cd $(CDPATH= cd -- "$(dirname -- "$0")" && pwd -P)
+cd "$(CDPATH='' cd -- "$(dirname -- "$0")" && pwd -P)" || exit
 
-php_extra_version=$(grep '^AC_INIT(' configure.ac)
+php_extra_version=$(grep '^AC_INIT(' configure.ac) || exit
 case "$php_extra_version" in
   *-dev*)
     dev=1

ext/curl/interface.c

@@ -1283,13 +1283,13 @@ void _php_setup_easy_copy_handlers(php_curl *ch, php_curl *source)
 	ch->handlers.read->res = source->handlers.read->res;
 
 	if (ZEND_FCC_INITIALIZED(source->handlers.read->fcc)) {
-		zend_fcc_dup(&source->handlers.read->fcc, &source->handlers.read->fcc);
+		zend_fcc_dup(&ch->handlers.read->fcc, &source->handlers.read->fcc);
 	}
 	if (ZEND_FCC_INITIALIZED(source->handlers.write->fcc)) {
-		zend_fcc_dup(&source->handlers.write->fcc, &source->handlers.write->fcc);
+		zend_fcc_dup(&ch->handlers.write->fcc, &source->handlers.write->fcc);
 	}
 	if (ZEND_FCC_INITIALIZED(source->handlers.write_header->fcc)) {
-		zend_fcc_dup(&source->handlers.write_header->fcc, &source->handlers.write_header->fcc);
+		zend_fcc_dup(&ch->handlers.write_header->fcc, &source->handlers.write_header->fcc);
 	}
 
 	curl_easy_setopt(ch->cp, CURLOPT_ERRORBUFFER,       ch->err.str);

ext/curl/tests/bug77535.phpt

@@ -2,7 +2,7 @@
 Bug #77535 (Invalid callback, h2 server push)
 --EXTENSIONS--
 curl
---XLEAK--
+--XFAIL--
 --SKIPIF--
 <?php
 include 'skipif-nocaddy.inc';

ext/curl/tests/curl_pushfunction_trampoline.phpt

@@ -2,7 +2,7 @@
 Test trampoline for curl option CURLMOPT_PUSHFUNCTION
 --EXTENSIONS--
 curl
---XLEAK--
+--XFAIL--
 --SKIPIF--
 <?php
 include 'skipif-nocaddy.inc';
@@ -60,6 +60,7 @@ sort($responses);
 print_r($responses);
 ?>
 --EXPECT--
+Trampoline for trampoline
 Array
 (
     [0] => main response

ext/dl_test/dl_test.c

@@ -94,6 +94,8 @@ PHP_MINIT_FUNCTION(dl_test)
 		fprintf(stderr, "DL TEST MINIT\n");
 	}
 
+	register_dl_test_symbols(module_number);
+
 	return SUCCESS;
 }
 /* }}} */

ext/dl_test/dl_test.stub.php

@@ -8,3 +8,6 @@
 function dl_test_test1(): void {}
 
 function dl_test_test2(string $str = ""): string {}
+
+/** @var int */
+const DL_TEST_CONST = 42;