Skip to content

Commit 423c4d7

Browse files
petkpetk
committed
Merge branch 'PHP-8.4'
2 parents 421900e + 389d091 commit 423c4d7

File tree

141 files changed

+1441
-1458
lines changed

Some content is hidden

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

141 files changed

+1441
-1458
lines changed

‎CHANGELOG.md

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -12,27 +12,27 @@ repository.
1212

1313
New configuration variables:
1414

15-
* EXT_OPENSSL_ARGON2
16-
* EXT_OPENSSL_LEGACY_PROVIDER
15+
* PHP_EXT_OPENSSL_ARGON2
16+
* PHP_EXT_OPENSSL_LEGACY_PROVIDER
1717

1818
Removed configuration variables:
1919

2020
* ASPELL_ROOT
2121
* CCLIENT_ROOT
22-
* EXT_DBA_GDBM
23-
* EXT_IMAP
24-
* EXT_IMAP_KERBEROS
25-
* EXT_IMAP_SHARED
26-
* EXT_IMAP_SSL
27-
* EXT_OCI8
28-
* EXT_OPENSSL_KERBEROS
29-
* EXT_PDO_OCI
30-
* EXT_PDO_OCI_SHARED
31-
* EXT_PSPELL
32-
* EXT_PSPELL_SHARED
33-
* EXT_READLINE_LIBREADLINE
3422
* GDBM_ROOT
3523
* KERBEROS_ROOT
24+
* PHP_EXT_DBA_GDBM
25+
* PHP_EXT_IMAP
26+
* PHP_EXT_IMAP_KERBEROS
27+
* PHP_EXT_IMAP_SHARED
28+
* PHP_EXT_IMAP_SSL
29+
* PHP_EXT_OCI8
30+
* PHP_EXT_OPENSSL_KERBEROS
31+
* PHP_EXT_PDO_OCI
32+
* PHP_EXT_PDO_OCI_SHARED
33+
* PHP_EXT_PSPELL
34+
* PHP_EXT_PSPELL_SHARED
35+
* PHP_EXT_READLINE_LIBREADLINE
3636
* READLINE_ROOT
3737

3838
## PHP 8.3

‎cmake/cmake/Configuration.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
Project-wide configuration options and variables that can be configured during
33
the configuration phase via GUI or command line:
44
5-
cmake -D PHP_OPTION=... -D ZEND_OPTION=... -D EXT_... -S <path-to-source> ...
5+
cmake -DPHP_<SOME_OPTION>=[ON|OFF] ... -S <source-dir> -B <build-dir> ...
66
77
To see the list of customizable configuration variables with help texts:
88
cmake -LH <path-to-source>

‎cmake/cmake/Testing.cmake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ block()
1818

1919
get_property(extensions GLOBAL PROPERTY PHP_EXTENSIONS)
2020
foreach(extension IN LISTS extensions)
21-
get_target_property(type php_ext_${extension} TYPE)
21+
get_target_property(type PHP::ext::${extension} TYPE)
2222
if(type MATCHES "^(MODULE|SHARED)_LIBRARY$")
23-
get_target_property(isZendExtension php_ext_${extension} PHP_ZEND_EXTENSION)
23+
get_target_property(isZendExtension PHP::ext::${extension} PHP_ZEND_EXTENSION)
2424
if(isZendExtension)
2525
list(APPEND options -d zend_extension=${extension})
2626
elseif(NOT extension STREQUAL "dl_test")

‎cmake/cmake/modules/PHP/Extensions.cmake

Lines changed: 22 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -79,13 +79,13 @@ function(php_extensions_preprocess)
7979
foreach(extension IN LISTS extensions)
8080
string(TOUPPER "${extension}" extensionUpper)
8181

82-
if(NOT EXT_${extensionUpper})
82+
if(NOT PHP_EXT_${extensionUpper})
8383
continue()
8484
endif()
8585

8686
# Mark shared option variable as advanced.
87-
if(DEFINED EXT_${extensionUpper}_SHARED)
88-
mark_as_advanced(EXT_${extensionUpper}_SHARED)
87+
if(DEFINED PHP_EXT_${extensionUpper}_SHARED)
88+
mark_as_advanced(PHP_EXT_${extensionUpper}_SHARED)
8989
endif()
9090

9191
_php_extensions_get_dependencies("${extension}" dependencies)
@@ -95,17 +95,20 @@ function(php_extensions_preprocess)
9595
foreach(dependency IN LISTS dependencies)
9696
string(TOUPPER "${dependency}" dependencyUpper)
9797

98-
if(EXT_${dependencyUpper}_SHARED AND NOT EXT_${extensionUpper}_SHARED)
98+
if(
99+
PHP_EXT_${dependencyUpper}_SHARED
100+
AND NOT PHP_EXT_${extensionUpper}_SHARED
101+
)
99102
message(
100103
WARNING
101104
"The '${extension}' extension must be built as a shared library as "
102105
"its dependency '${dependency}' extension is configured as shared. "
103-
"The 'EXT_${extensionUpper}_SHARED' option has been automatically "
104-
"set to 'ON'."
106+
"The 'PHP_EXT_${extensionUpper}_SHARED' option has been "
107+
"automatically set to 'ON'."
105108
)
106109

107110
set(
108-
EXT_${extensionUpper}_SHARED
111+
PHP_EXT_${extensionUpper}_SHARED
109112
ON
110113
CACHE BOOL
111114
"Build the ${extension} extension as a shared library"
@@ -317,19 +320,19 @@ function(_php_extensions_eval_options directories)
317320
file(READ ${CMAKE_CURRENT_SOURCE_DIR}/${extension}/CMakeLists.txt content)
318321
string(TOUPPER "${extension}" extensionUpper)
319322

320-
# Check if extension has option(EXT_<extension> ...).
323+
# Check if extension has option(PHP_EXT_<extension> ...).
321324
_php_extensions_remove_comments(content)
322-
_php_extensions_option_regex("EXT_${extensionUpper}" regex)
325+
_php_extensions_option_regex("PHP_EXT_${extensionUpper}" regex)
323326
string(REGEX MATCH "${regex}" code "${content}")
324327

325328
if(code)
326329
cmake_language(EVAL CODE "${code}")
327330
unset(code)
328331
endif()
329332

330-
# If extension has cmake_dependent_option(EXT_<extension> ...).
333+
# If extension has cmake_dependent_option(PHP_EXT_<extension> ...).
331334
_php_extensions_cmake_dependent_option_regex(
332-
"EXT_${extensionUpper}"
335+
"PHP_EXT_${extensionUpper}"
333336
regex
334337
)
335338
string(REGEX MATCH "${regex}" code "${content}")
@@ -340,9 +343,9 @@ function(_php_extensions_eval_options directories)
340343
unset(code)
341344
endif()
342345

343-
# If extension has cmake_dependent_option(EXT_<extension>_SHARED ...).
346+
# If extension has cmake_dependent_option(PHP_EXT_<extension>_SHARED ...).
344347
_php_extensions_cmake_dependent_option_regex(
345-
"EXT_${extensionUpper}_SHARED"
348+
"PHP_EXT_${extensionUpper}_SHARED"
346349
regex
347350
)
348351

@@ -382,7 +385,7 @@ function(php_extensions_postconfigure extension)
382385
string(TOUPPER "${dependency}" dependencyUpper)
383386

384387
if(
385-
EXT_${dependencyUpper}
388+
PHP_EXT_${dependencyUpper}
386389
OR dependency IN_LIST alwaysEnabledExtensions
387390
OR NOT dependency IN_LIST allExtensions
388391
)
@@ -392,15 +395,15 @@ function(php_extensions_postconfigure extension)
392395
message(
393396
WARNING
394397
"The '${extension}' extension requires the '${dependency}' extension. "
395-
"The 'EXT_${dependencyUpper}' option has been automatically set to "
398+
"The 'PHP_EXT_${dependencyUpper}' option has been automatically set to "
396399
"'ON'."
397400
)
398401

399-
if(DEFINED CACHE{EXT_${dependencyUpper}})
400-
set_property(CACHE EXT_${dependencyUpper} PROPERTY VALUE ON)
402+
if(DEFINED CACHE{PHP_EXT_${dependencyUpper}})
403+
set_property(CACHE PHP_EXT_${dependencyUpper} PROPERTY VALUE ON)
401404
else()
402405
set(
403-
EXT_${dependencyUpper}
406+
PHP_EXT_${dependencyUpper}
404407
ON
405408
CACHE BOOL
406409
"Enable the ${dependency} extension"
@@ -542,7 +545,7 @@ function(_php_extensions_validate)
542545
"You've enabled the '${extension}' extension, which depends on the "
543546
"'${dependency}' extension, but you've either not enabled "
544547
"'${dependency}', or have disabled it. Please set "
545-
"'EXT_${dependencyUpper}' to 'ON' if available."
548+
"'PHP_EXT_${dependencyUpper}' to 'ON' if available."
546549
)
547550
endif()
548551

‎cmake/cmake/modules/PHP/FeatureSummary.cmake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -249,7 +249,7 @@ function(php_feature_summary)
249249
APPEND
250250
sharedExtensionsSummary
251251
" * ${extension}\n"
252-
" Set 'EXT_${extensionUpper}_SHARED' to 'ON' (its dependency "
252+
" Set 'PHP_EXT_${extensionUpper}_SHARED' to 'ON' (its dependency "
253253
"${dependency} extension will be built as shared)\n"
254254
)
255255
endif()
@@ -266,7 +266,7 @@ function(php_feature_summary)
266266
APPEND
267267
message
268268
" * ${extension}\n"
269-
" Set 'EXT_${extensionUpper}' to 'ON'\n"
269+
" Set 'PHP_EXT_${extensionUpper}' to 'ON'\n"
270270
)
271271
list(JOIN _phpFeatureSummaryReason_${extension} ", " reasons)
272272
string(APPEND message " (Required by ${reasons})\n")

‎cmake/cmake/modules/PHP/Stubs.cmake

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,10 @@ function(_php_stubs_get_php_command result)
1616
# tokenizer extension.
1717
if(
1818
NOT PHPSystem_EXECUTABLE
19-
AND (NOT TARGET PHP::SAPI::cli OR (TARGET PHP::SAPI::cli AND NOT EXT_TOKENIZER))
19+
AND (
20+
NOT TARGET PHP::SAPI::cli
21+
OR (TARGET PHP::SAPI::cli AND NOT TARGET PHP::ext::tokenizer)
22+
)
2023
)
2124
return(PROPAGATE ${result})
2225
endif()
@@ -44,7 +47,8 @@ function(_php_stubs_get_php_command result)
4447
return(PROPAGATE ${result})
4548
endif()
4649

47-
if(EXT_TOKENIZER_SHARED)
50+
get_target_property(type PHP::ext::tokenizer TYPE)
51+
if(type MATCHES "^(MODULE|SHARED)_LIBRARY$")
4852
list(
4953
APPEND
5054
command

‎cmake/cmake/presets/all-disabled.json

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -8,25 +8,25 @@
88
"binaryDir": "${sourceDir}/php-build/all-disabled",
99
"installDir": "/tmp",
1010
"cacheVariables": {
11-
"EXT_COM_DOTNET": false,
12-
"EXT_CTYPE": false,
13-
"EXT_DOM": false,
14-
"EXT_FILEINFO": false,
15-
"EXT_FILTER": false,
16-
"EXT_ICONV": false,
17-
"EXT_LIBXML": false,
18-
"EXT_OPCACHE": false,
19-
"EXT_PDO": false,
20-
"EXT_PDO_SQLITE": false,
21-
"EXT_PHAR": false,
22-
"EXT_POSIX": false,
23-
"EXT_SESSION": false,
24-
"EXT_SIMPLEXML": false,
25-
"EXT_SQLITE3": false,
26-
"EXT_TOKENIZER": false,
27-
"EXT_XML": false,
28-
"EXT_XMLREADER": false,
29-
"EXT_XMLWRITER": false,
11+
"PHP_EXT_COM_DOTNET": false,
12+
"PHP_EXT_CTYPE": false,
13+
"PHP_EXT_DOM": false,
14+
"PHP_EXT_FILEINFO": false,
15+
"PHP_EXT_FILTER": false,
16+
"PHP_EXT_ICONV": false,
17+
"PHP_EXT_LIBXML": false,
18+
"PHP_EXT_OPCACHE": false,
19+
"PHP_EXT_PDO": false,
20+
"PHP_EXT_PDO_SQLITE": false,
21+
"PHP_EXT_PHAR": false,
22+
"PHP_EXT_POSIX": false,
23+
"PHP_EXT_SESSION": false,
24+
"PHP_EXT_SIMPLEXML": false,
25+
"PHP_EXT_SQLITE3": false,
26+
"PHP_EXT_TOKENIZER": false,
27+
"PHP_EXT_XML": false,
28+
"PHP_EXT_XMLREADER": false,
29+
"PHP_EXT_XMLWRITER": false,
3030

3131
"PHP_SAPI_CGI": false,
3232
"PHP_SAPI_PHPDBG": false

0 commit comments

Comments
 (0)