Skip to content

Commit b6a0b5e

Browse files
petkpetk
committed
Rename PHP::SAPI to PHP::sapi
This is a sync with the current used style of PHP::ext, PHP::config etc.
1 parent 81d6a6e commit b6a0b5e

File tree

19 files changed

+50
-50
lines changed

19 files changed

+50
-50
lines changed

‎cmake/cmake/Bootstrap.cmake‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ target_include_directories(
4545

4646
# INTERFACE library that ties objects and configuration together for PHP SAPIs.
4747
add_library(php_sapi INTERFACE)
48-
add_library(PHP::SAPI ALIAS php_sapi)
48+
add_library(PHP::sapi ALIAS php_sapi)
4949
target_link_libraries(php_sapi INTERFACE PHP::config)
5050

5151
# Create a custom target for generating files (parsers, lexers, etc.) manually:

‎cmake/cmake/Testing.cmake‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
Enable and configure tests.
33
#]=============================================================================]
44

5-
if(NOT TARGET PHP::SAPI::cli)
5+
if(NOT TARGET PHP::sapi::cli)
66
return()
77
endif()
88

@@ -32,7 +32,7 @@ block()
3232
add_test(
3333
NAME PHP
3434
COMMAND
35-
PHP::SAPI::cli
35+
PHP::sapi::cli
3636
-n
3737
-d open_basedir=
3838
-d output_buffering=0

‎cmake/cmake/modules/PHP/AddCustomCommand.cmake‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -94,14 +94,14 @@ function(php_add_custom_command)
9494
return()
9595
endif()
9696

97-
if(NOT TARGET PHP::SAPI::cli)
97+
if(NOT TARGET PHP::sapi::cli)
9898
return()
9999
endif()
100100

101101
if(NOT CMAKE_CROSSCOMPILING)
102-
set(PHP_EXECUTABLE "$<TARGET_FILE:PHP::SAPI::cli>")
102+
set(PHP_EXECUTABLE "$<TARGET_FILE:PHP::sapi::cli>")
103103
elseif(CMAKE_CROSSCOMPILING AND CMAKE_CROSSCOMPILING_EMULATOR)
104-
set(PHP_EXECUTABLE "${CMAKE_CROSSCOMPILING_EMULATOR};$<TARGET_FILE:PHP::SAPI::cli>")
104+
set(PHP_EXECUTABLE "${CMAKE_CROSSCOMPILING_EMULATOR};$<TARGET_FILE:PHP::sapi::cli>")
105105
else()
106106
return()
107107
endif()

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ function(php_feature_summary)
161161
string(PREPEND item " * ")
162162
if(feature MATCHES "^ext/([^ ]+)$")
163163
if(CMAKE_MATCH_1)
164-
get_target_property(type php_ext_${CMAKE_MATCH_1} TYPE)
164+
get_target_property(type PHP::ext::${CMAKE_MATCH_1} TYPE)
165165
if(type MATCHES "^(MODULE|SHARED)_LIBRARY$")
166166
string(APPEND item " (shared)")
167167
endif()
@@ -213,7 +213,7 @@ function(php_feature_summary)
213213

214214
get_target_property(
215215
dependencies
216-
php_ext_${extension}
216+
PHP::ext::${extension}
217217
MANUALLY_ADDED_DEPENDENCIES
218218
)
219219

@@ -237,8 +237,8 @@ function(php_feature_summary)
237237
continue()
238238
endif()
239239

240-
get_target_property(dependencyType php_ext_${dependency} TYPE)
241-
get_target_property(extensionType php_ext_${extension} TYPE)
240+
get_target_property(dependencyType PHP::ext::${dependency} TYPE)
241+
get_target_property(extensionType PHP::ext::${extension} TYPE)
242242

243243
if(
244244
dependencyType MATCHES "^(MODULE|SHARED)_LIBRARY$"

‎cmake/cmake/modules/PHP/Rebuild.cmake‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
44
Ensure all project targets are rebuilt as needed.
55
6-
When PHP is not found on the system, the `php_sapi_cli` (alias `PHP::SAPI::cli`)
6+
When PHP is not found on the system, the `php_sapi_cli` (alias `PHP::sapi::cli`)
77
target is used to generate certain files during development. This can lead to
88
cyclic dependencies among targets if custom commands depend on the
9-
`PHP::SAPI::cli` target. While such automatic rebuilding is not considered good
9+
`PHP::sapi::cli` target. While such automatic rebuilding is not considered good
1010
practice, it ensures that all targets are kept up to date.
1111
1212
TODO: This works only for a limited set of cases for now and will be refactored.

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ function(_php_stubs_get_php_command result)
1717
if(
1818
NOT PHPSystem_EXECUTABLE
1919
AND (
20-
NOT TARGET PHP::SAPI::cli
21-
OR (TARGET PHP::SAPI::cli AND NOT TARGET PHP::ext::tokenizer)
20+
NOT TARGET PHP::sapi::cli
21+
OR (TARGET PHP::sapi::cli AND NOT TARGET PHP::ext::tokenizer)
2222
)
2323
)
2424
return(PROPAGATE ${result})
@@ -40,9 +40,9 @@ function(_php_stubs_get_php_command result)
4040
endif()
4141

4242
if(NOT CMAKE_CROSSCOMPILING)
43-
set(command $<TARGET_FILE:PHP::SAPI::cli>)
43+
set(command $<TARGET_FILE:PHP::sapi::cli>)
4444
elseif(CMAKE_CROSSCOMPILING AND CMAKE_CROSSCOMPILING_EMULATOR)
45-
set(command ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:PHP::SAPI::cli>)
45+
set(command ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:PHP::sapi::cli>)
4646
else()
4747
return(PROPAGATE ${result})
4848
endif()

‎cmake/ext/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ foreach(extension IN LISTS extensions)
7474

7575
# Add usage requirements to PHP interface targets.
7676
# TODO: Should PHP_CLI extensions pass properties only to PHP_CLI SAPIs?
77-
get_target_property(type php_ext_${extension} TYPE)
77+
get_target_property(type PHP::ext::${extension} TYPE)
7878
if(NOT type MATCHES "^(MODULE|SHARED)_LIBRARY$")
7979
target_compile_definitions(
8080
php_config

‎cmake/ext/phar/CMakeLists.txt‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -120,14 +120,14 @@ install(
120120
# The phar command-line script.
121121
################################################################################
122122

123-
if(NOT TARGET PHP::SAPI::cli)
123+
if(NOT TARGET PHP::sapi::cli)
124124
return()
125125
endif()
126126

127127
if(NOT CMAKE_CROSSCOMPILING)
128-
set(PHP_EXECUTABLE "$<TARGET_FILE:PHP::SAPI::cli>")
128+
set(PHP_EXECUTABLE "$<TARGET_FILE:PHP::sapi::cli>")
129129
elseif(CMAKE_CROSSCOMPILING AND CMAKE_CROSSCOMPILING_EMULATOR)
130-
set(PHP_EXECUTABLE "${CMAKE_CROSSCOMPILING_EMULATOR};$<TARGET_FILE:PHP::SAPI::cli>")
130+
set(PHP_EXECUTABLE "${CMAKE_CROSSCOMPILING_EMULATOR};$<TARGET_FILE:PHP::sapi::cli>")
131131
else()
132132
return()
133133
endif()
@@ -182,7 +182,7 @@ add_custom_command(
182182
-p 0
183183
-s ${CMAKE_CURRENT_SOURCE_DIR}/phar/phar.php
184184
-h sha1
185-
-b "$<TARGET_FILE:PHP::SAPI::cli>"
185+
-b "$<TARGET_FILE:PHP::sapi::cli>"
186186
${CMAKE_CURRENT_SOURCE_DIR}/phar
187187
DEPENDS
188188
${CMAKE_CURRENT_BINARY_DIR}/phar.php
@@ -231,7 +231,7 @@ add_custom_target(
231231
php_ext_phar_generate_file
232232
ALL
233233
DEPENDS
234-
PHP::SAPI::cli
234+
PHP::sapi::cli
235235
php_ext_phar
236236
${dependentFiles}
237237
php_ext_phar_generated_phar
@@ -259,7 +259,7 @@ install(CODE "
259259
-p 0
260260
-s ${CMAKE_CURRENT_SOURCE_DIR}/phar/phar.php
261261
-h sha1
262-
-b $<PATH:ABSOLUTE_PATH,NORMALIZE,${CMAKE_INSTALL_BINDIR},\${CMAKE_INSTALL_PREFIX}>/$<TARGET_FILE_NAME:PHP::SAPI::cli>
262+
-b $<PATH:ABSOLUTE_PATH,NORMALIZE,${CMAKE_INSTALL_BINDIR},\${CMAKE_INSTALL_PREFIX}>/$<TARGET_FILE_NAME:PHP::sapi::cli>
263263
${CMAKE_CURRENT_SOURCE_DIR}/phar
264264
)
265265

‎cmake/main/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ block()
145145
get_property(extensions GLOBAL PROPERTY PHP_EXTENSIONS)
146146
foreach(extension IN LISTS extensions)
147147
# Skip if extension is shared.
148-
get_target_property(type php_ext_${extension} TYPE)
148+
get_target_property(type PHP::ext::${extension} TYPE)
149149
if(type MATCHES "^(MODULE|SHARED)_LIBRARY$")
150150
continue()
151151
endif()

‎cmake/pear/CMakeLists.txt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ message(
9797

9898
# Check PEAR dependencies.
9999
block()
100-
if(NOT TARGET PHP::SAPI::cli)
100+
if(NOT TARGET PHP::sapi::cli)
101101
message(
102102
FATAL_ERROR
103103
"The 'PHP_PEAR' option requires PHP CLI SAPI. Please, set 'PHP_SAPI_CLI' "
@@ -123,9 +123,9 @@ endblock()
123123

124124
set(PHP_EXECUTABLE "")
125125
if(NOT CMAKE_CROSSCOMPILING)
126-
set(PHP_EXECUTABLE "$<TARGET_FILE:PHP::SAPI::cli>")
126+
set(PHP_EXECUTABLE "$<TARGET_FILE:PHP::sapi::cli>")
127127
elseif(CMAKE_CROSSCOMPILING AND CMAKE_CROSSCOMPILING_EMULATOR)
128-
set(PHP_EXECUTABLE "${CMAKE_CROSSCOMPILING_EMULATOR};$<TARGET_FILE:PHP::SAPI::cli>")
128+
set(PHP_EXECUTABLE "${CMAKE_CROSSCOMPILING_EMULATOR};$<TARGET_FILE:PHP::sapi::cli>")
129129
endif()
130130

131131
php_install(CODE "
@@ -140,7 +140,7 @@ php_install(CODE "
140140
set(PHP_BINARY_DIR ${PHP_BINARY_DIR})
141141
set(CMAKE_SYSTEM_NAME ${CMAKE_SYSTEM_NAME})
142142
set(PHP_PEAR_TEMP_DIR \"${PHP_PEAR_TEMP_DIR}\")
143-
set(phpPearInstalledPhpBin \"\${phpPearInstallBinDir}/$<TARGET_FILE_NAME:PHP::SAPI::cli>\")
143+
set(phpPearInstalledPhpBin \"\${phpPearInstallBinDir}/$<TARGET_FILE_NAME:PHP::sapi::cli>\")
144144
set(phpPearPhpProgramPrefix \"${PHP_PROGRAM_PREFIX}\")
145145
set(phpPearPhpProgramSuffix \"${PHP_PROGRAM_SUFFIX}\")
146146
set(phpPearInstallSysconfDir \"\${CMAKE_INSTALL_FULL_SYSCONFDIR}\")

0 commit comments

Comments
 (0)