Sync CS and changes for other pull requests

- checker script now works also for nested namespaces if such complexity
  will be used by anychance for some module
- some absolute paths normalized
- some CS nits fixed and synced
- patches updated
- added re2c patch

Author: petk

bin/check-cmake.php

@@ -457,12 +457,19 @@ function checkModules(Iterator $modules, Iterator $allCMakeFiles): int
     $status = 0;
 
     foreach ($modules as $module) {
-        $moduleName = $module->getBasename('.cmake');
-        $prefix = pathinfo(dirname($module->getRealPath()), PATHINFO_FILENAME);
-        $prefix = (1 === preg_match('/cmake|modules/', $prefix)) ? '' : $prefix . '/';
-        $moduleNameEscaped = str_replace('/', '\/', $prefix . $moduleName);
-        $moduleBasename = $module->getBasename();
-        $moduleBasenameEscaped = str_replace('.', '\.', $moduleBasename);
+        $namespace = '';
+        $parent = dirname($module->getRealPath());
+        $prefix = pathinfo($parent, PATHINFO_FILENAME);
+        $counter = 0;
+        while ($counter < 10 && 0 === preg_match('/cmake|modules/', $prefix)) {
+            $namespace = $prefix . '/' . $namespace;
+            $parent = dirname($parent);
+            $prefix = pathinfo($parent, PATHINFO_FILENAME);
+            ++$counter;
+        }
+
+        $moduleNameEscaped = str_replace('/', '\/', $namespace . $module->getBasename('.cmake'));
+        $moduleBasenameEscaped = str_replace('.', '\.', $module->getBasename());
 
         $found = false;
         foreach ($allCMakeFiles as $file) {

cmake/cmake/modules/FindDTrace.cmake

@@ -162,17 +162,32 @@ function(dtrace_target)
   endif()
 
   if(NOT IS_ABSOLUTE "${parsed_INPUT}")
-    set(parsed_INPUT ${CMAKE_CURRENT_SOURCE_DIR}/${parsed_INPUT})
+    cmake_path(
+      ABSOLUTE_PATH
+      parsed_INPUT
+      BASE_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+      NORMALIZE
+    )
   endif()
 
   if(NOT IS_ABSOLUTE "${parsed_HEADER}")
-    set(parsed_HEADER ${CMAKE_CURRENT_BINARY_DIR}/${parsed_HEADER})
+    cmake_path(
+      ABSOLUTE_PATH
+      parsed_HEADER
+      BASE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+      NORMALIZE
+    )
   endif()
 
   set(sources "")
   foreach(source IN LISTS parsed_SOURCES)
     if(NOT IS_ABSOLUTE ${source})
-      set(source ${CMAKE_CURRENT_SOURCE_DIR}/${source})
+      cmake_path(
+        ABSOLUTE_PATH
+        source
+        BASE_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+        NORMALIZE
+      )
     endif()
     list(APPEND sources ${source})
   endforeach()

cmake/cmake/modules/FindKerberos.cmake

@@ -25,7 +25,7 @@ Module defines the following `IMPORTED` target(s):
 * `Kerberos_INCLUDE_DIR` - Directory containing package library headers.
 * `Kerberos_LIBRARY` - The path to the package library.
 * `Kerberos_EXECUTABLE` - Path to the Kerberos command-line helper configuration
-  script, if found.
+  script.
 * `Kerberos_GSSAPI_INCLUDE_DIR` -Directory containing GSSAPI library headers.
 * `Kerberos_GSSAPI_LIBRARY` - The path to the GSSAPI library.
 #]=============================================================================]
@@ -78,7 +78,7 @@ endif()
 find_program(
   Kerberos_EXECUTABLE
   NAMES krb5-config
-  DOC "Path to the Kerberos command-line helper configuration script, if found."
+  DOC "Path to the Kerberos command-line helper configuration script"
 )
 
 # Get version.

cmake/cmake/modules/PHP/ConfigureFile.cmake

@@ -192,9 +192,11 @@ function(php_configure_file)
   if(parsed_INPUT)
     set(___phpConfigureFileTemplate "${parsed_INPUT}")
     if(NOT IS_ABSOLUTE "${___phpConfigureFileTemplate}")
-      set(
+      cmake_path(
+        ABSOLUTE_PATH
         ___phpConfigureFileTemplate
-        "${CMAKE_CURRENT_SOURCE_DIR}/${___phpConfigureFileTemplate}"
+        BASE_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+        NORMALIZE
       )
     endif()
   else()
@@ -208,9 +210,11 @@ function(php_configure_file)
 
   set(___phpConfigureFileOutput "${parsed_OUTPUT}")
   if(NOT IS_ABSOLUTE "${___phpConfigureFileOutput}")
-    set(
+    cmake_path(
+      ABSOLUTE_PATH
       ___phpConfigureFileOutput
-      "${CMAKE_CURRENT_BINARY_DIR}/${___phpConfigureFileOutput}"
+      BASE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+      NORMALIZE
     )
   endif()
 

cmake/cmake/modules/PHP/PkgConfigGenerator.cmake

@@ -161,12 +161,22 @@ function(pkgconfig_generate_pc)
 
   set(template "${ARGV0}")
   if(NOT IS_ABSOLUTE "${template}")
-    set(template "${CMAKE_CURRENT_SOURCE_DIR}/${template}")
+    cmake_path(
+      ABSOLUTE_PATH
+      template
+      BASE_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+      NORMALIZE
+    )
   endif()
 
   set(output "${ARGV1}")
   if(NOT IS_ABSOLUTE "${output}")
-    set(output "${CMAKE_CURRENT_BINARY_DIR}/${output}")
+    cmake_path(
+      ABSOLUTE_PATH
+      output
+      BASE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+      NORMALIZE
+    )
   endif()
 
   file(

cmake/cmake/scripts/GenerateCredits.cmake

@@ -12,7 +12,7 @@ endif()
 set(PHP_SOURCE_DIR ${CMAKE_CURRENT_LIST_DIR}/../../)
 
 if(NOT EXISTS ${PHP_SOURCE_DIR}/ext/standard/credits.h)
-  message(FATAL_ERROR "This script should be run inside the php-src repository")
+  message(FATAL_ERROR "This script should be run in the php-src repository.")
 endif()
 
 set(template [[
@@ -31,7 +31,7 @@ set(template [[
 ]])
 
 file(GLOB credits ${PHP_SOURCE_DIR}/*/*/CREDITS)
-# Case-sensitive filtering, GLOB on macOS/Windows is case-insensitive.
+# Case-sensitive filtering, GLOB on macOS/Windows/Cygwin is case-insensitive.
 list(FILTER credits INCLUDE REGEX ".*CREDITS$")
 
 foreach(credit IN LISTS credits)

cmake/ext/standard/CMakeLists.txt

@@ -494,7 +494,7 @@ check_symbol_exists(
 
 block()
   file(GLOB credits ${PHP_SOURCE_DIR}/*/*/CREDITS)
-  # Case-sensitive filtering, GLOB on macOS/Windows is case-insensitive.
+  # Case-sensitive filtering, GLOB on macOS/Windows/Cygwin is case-insensitive.
   list(FILTER credits INCLUDE REGEX ".*CREDITS$")
 
   # The CODEGEN keyword adds the custom command to a global 'codegen' target.

cmake/pear/CMakeLists.txt

@@ -63,7 +63,7 @@ php_set(
   TYPE PATH
   IF PHP_PEAR
   VALUE "${CMAKE_INSTALL_DATADIR}/pear"
-  DOC "The PEAR installation directory."
+  DOC "The PEAR installation directory"
 )
 mark_as_advanced(PHP_PEAR_DIR)
 
@@ -77,7 +77,7 @@ php_set(
   TYPE PATH
   IF PHP_PEAR
   VALUE "${tmpDir}"
-  DOC "The PEAR temporary directory. Default: ${tmpDir}."
+  DOC "The PEAR temporary directory. Default: ${tmpDir}"
 )
 mark_as_advanced(PHP_PEAR_TEMP_DIR)
 

patches/8.3/cmake.patch

@@ -1,11 +1,147 @@
 From: Peter Kokot <[email protected]>
 Subject: Add CMake changes for PHP-8.3 branch
 
-* CMake added to run-tests.php for info about failing tests and checks
+- EditorConfig adjustments for code style support in editors and IDEs
+- CMake build system files added to .gitignore
+- CMake added to run-tests.php for info about failing tests and checks
+- CMake-related modifications added to ext/skeleton template directory
+  and ext/ext_skel.php script
 ---
- run-tests.php | 24 ++++++++++++++++++------
- 1 file changed, 18 insertions(+), 6 deletions(-)
+ .editorconfig              |  2 +-
+ .gitignore                 | 50 ++++++++++++++++++++++++++++++++++++++
+ ext/ext_skel.php           |  2 ++
+ ext/skeleton/.gitignore.in | 23 ++++++++++++++++++
+ run-tests.php              | 24 +++++++++++++-----
+ 5 files changed, 94 insertions(+), 7 deletions(-)
 
+diff --git a/.editorconfig b/.editorconfig
+index 7911bf8490..1d9b530947 100644
+--- a/.editorconfig
++++ b/.editorconfig
+@@ -17,7 +17,7 @@ indent_style             = tab
+ indent_size              = 4
+ indent_style             = space
+ 
+-[*.{ac,m4,sh,yml}]
++[{CMakeLists.{txt,txt.in},*.{ac,cmake,cmake.in,json,m4,sh,yml}}]
+ indent_size              = 2
+ indent_style             = space
+ 
+diff --git a/.gitignore b/.gitignore
+index 449963153f..913ed3d96d 100644
+--- a/.gitignore
++++ b/.gitignore
+@@ -153,6 +153,7 @@ php
+ # ------------------------------------------------------------------------------
+ /ext/json/json_parser.tab.h
+ /ext/json/json_parser.tab.c
++/ext/json/json_parser.output
+ /sapi/phpdbg/phpdbg_parser.c
+ /sapi/phpdbg/phpdbg_parser.h
+ /sapi/phpdbg/phpdbg_parser.output
+@@ -291,9 +292,58 @@ tmp-php.ini
+ /junit.out.xml
+ /.ccache/
+ 
++# ------------------------------------------------------------------------------
++# CMake-based build system files
++# ------------------------------------------------------------------------------
++cmake_install.cmake
++CMakeCache.txt
++CMakeFiles/
++
++# Generated by FetchContent
++/_deps/
++
++# Graphviz generated files
++/*.dependers
++/*.dot
++
++# Generated by the Ninja build system
++/.ninja*
++/build.ninja
++
++# Local user presets
++/CMakeUserPresets.json
++
++# Generated when CMAKE_EXPORT_COMPILE_COMMANDS is enabled
++/compile-commands.json
++
++# Generated by ctest
++/CTestTestfile.cmake
++/Testing/
++
++# CMake script profiling data output (--profiling-output <path>)
++/profile.json
++
++# Generated by QT Creator
++CMakeLists.txt.user
++
++# Generated by XCode
++CMakeScripts/
++
++# Generated by cmake --install
++/install_manifest.txt
++
++# Generated by cmake when cross-compiling if missing cache variables are found
++/TryRunResults.cmake
++
++# pkg-config .pc files
++/sapi/embed/php-embed.pc
++/scripts/php.pc
++
+ # ------------------------------------------------------------------------------
+ # Special cases to invert previous ignore patterns
+ # ------------------------------------------------------------------------------
++!**/cmake/config.h.in
++!**/cmake/modules/
+ !/ext/bcmath/libbcmath/src/config.h
+ !/ext/fileinfo/libmagic/config.h
+ !/ext/fileinfo/libmagic.patch
+diff --git a/ext/ext_skel.php b/ext/ext_skel.php
+index ae7a3a987c..a9e0dd1b51 100755
+--- a/ext/ext_skel.php
++++ b/ext/ext_skel.php
+@@ -302,6 +302,8 @@ function copy_config_scripts() {
+         $files[] = 'config.w32';
+     }
+ 
++    $files[] = 'CMakeLists.txt';
++    $files[] = 'cmake/config.h.in';
+     $files[] = '.gitignore';
+ 
+     foreach($files as $config_script) {
+diff --git a/ext/skeleton/.gitignore.in b/ext/skeleton/.gitignore.in
+index ae434fef97..87545d9162 100644
+--- a/ext/skeleton/.gitignore.in
++++ b/ext/skeleton/.gitignore.in
+@@ -39,3 +39,26 @@ tests/**/*.sh
+ tests/**/*.db
+ tests/**/*.mem
+ tmp-php.ini
++
++# ------------------------------------------------------------------------------
++# CMake-based build system files
++# ------------------------------------------------------------------------------
++!**/cmake/config.h.in
++!**/cmake/modules/
++/_deps/
++/.ninja*
++/*.dependers
++/*.dot
++/build.ninja
++/CMakeUserPresets.json
++/compile-commands.json
++/CTestTestfile.cmake
++/install_manifest.txt
++/profile.json
++/Testing/
++/TryRunResults.cmake
++cmake_install.cmake
++CMakeCache.txt
++CMakeFiles/
++CMakeLists.txt.user
++CMakeScripts/
 diff --git a/run-tests.php b/run-tests.php
 index d51ab99a20..9211cbb3e2 100755
 --- a/run-tests.php

patches/8.3/php-config.patch

@@ -59,7 +59,7 @@ index 61ee5c1675..1a8d67a783 100644
 
  dnl
 diff --git a/configure.ac b/configure.ac
-index b6ec8b2be1..85849f73dc 100644
+index ee039a0bad..42fa6c9458 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -1480,6 +1480,9 @@ exec_prefix=$old_exec_prefix