Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Commit 98c6c23

Browse files
committed
Merge branch 'PHP-8.5'
2 parents 29162cc + bea102f commit 98c6c23

File tree

6 files changed

+38
-3
lines changed

6 files changed

+38
-3
lines changed

‎.codespellrc‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ check-filenames =
77
check-hidden =
88
ignore-words-list =
99
deafults,
10+
gost,
1011
empress,
1112
master,
1213
musl,

‎.editorconfig‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ charset = utf-8
1414
[*.{c,h}]
1515
indent_style = tab
1616

17-
[*.{html,json,md,sh,yaml,yml}]
17+
[*.{html,json,md,sh,toml,yaml,yml}]
1818
indent_size = 2
1919

2020
[Makefile]

‎.github/workflows/check.yaml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ jobs:
3030
- name: Install checking tools
3131
run: |
3232
pipx install codespell
33+
cargo install typos-cli --locked
3334
curl -OL https://github.com/petk/normalizator/releases/latest/download/normalizator.phar
3435
chmod +x normalizator.phar
3536
mv normalizator.phar /usr/local/bin/normalizator
@@ -41,6 +42,10 @@ jobs:
4142
if: ${{ always() }}
4243
run: codespell
4344

45+
- name: Run typos
46+
if: ${{ always() }}
47+
run: typos
48+
4449
- name: Run normalizator.phar
4550
if: ${{ always() }}
4651
run: normalizator check --not php-src --not .git .

‎.typos.toml‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
# The typos-cli configuration.
2+
# https://github.com/crate-ci/typos
3+
4+
[files]
5+
ignore-hidden = false
6+
ignore-dot = false
7+
extend-exclude = [
8+
".git/",
9+
"*.svg",
10+
"patches/",
11+
]
12+
13+
[default]
14+
binary = false
15+
check-filename = true
16+
check-file = true
17+
unicode=true
18+
locale = "en-us"
19+
extend-ignore-re = []
20+
extend-ignore-identifiers-re = [
21+
"PDO_DBLIB_FLAVOUR",
22+
"secur32",
23+
]
24+
extend-ignore-words-re = [
25+
"deafults",
26+
"flavour",
27+
"gost",
28+
"shs",
29+
]

‎docs/cmake/differences.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ build system:
7070
* In CMake the install prefix can be also changed during the installation phase
7171
using the `cmake --install <build-dir> --prefix <install-prefix>`. In PHP
7272
native Autotools-based build system, installation prefix can be only set at
73-
the configure phase using the `./configure --prefix=<installl-prefix>`, which
73+
the configure phase using the `./configure --prefix=<install-prefix>`, which
7474
is a regression for the `main/build-defs.h` and `main/php_config.h` files,
7575
where the installation prefix in PHP is hardcoded during the build phase and
7676
cannot be changed during the installation phase. For the generated files

‎docs/php-installation.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -423,7 +423,7 @@ PHP installation directory structure when using CMake:
423423
> adjustments are done when install prefix is `/` or `/opt/...`. See
424424
> [GNUInstallDirs](https://cmake.org/cmake/help/latest/module/GNUInstallDirs.html#special-cases)
425425
> for more info. The [PHP/Install](/docs/cmake/modules/PHP/Install.md) bypasses
426-
> some of these adjustmens inside the `install()` command for convenience.
426+
> some of these adjustemens inside the `install()` command for convenience.
427427
428428
Instead of setting the installation prefix at the configuration phase using
429429
`CMAKE_INSTALL_PREFIX` variable or `--install-prefix` option, there is

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /