Merge branch 'PHP-8.3' into PHP-8.4

Author: petk

cmake/ext/pcre/CMakeLists.txt

@@ -141,55 +141,53 @@ if(PHP_EXT_PCRE_EXTERNAL)
 else()
   message(STATUS "Using bundled PCRE library")
 
-  block()
-    target_sources(
-      php_ext_pcre
-      PRIVATE
-        pcre2lib/pcre2_auto_possess.c
-        pcre2lib/pcre2_chartables.c
-        pcre2lib/pcre2_chkdint.c
-        pcre2lib/pcre2_compile.c
-        pcre2lib/pcre2_config.c
-        pcre2lib/pcre2_context.c
-        pcre2lib/pcre2_convert.c
-        pcre2lib/pcre2_dfa_match.c
-        pcre2lib/pcre2_error.c
-        pcre2lib/pcre2_extuni.c
-        pcre2lib/pcre2_find_bracket.c
-        pcre2lib/pcre2_jit_compile.c
-        pcre2lib/pcre2_maketables.c
-        pcre2lib/pcre2_match_data.c
-        pcre2lib/pcre2_match.c
-        pcre2lib/pcre2_newline.c
-        pcre2lib/pcre2_ord2utf.c
-        pcre2lib/pcre2_pattern_info.c
-        pcre2lib/pcre2_script_run.c
-        pcre2lib/pcre2_serialize.c
-        pcre2lib/pcre2_string_utils.c
-        pcre2lib/pcre2_study.c
-        pcre2lib/pcre2_substitute.c
-        pcre2lib/pcre2_substring.c
-        pcre2lib/pcre2_tables.c
-        pcre2lib/pcre2_ucd.c
-        pcre2lib/pcre2_valid_utf.c
-        pcre2lib/pcre2_xclass.c
-      PUBLIC
-        FILE_SET HEADERS
-          FILES
-            # Exclude PCRE2 library config.h header as it uses the
-            # HAVE_PCRE_VALGRIND_SUPPORT provided via compile definition by
-            # generator expressions (not available in the PHP configuration
-            # headers). It isn't required to use public headers. Perhaps more
-            # could be filtered and synced with upstream PCRE installed headers.
-            #pcre2lib/config.h
-            pcre2lib/pcre2_internal.h
-            pcre2lib/pcre2_intmodedep.h
-            pcre2lib/pcre2_jit_neon_inc.h
-            pcre2lib/pcre2_jit_simd_inc.h
-            pcre2lib/pcre2_ucp.h
-            pcre2lib/pcre2.h
-    )
-  endblock()
+  target_sources(
+    php_ext_pcre
+    PRIVATE
+      pcre2lib/pcre2_auto_possess.c
+      pcre2lib/pcre2_chartables.c
+      pcre2lib/pcre2_chkdint.c
+      pcre2lib/pcre2_compile.c
+      pcre2lib/pcre2_config.c
+      pcre2lib/pcre2_context.c
+      pcre2lib/pcre2_convert.c
+      pcre2lib/pcre2_dfa_match.c
+      pcre2lib/pcre2_error.c
+      pcre2lib/pcre2_extuni.c
+      pcre2lib/pcre2_find_bracket.c
+      pcre2lib/pcre2_jit_compile.c
+      pcre2lib/pcre2_maketables.c
+      pcre2lib/pcre2_match_data.c
+      pcre2lib/pcre2_match.c
+      pcre2lib/pcre2_newline.c
+      pcre2lib/pcre2_ord2utf.c
+      pcre2lib/pcre2_pattern_info.c
+      pcre2lib/pcre2_script_run.c
+      pcre2lib/pcre2_serialize.c
+      pcre2lib/pcre2_string_utils.c
+      pcre2lib/pcre2_study.c
+      pcre2lib/pcre2_substitute.c
+      pcre2lib/pcre2_substring.c
+      pcre2lib/pcre2_tables.c
+      pcre2lib/pcre2_ucd.c
+      pcre2lib/pcre2_valid_utf.c
+      pcre2lib/pcre2_xclass.c
+    PUBLIC
+      FILE_SET HEADERS
+        FILES
+          # Exclude PCRE2 library config.h header as it uses the
+          # HAVE_PCRE_VALGRIND_SUPPORT provided via compile definition by
+          # generator expressions (not available in the PHP configuration
+          # headers). It isn't required to use public headers. Perhaps more
+          # could be filtered and synced with upstream PCRE installed headers.
+          #pcre2lib/config.h
+          pcre2lib/pcre2_internal.h
+          pcre2lib/pcre2_intmodedep.h
+          pcre2lib/pcre2_jit_neon_inc.h
+          pcre2lib/pcre2_jit_simd_inc.h
+          pcre2lib/pcre2_ucp.h
+          pcre2lib/pcre2.h
+  )
 
   # For pcre2lib/sljit/sljitNativeARM_64.c on ARM 64 processors build.
   php_check_compiler_flag(