Skip to content

Commit a3ad337

Browse files
committed
Merge branch 'PHP-8.5'
2 parents 456336b + a1e9a03 commit a3ad337

File tree

4 files changed

+4
-4
lines changed

4 files changed

+4
-4
lines changed

cmake/cmake/modules/FindODBC.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ enhancements and adjustments for the PHP build workflow.
4646
Windows implementation only. On Windows in MinGW environment, there is at
4747
the time of writing `unixODBC` implementation available in the default
4848
MinGW installation and as a standalone package. The driver name is
49-
case-insensitive and if supported it will be adjusted to the expected case.
49+
case insensitive and if supported it will be adjusted to the expected case.
5050
5151
* Added pkg-config integration.
5252

cmake/cmake/modules/PHP/Set.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ php_set(
159159
160160
* When `CHOICES_CASE_SENSITIVE` is given, the variable value will need to match
161161
the case of item defined in the `CHOICES` list. By default, choices are
162-
case-insensitive.
162+
case insensitive.
163163
164164
For example:
165165

cmake/cmake/scripts/GenerateCredits.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ set(template [[
3333
]])
3434

3535
file(GLOB credits ${PHP_SOURCE_DIR}/*/*/CREDITS)
36-
# Case-sensitive filtering, GLOB on macOS/Windows/Cygwin is case-insensitive.
36+
# Case-sensitive filtering, GLOB on macOS/Windows/Cygwin is case insensitive.
3737
list(FILTER credits INCLUDE REGEX ".*CREDITS$")
3838

3939
foreach(credit IN LISTS credits)

cmake/ext/standard/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -424,7 +424,7 @@ set(HAVE_ELF_AUX_INFO ${PHP_HAVE_ELF_AUX_INFO})
424424

425425
block()
426426
file(GLOB credits ${PHP_SOURCE_DIR}/*/*/CREDITS)
427-
# Case-sensitive filtering, GLOB on macOS/Windows/Cygwin is case-insensitive.
427+
# Case-sensitive filtering, GLOB on macOS/Windows/Cygwin is case insensitive.
428428
list(FILTER credits INCLUDE REGEX ".*CREDITS$")
429429

430430
add_custom_command(

0 commit comments

Comments
 (0)