Merge branch 'PHP-8.4'

Author: petk

bin/check-cmake.php

@@ -380,6 +380,52 @@ function checkCMakeSet(Iterator $files): int
     return $status;
 };
 
+/**
+ * Check for obsolete usages of:
+ *   else(<condition>)
+ *   endif(<condition>)
+ *   endforeach(<loop-var>)
+ *   endwhile(<condition>)
+ *   endfunction(<name>)
+ *   endmacro(<name>)
+ */
+function checkCMakeObsoleteEndCommands(Iterator $files): int
+{
+    $status = 0;
+
+    $commands = [
+        'else',
+        'endif',
+        'endforeach',
+        'endwhile',
+        'endfunction',
+        'endmacro',
+    ];
+
+    foreach ($files as $file) {
+        $content = getCMakeCode($file);
+
+        foreach ($commands as $command) {
+            preg_match_all(
+                '/^[ \t]*(' . $command . ')[ \t]*\((.+)\)/mi',
+                $content,
+                $matches,
+                PREG_SET_ORDER,
+            );
+
+            foreach ($matches as $match) {
+                $foundCommand = $match[1] ?? '';
+                $foundArgument = $match[2] ?? '';
+
+                $status = 1;
+                output("E: Replace $foundCommand($foundArgument) with $command()\n   in $file\n");
+            }
+        }
+    }
+
+    return $status;
+}
+
 /**
  * Find all local Find* modules in the project.
  */
@@ -673,6 +719,9 @@ function checkAll(array $options): int
     $newStatus = checkCMakeSet($allCMakeFiles);
     $status = (0 === $status) ? $newStatus : $status;
 
+    $newStatus = checkCMakeObsoleteEndCommands($allCMakeFiles);
+    $status = (0 === $status) ? $newStatus : $status;
+
     $findModules = getFindModules($options['path'] . '/cmake/cmake/modules');
     $newStatus = checkFindModules($findModules, $allCMakeFiles);
     $status = (0 === $status) ? $newStatus : $status;

docs/cmake/cmake-code-style.md

@@ -126,10 +126,9 @@ On the contrary, variable names are case-sensitive.
 
 ### 2.1. End commands
 
-To make the code easier to read, use empty commands for `endif()`,
-`endfunction()`, `endforeach()`, `endmacro()`, `endwhile()`, `else()`, and
-similar end commands. The optional argument in end command is legacy CMake and
-not recommended anymore.
+To make the code easier to read, use empty commands for `else()`, `endif()`,
+`endforeach()`, `endwhile()`, `endfunction()`, and `endmacro()`. The optional
+legacy argument in these commands is not recommended anymore.
 
 For example, do this: