Fix nits

- Added required ext_skel.php adjustments to be able to copy files in
  subdirectories
- Comments updated
- CMake syntax synced

Author: petk

bin/check-cmake.php

@@ -327,7 +327,7 @@ function checkCMakeInclude(Iterator $files, array $modules): int
 };
 
 /**
- * Check if given string is regular expression.
+ * Check if given string is a regular expression.
  */
 function isRegularExpression(string $string): bool
 {

cmake/cmake/CMakeDefaults.cmake

@@ -7,10 +7,8 @@ https://cmake.org/cmake/help/latest/manual/cmake-variables.7.html
 
 include_guard(GLOBAL)
 
-# Set CMake module paths where include() and find_package() look for modules.
-if(NOT ${CMAKE_CURRENT_LIST_DIR}/modules IN_LIST CMAKE_MODULE_PATH)
-  list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/modules)
-endif()
+# Add paths where include() and find_package() look for modules.
+list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/modules)
 
 # Automatically include current source or build tree for the current target.
 set(CMAKE_INCLUDE_CURRENT_DIR ON)

cmake/cmake/Platform.cmake

@@ -23,7 +23,7 @@ include(PHP/SystemExtensions)
 # _GNU_SOURCE.
 target_link_libraries(php_config INTERFACE PHP::SystemExtensions)
 
-# Set installation directories.
+# Define GNU standard installation directories.
 include(GNUInstallDirs)
 
 # Detect C standard library implementation.

cmake/cmake/modules/PHP/Extensions.cmake

@@ -483,6 +483,8 @@ function(php_extensions_configure_headers)
     get_target_property(type php_ext_${extension} TYPE)
     if(type MATCHES "^(MODULE|SHARED)_LIBRARY$")
       set(${macro} TRUE)
+    else()
+      set(${macro} FALSE)
     endif()
 
     # Prepare config.h template.

cmake/ext/skeleton/CMakeLists.txt.in

@@ -21,14 +21,12 @@ Build extension as shared.
 # CMakeLists.txt file for the %EXTNAME% extension.
 
 # Set minimum required CMake version.
-cmake_minimum_required(VERSION 3.25)
+cmake_minimum_required(VERSION 3.25...3.31)
 
-# Append extension's local CMake modules.
-if(NOT ${CMAKE_CURRENT_LIST_DIR}/cmake/modules IN_LIST CMAKE_MODULE_PATH)
-  list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/cmake/modules)
-endif()
+# Add paths where include() and find_package() look for modules.
+list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/cmake/modules)
 
-# Set the extension project metadata.
+# Define the PHP extension project and its metadata.
 project(
   %EXTNAME%
   VERSION 0.1.0

cmake/pear/cmake/InstallPear.cmake

@@ -141,8 +141,7 @@ file(
     ${phpPearStageTempDir}/temp
 )
 
-# Add options for PHP executable, when dependent extensions are shared, they
-# need to be loaded for the PHP_EXECUTABLE.
+# Add PHP command-line options for shared dependent extensions.
 set(phpPearOptions -d extension_dir=${PHP_BINARY_DIR}/modules)
 
 if(PHP_EXT_OPENSSL_SHARED)

patches/8.3/cmake.patch

@@ -9,10 +9,10 @@ Subject: Add CMake changes for PHP-8.3 branch
 ---
  .editorconfig              |  2 +-
  .gitignore                 | 50 ++++++++++++++++++++++++++++++++++++++
- ext/ext_skel.php           |  2 ++
+ ext/ext_skel.php           |  7 ++++++
  ext/skeleton/.gitignore.in | 23 ++++++++++++++++++
  run-tests.php              | 24 +++++++++++++-----
- 5 files changed, 94 insertions(+), 7 deletions(-)
+ 5 files changed, 99 insertions(+), 7 deletions(-)
 
 diff --git a/.editorconfig b/.editorconfig
 index 7911bf8490..1d9b530947 100644
@@ -99,10 +99,10 @@ index 449963153f..913ed3d96d 100644
  !/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
+index ae7a3a987c..a67901a2c9 100755
 --- a/ext/ext_skel.php
 +++ b/ext/ext_skel.php
-@@ -302,6 +302,8 @@ function copy_config_scripts() {
+@@ -302,11 +302,18 @@ function copy_config_scripts() {
          $files[] = 'config.w32';
      }
 
@@ -111,6 +111,16 @@ index ae7a3a987c..a9e0dd1b51 100755
      $files[] = '.gitignore';
 
      foreach($files as $config_script) {
+         $new_config_script = $options['dir'] . $options['ext'] . DIRECTORY_SEPARATOR . $config_script;
+ 
++        $directory = dirname($new_config_script);
++        if (!is_dir($directory) && !mkdir($directory, 0777, true)) {
++            error('Unable to create ' . $directory . ' directory in the output directory');
++        }
++
+         if (!copy($options['skel'] . $config_script . '.in', $new_config_script)) {
+             error('Unable to copy config script: ' . $config_script);
+         }
 diff --git a/ext/skeleton/.gitignore.in b/ext/skeleton/.gitignore.in
 index ae434fef97..87545d9162 100644
 --- a/ext/skeleton/.gitignore.in

patches/8.4/cmake.patch

@@ -9,10 +9,10 @@ Subject: Add CMake changes for PHP-8.4 branch
 ---
  .editorconfig              |  2 +-
  .gitignore                 | 50 ++++++++++++++++++++++++++++++++++++++
- ext/ext_skel.php           |  2 ++
+ ext/ext_skel.php           |  7 ++++++
  ext/skeleton/.gitignore.in | 23 ++++++++++++++++++
  run-tests.php              | 24 +++++++++++++-----
- 5 files changed, 94 insertions(+), 7 deletions(-)
+ 5 files changed, 99 insertions(+), 7 deletions(-)
 
 diff --git a/.editorconfig b/.editorconfig
 index 7911bf8490..1d9b530947 100644
@@ -99,10 +99,10 @@ index 52dde98ed4..d698b5a19c 100644
  !/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
+index ae7a3a987c..a67901a2c9 100755
 --- a/ext/ext_skel.php
 +++ b/ext/ext_skel.php
-@@ -302,6 +302,8 @@ function copy_config_scripts() {
+@@ -302,11 +302,18 @@ function copy_config_scripts() {
          $files[] = 'config.w32';
      }
 
@@ -111,6 +111,16 @@ index ae7a3a987c..a9e0dd1b51 100755
      $files[] = '.gitignore';
 
      foreach($files as $config_script) {
+         $new_config_script = $options['dir'] . $options['ext'] . DIRECTORY_SEPARATOR . $config_script;
+ 
++        $directory = dirname($new_config_script);
++        if (!is_dir($directory) && !mkdir($directory, 0777, true)) {
++            error('Unable to create ' . $directory . ' directory in the output directory');
++        }
++
+         if (!copy($options['skel'] . $config_script . '.in', $new_config_script)) {
+             error('Unable to copy config script: ' . $config_script);
+         }
 diff --git a/ext/skeleton/.gitignore.in b/ext/skeleton/.gitignore.in
 index e691bd3964..191fcd70eb 100644
 --- a/ext/skeleton/.gitignore.in

patches/8.5/cmake.patch

@@ -9,10 +9,10 @@ Subject: Add CMake changes for PHP-8.5 branch
 ---
  .editorconfig              |  2 +-
  .gitignore                 | 50 ++++++++++++++++++++++++++++++++++++++
- ext/ext_skel.php           |  2 ++
+ ext/ext_skel.php           |  7 ++++++
  ext/skeleton/.gitignore.in | 23 ++++++++++++++++++
  run-tests.php              | 24 +++++++++++++-----
- 5 files changed, 94 insertions(+), 7 deletions(-)
+ 5 files changed, 99 insertions(+), 7 deletions(-)
 
 diff --git a/.editorconfig b/.editorconfig
 index 19be96087d..58a83dfb68 100644
@@ -99,10 +99,10 @@ index 52dde98ed4..d698b5a19c 100644
  !/ext/fileinfo/libmagic/config.h
  !/ext/fileinfo/libmagic.patch
 diff --git a/ext/ext_skel.php b/ext/ext_skel.php
-index cd82abb346..74ee94c7e2 100755
+index cd82abb346..19f55f4673 100755
 --- a/ext/ext_skel.php
 +++ b/ext/ext_skel.php
-@@ -289,6 +289,8 @@ function copy_config_scripts() {
+@@ -289,11 +289,18 @@ function copy_config_scripts() {
          $files[] = 'config.w32';
      }
 
@@ -111,6 +111,16 @@ index cd82abb346..74ee94c7e2 100755
      $files[] = '.gitignore';
 
      foreach($files as $config_script) {
+         $new_config_script = $options['dir'] . $options['ext'] . DIRECTORY_SEPARATOR . $config_script;
+ 
++        $directory = dirname($new_config_script);
++        if (!is_dir($directory) && !mkdir($directory, 0777, true)) {
++            error('Unable to create ' . $directory . ' directory in the output directory');
++        }
++
+         if (!copy($options['skel'] . $config_script . '.in', $new_config_script)) {
+             error('Unable to copy config script: ' . $config_script);
+         }
 diff --git a/ext/skeleton/.gitignore.in b/ext/skeleton/.gitignore.in
 index e691bd3964..191fcd70eb 100644
 --- a/ext/skeleton/.gitignore.in