Skip to content

Commit 68633de

Browse files
committed
Merge branch 'PHP-8.4'
2 parents 845b500 + 10366fb commit 68633de

File tree

6 files changed

+28
-25
lines changed

6 files changed

+28
-25
lines changed

.codespellrc

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
# The codespell configuration.
2+
# https://github.com/codespell-project/codespell
3+
4+
[codespell]
5+
builtin = clear,code,en-GB_to_en-US,informal,names,rare,usage
6+
check-filenames =
7+
check-hidden =
8+
ignore-words-list =
9+
empress,
10+
master,
11+
musl,
12+
nmake,
13+
shs,
14+
stdio,
15+
thead,
16+
skip =
17+
./php-src,
18+
./.git,
19+
*.patch,
20+
*.svg,
21+
./docs/autotools/PHP-*.txt,

bin/check-cmake.php

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -622,11 +622,7 @@ function runCodespell(): int
622622
return 0;
623623
}
624624

625-
exec(
626-
'codespell --config ' . __DIR__ . '/check-cmake/.codespellrc .',
627-
$output,
628-
$status,
629-
);
625+
exec('codespell', $output, $status);
630626

631627
$output = implode("\n", $output);
632628
if ('' !== $output) {

bin/check-cmake/.codespellrc

Lines changed: 0 additions & 8 deletions
This file was deleted.

bin/check-cmake/codespell-ignores.txt

Lines changed: 0 additions & 7 deletions
This file was deleted.

cmake/sapi/litespeed/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ endif()
3535
add_executable(php_sapi_litespeed)
3636
add_executable(PHP::sapi::litespeed ALIAS php_sapi_litespeed)
3737

38-
target_sourceS(
38+
target_sources(
3939
php_sapi_litespeed
4040
PRIVATE
4141
lsapi_main.c

docs/CONTRIBUTING.md

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,17 +49,18 @@ This is a monolithic repository consisting of the following files:
4949
📂 <php-build-system>
5050
└─📂 .github # GitHub directory
5151
└─📂 workflows # Workflows for GitHub actions
52-
└─📂 ...
52+
└─📄 ...
5353
└─📂 bin # Helper development scripts, not part of the build system
54-
└─📂 ...
54+
└─📄 ...
5555
└─📂 cmake # CMake-based PHP build system
5656
└─📂 ...
5757
└─📂 docs # Repository documentation
58-
└─📂 ...
58+
└─📄 ...
5959
└─📂 patches # Patches needed for using CMake with PHP
6060
└─📂 ...
6161
└─📂 php-* # Downloaded PHP sources
6262
└─📂 ...
63-
├─📄 .editorconfig # EditorConfig https://editorconfig.org
63+
├─📄 .codespellrc # See https://github.com/codespell-project/codespell
64+
├─📄 .editorconfig # See https://editorconfig.org
6465
└─ ...
6566
```

0 commit comments

Comments
 (0)