Skip to content

Commit 6567738

Browse files
committed
Merge branch 'PHP-8.4'
2 parents 3db9987 + 5585ad6 commit 6567738

File tree

212 files changed

+796
-180
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

212 files changed

+796
-180
lines changed

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ wrapper to bridge the upstream PHP source code with the CMake-based build system
1010
in this repository located at the cmake directory, streamlining the integration
1111
process.
1212
13-
Basic usage:
13+
Usage:
1414
1515
cmake -B <build-dir> [<options>...]
1616

bin/make-docs.php

Lines changed: 2 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -62,29 +62,12 @@ function generateModuleDocs(
6262
$markdown .= "* Source code: [$relativeFilename]($url)\n\n";
6363
$markdown .= $content . "\n";
6464

65-
if ($namespace) {
66-
$footer = <<<EOT
67-
## Basic usage
68-
69-
```cmake
70-
# CMakeLists.txt
71-
include({$namespace}{$moduleName})
72-
```
73-
EOT;
74-
} elseif (1 === preg_match('/^Find(.+)$/', $moduleName, $matches)) {
65+
if (1 === preg_match('/^Find(.+)$/', $moduleName, $matches)) {
7566
$findPackageName = $matches[1] ?? null;
7667
$findPackageUpper = strtoupper($findPackageName);
7768

78-
$footer = <<<EOT
79-
## Basic usage
69+
$markdown .= <<<EOT
8070
81-
```cmake
82-
# CMakeLists.txt
83-
find_package($findPackageName)
84-
```
85-
EOT;
86-
87-
$footer_2 = <<<EOT
8871
## Customizing search locations
8972
9073
To customize where to look for the $findPackageName package base
@@ -102,26 +85,10 @@ function generateModuleDocs(
10285
-D{$findPackageUpper}_ROOT=/opt/$findPackageName \
10386
-DSOMEOTHERPACKAGE_ROOT=/opt/some-other-package
10487
```
105-
EOT;
106-
} else {
107-
$footer = <<<EOT
108-
## Basic usage
10988
110-
```cmake
111-
# CMakeLists.txt
112-
include(cmake/$moduleName.cmake)
113-
```
11489
EOT;
11590
}
11691

117-
if (1 !== preg_match('/## Basic usage[\r\n]/', $content, $matches)) {
118-
$markdown .= "\n" . $footer . "\n";
119-
}
120-
121-
if (isset($footer_2)) {
122-
$markdown .= "\n" . $footer_2 . "\n";
123-
}
124-
12592
if (!file_exists($destination)) {
12693
mkdir($destination, 0777, true);
12794
}

cmake/Zend/cmake/CheckFloatPrecision.cmake

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,13 @@ See: https://wiki.php.net/rfc/rounding
2626
* `HAVE_FPU_INLINE_ASM_X86`
2727
2828
Whether FPU control word can be manipulated by inline assembler.
29+
30+
## Usage
31+
32+
```cmake
33+
# CMakeLists.txt
34+
include(cmake/CheckFloatPrecision.cmake)
35+
```
2936
#]=============================================================================]
3037

3138
include_guard(GLOBAL)

cmake/Zend/cmake/CheckGlobalRegisterVariables.cmake

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,13 @@ See also: [GCC global register variables](https://gcc.gnu.org/onlinedocs/gcc/Glo
1212
* `HAVE_GCC_GLOBAL_REGS`
1313
1414
Whether global register variables are supported.
15+
16+
## Usage
17+
18+
```cmake
19+
# CMakeLists.txt
20+
include(cmake/CheckGlobalRegisterVariables.cmake)
21+
```
1522
#]=============================================================================]
1623

1724
include_guard(GLOBAL)

cmake/Zend/cmake/CheckMMAlignment.cmake

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,13 @@ also does the logarithmic test.
99
* `ZEND_MM_ALIGNMENT`
1010
* `ZEND_MM_ALIGNMENT_LOG2`
1111
* `ZEND_MM_NEED_EIGHT_BYTE_REALIGNMENT`
12+
13+
## Usage
14+
15+
```cmake
16+
# CMakeLists.txt
17+
include(cmake/CheckMMAlignment.cmake)
18+
```
1219
#]=============================================================================]
1320

1421
include_guard(GLOBAL)

cmake/Zend/cmake/CheckStackDirection.cmake

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,13 @@ Check whether the stack grows downwards. Assumes contiguous stack.
88
* `ZEND_CHECK_STACK_LIMIT`
99
1010
Whether checking the stack limit is supported.
11+
12+
## Usage
13+
14+
```cmake
15+
# CMakeLists.txt
16+
include(cmake/CheckStackDirection.cmake)
17+
```
1118
#]=============================================================================]
1219

1320
include_guard(GLOBAL)

cmake/Zend/cmake/CheckStrerrorR.cmake

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,13 @@ version.
1414
1515
Whether `strerror_r()` returns a `char *` message, otherwise it returns an
1616
`int` error number.
17+
18+
## Usage
19+
20+
```cmake
21+
# CMakeLists.txt
22+
include(cmake/CheckStrerrorR.cmake)
23+
```
1724
#]=============================================================================]
1825

1926
include_guard(GLOBAL)

cmake/Zend/cmake/Fibers.cmake

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,13 @@ platform, otherwise it checks if ucontext can be used.
2424
2525
Interface library using Boost fiber assembly files and compile options if
2626
available.
27+
28+
## Usage
29+
30+
```cmake
31+
# CMakeLists.txt
32+
include(cmake/Fibers.cmake)
33+
```
2734
#]=============================================================================]
2835

2936
include_guard(GLOBAL)

cmake/Zend/cmake/MaxExecutionTimers.cmake

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,13 @@ Check whether to enable Zend max execution timers.
2626
2727
Includes possible additional library to be linked for using `timer_create()`
2828
and a compile definition.
29+
30+
## Usage
31+
32+
```cmake
33+
# CMakeLists.txt
34+
include(cmake/MaxExecutionTimers.cmake)
35+
```
2936
#]=============================================================================]
3037

3138
include_guard(GLOBAL)

cmake/cmake/modules/FindACL.cmake

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,13 @@ Module defines the following `IMPORTED` target(s):
2626
* Set `ACL_USE_USER_GROUP` to `TRUE` before calling `find_package(ACL)` to also
2727
check if the ACL library supports `ACL_USER` and `ACL_GROUP`. For example,
2828
macOS doesn't have support for user/group.
29+
30+
## Usage
31+
32+
```cmake
33+
# CMakeLists.txt
34+
find_package(ACL)
35+
```
2936
#]=============================================================================]
3037

3138
include(CheckSourceCompiles)

cmake/cmake/modules/FindApache.cmake

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,13 @@ Module defines the following `IMPORTED` target(s):
3636
* `Apache_INCLUDE_DIR` - Directory containing package library headers.
3737
* `Apache_APR_INCLUDE_DIR` - Directory containing `apr` library headers.
3838
* `Apache_APR_LIBRARY` - The path to the `apr` library.
39+
40+
## Usage
41+
42+
```cmake
43+
# CMakeLists.txt
44+
find_package(Apache)
45+
```
3946
#]=============================================================================]
4047

4148
include(FeatureSummary)

cmake/cmake/modules/FindAppArmor.cmake

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,13 @@ Module defines the following `IMPORTED` target(s):
1818
1919
* `AppArmor_INCLUDE_DIR` - Directory containing package library headers.
2020
* `AppArmor_LIBRARY` - The path to the package library.
21+
22+
## Usage
23+
24+
```cmake
25+
# CMakeLists.txt
26+
find_package(AppArmor)
27+
```
2128
#]=============================================================================]
2229

2330
include(CheckLibraryExists)

cmake/cmake/modules/FindArgon2.cmake

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,13 @@ Module defines the following `IMPORTED` target(s):
1818
1919
* `Argon2_INCLUDE_DIR` - Directory containing package library headers.
2020
* `Argon2_LIBRARY` - The path to the package library.
21+
22+
## Usage
23+
24+
```cmake
25+
# CMakeLists.txt
26+
find_package(Argon2)
27+
```
2128
#]=============================================================================]
2229

2330
include(FeatureSummary)

cmake/cmake/modules/FindAtomic.cmake

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,13 @@ Module defines the following `IMPORTED` target(s):
1212
* `Atomic_FOUND` - Whether atomic instructions are available.
1313
* `Atomic_LIBRARIES` - A list of libraries needed in order to use atomic
1414
functionality.
15+
16+
## Usage
17+
18+
```cmake
19+
# CMakeLists.txt
20+
find_package(Atomic)
21+
```
1522
#]=============================================================================]
1623

1724
include(CheckSourceCompiles)

cmake/cmake/modules/FindBISON.cmake

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,13 @@ Find `bison`, the general-purpose parser generator, command-line executable.
55
66
This module extends the CMake `FindBISON` module.
77
See: https://cmake.org/cmake/help/latest/module/FindBISON.html
8+
9+
## Usage
10+
11+
```cmake
12+
# CMakeLists.txt
13+
find_package(BISON)
14+
```
815
#]=============================================================================]
916

1017
include(FeatureSummary)

cmake/cmake/modules/FindBerkeleyDB.cmake

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,13 @@ Module defines the following `IMPORTED` target(s):
2525
2626
* Set `BerkeleyDB_USE_DB1` to `TRUE` before calling `find_package(BerkeleyDB)`
2727
to enable the Berkeley DB 1.x support/emulation.
28+
29+
## Usage
30+
31+
```cmake
32+
# CMakeLists.txt
33+
find_package(BerkeleyDB)
34+
```
2835
#]=============================================================================]
2936

3037
include(CheckSourceCompiles)

cmake/cmake/modules/FindCapstone.cmake

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,13 @@ Module defines the following `IMPORTED` target(s):
1818
1919
* `Capstone_INCLUDE_DIR` - Directory containing package library headers.
2020
* `Capstone_LIBRARY` - The path to the package library.
21+
22+
## Usage
23+
24+
```cmake
25+
# CMakeLists.txt
26+
find_package(Capstone)
27+
```
2128
#]=============================================================================]
2229

2330
include(FeatureSummary)

cmake/cmake/modules/FindCcache.cmake

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,13 @@ Find the Ccache compiler cache tool for faster compilation times.
1616
1717
* The `CCACHE_DISABLE` regular or environment variable which disables ccache and
1818
doesn't adjust the C and CXX launcher. For more info see Ccache documentation.
19+
20+
## Usage
21+
22+
```cmake
23+
# CMakeLists.txt
24+
find_package(Ccache)
25+
```
1926
#]=============================================================================]
2027

2128
include(FeatureSummary)

cmake/cmake/modules/FindCdb.cmake

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,13 @@ Module defines the following `IMPORTED` target(s):
1818
1919
* `Cdb_INCLUDE_DIR` - Directory containing package library headers.
2020
* `Cdb_LIBRARY` - The path to the package library.
21+
22+
## Usage
23+
24+
```cmake
25+
# CMakeLists.txt
26+
find_package(Cdb)
27+
```
2128
#]=============================================================================]
2229

2330
include(CheckLibraryExists)

cmake/cmake/modules/FindCrypt.cmake

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,13 @@ Module defines the following `IMPORTED` target(s):
2525
* `Crypt_IS_BUILT_IN` - Whether crypt is a part of the C library.
2626
* `Crypt_INCLUDE_DIR` - Directory containing package library headers.
2727
* `Crypt_LIBRARY` - The path to the package library.
28+
29+
## Usage
30+
31+
```cmake
32+
# CMakeLists.txt
33+
find_package(Crypt)
34+
```
2835
#]=============================================================================]
2936

3037
include(CheckSymbolExists)

cmake/cmake/modules/FindDTrace.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ Generates DTrace header `<header>` and creates `INTERFACE` library
5050
interpreted as being relative to the current source directory.
5151
* `INCLUDES` - A list of include directories for appending to DTrace object.
5252
53-
## Basic usage
53+
## Usage
5454
5555
```cmake
5656
# CMakeLists.txt

cmake/cmake/modules/FindDbm.cmake

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,13 @@ Module defines the following `IMPORTED` target(s):
3030
3131
* `Dbm_INCLUDE_DIR` - Directory containing package library headers.
3232
* `Dbm_LIBRARY` - The path to the package library.
33+
34+
## Usage
35+
36+
```cmake
37+
# CMakeLists.txt
38+
find_package(Dbm)
39+
```
3340
#]=============================================================================]
3441

3542
include(CheckLibraryExists)

cmake/cmake/modules/FindDmalloc.cmake

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,13 @@ Module defines the following `IMPORTED` target(s):
1818
1919
* `Dmalloc_INCLUDE_DIR` - Directory containing package library headers.
2020
* `Dmalloc_LIBRARY` - The path to the package library.
21+
22+
## Usage
23+
24+
```cmake
25+
# CMakeLists.txt
26+
find_package(Dmalloc)
27+
```
2128
#]=============================================================================]
2229

2330
include(FeatureSummary)

cmake/cmake/modules/FindEditline.cmake

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,13 @@ Module defines the following `IMPORTED` target(s):
1818
1919
* `Editline_INCLUDE_DIR` - Directory containing package library headers.
2020
* `Editline_LIBRARY` - The path to the package library.
21+
22+
## Usage
23+
24+
```cmake
25+
# CMakeLists.txt
26+
find_package(Editline)
27+
```
2128
#]=============================================================================]
2229

2330
include(CheckLibraryExists)

cmake/cmake/modules/FindEnchant.cmake

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,13 @@ Module defines the following `IMPORTED` target(s):
2121
2222
* `Enchant_INCLUDE_DIR` - Directory containing package library headers.
2323
* `Enchant_LIBRARY` - The path to the package library.
24+
25+
## Usage
26+
27+
```cmake
28+
# CMakeLists.txt
29+
find_package(Enchant)
30+
```
2431
#]=============================================================================]
2532

2633
include(FeatureSummary)

cmake/cmake/modules/FindFFI.cmake

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,13 @@ Module defines the following `IMPORTED` target(s):
1818
1919
* `FFI_INCLUDE_DIR` - Directory containing package library headers.
2020
* `FFI_LIBRARY` - The path to the package library.
21+
22+
## Usage
23+
24+
```cmake
25+
# CMakeLists.txt
26+
find_package(FFI)
27+
```
2128
#]=============================================================================]
2229

2330
include(FeatureSummary)

0 commit comments

Comments
 (0)