1
0
mirror of https://github.com/php/php-src.git synced 2026-03-24 16:22:37 +01:00
Commit Graph

621 Commits

Author SHA1 Message Date
Jakub Zelenka
5ba299be18 Merge branch 'PHP-8.4' 2025-01-06 12:21:20 +01:00
Jakub Zelenka
35c03c165e Merge branch 'PHP-8.3' into PHP-8.4 2025-01-06 12:20:50 +01:00
Jakub Zelenka
3606701f48 Merge branch 'PHP-8.2' into PHP-8.3 2025-01-06 12:19:36 +01:00
Jakub Zelenka
5be673d29e Merge branch 'PHP-8.1' into PHP-8.2 2025-01-06 12:18:54 +01:00
Jakub Zelenka
9e1b58274e Test stream_context_tcp_nodelay_server on Windows
Closes GH-17308
2025-01-05 14:44:22 +01:00
Christoph M. Becker
7e1a241b09 Reduce excessive stack reserve for testing in CI (GH-17166)
For some reason the stack reserve of php.exe and php-cgi.exe is very
large on Windows (64MB)[1].  While this might not be bad for production
purposes, it causes stack_limit_014.phpt to be unbearably slow; the
test may easily run for a minute, and due to a recent `stream_select()`
improvement[2], that can cause a timeout, what triggers the test to be
run again.  So this single test case may run for two minutes, and still
might fail (happened a couple of times).

Instead of skipping the test in CI, we reduce the stack reserve to 8MB,
what improves the performance of this test case (and maybe others), and
should still be good enough for CI.

[1] <54906c760f>
[2] <b614b4a69a>
2024-12-16 12:37:06 +01:00
Ilija Tovilo
e675c1a467 Drop intl on macOS + PHP 8.1 build
Based on the discussion in GH-16286, drop the intl build from macOS + PHP 8.1,
since we cannot build with supported intl versions without too many changes.

Closes GH-17092
See GH-16286
2024-12-09 16:55:31 +01:00
Christoph M. Becker
85731e8830 [skip ci] Add nightly job for x64 Windows with ASan enabled
It seems reasonable to have an ASan job on Windows, especially to be
able to check Windows specific code.  Since the tests may take about
70 minutes, it doesn't make sense to add these for pushes, but for a
nightly job that should be okay.

Closes GH-17087.
2024-12-09 12:01:19 +01:00
Niels Dossche
c5d9c7da9e Port Firebird x32 task to nightly (#17080) 2024-12-07 23:35:26 +01:00
Niels Dossche
912b13a779 Test Firebird in 32-bit Linux CI (#17045)
Co-authored-by: =?UTF-8?q?=E6=AD=A6=E7=94=B0=20=E6=86=B2=E5=A4=AA=E9=83=8E?= <takeda@youmind.jp>
Co-authored-by: Christoph M. Becker <cmbecker69@gmx.de>
2024-12-06 17:27:59 +01:00
hakre
1668a1602a Improve php-src docs sphinx build, also on *nix (GH-16743)
* Document .rst file maximum line length of 100

In 19d2b84788 ("Create book for docs", 2024-01-30) the build of the
php-src documentation has been introduced.

It is based on reStructuredText (rst) [Docutils] for its source files,
this stems from the sphinx-build utility in use to build the static HTML
pages of the php-src documentation.

The maximum line length of these text files has been set to 100
characters in 19d2b84788 ("Create book for docs", 2024-01-30), the
rationale is unknown to the documenting author at time of writing this
message.

This formatting constraint is applied with the rstfmt utility [rstfmt]
via its invocation (documented in CI build instructions and README.md:)

    rstfmt -w 100 source

The `-w, --width` option takes a WIDTH argument that is "the
target line length in characters" (cf. `rstfmt --help`.)

There is also an `--ext EXT` argument option, that is "the extension of
files to look at when passed a directory" ("source" is the name of
a directory in the invocation above) and defaults to "rst".

Henceforth, the editor configuration [EditorConfig] can benefit from
documenting this expectation in the repositories .editorconfig file,
which has been introduced already earlier in 5c38fbe543 ("Added
editorconfig file", 2016-06-26).

[Docutils]: https://docutils.sourceforge.io/index.html "Docutils: Documentation Utilities — Written in Python, for General- and Special-Purpose Use"
[rstfmt]: https://github.com/dzhu/rstfmt "A formatter for reStructuredText"
[EditorConfig]: https://editorconfig.org/ "EditorConfig helps maintain consistent coding styles for multiple developers working on the same project across various editors and IDEs"

* Makefile for php-src docs build

In 19d2b84788 ("Create book for docs", 2024-01-30) the php-src
documentation (php-src docs) build has been introduced, yet the build
instructions, namely `make html`, did not yield the expected results
within the parenting setup of the php-src project on *nix systems.

The reason is that the `make html` build instruction does not execute
the make.bat file which contains the recipe to build the static HTML
pages.

It is an unused leftover file from initializing the project with
sphinx-quickstart. [1]

Removing it in and adding a Makefile suffices to recover the build of
php-src ./docs on a *nix system.

Formatting constraints checked in the docs workflow in CI update
use the make file to make sure the commands stay consistent and the
build is managed by the build manager.

[1]: https://www.sphinx-doc.org/en/master/man/sphinx-quickstart.html "sphinx-quickstart is an interactive tool that asks some questions about your project and then generates a complete documentation directory and sample Makefile to be used with sphinx-build(1)."

* Bind requirements.txt for php-src docs build

Define the required packages to install for the php-src docs build in
the docs/requirements.txt file:

1) Sphinx
2) sphinx-design
3) sphinxawesome-theme
4) rstfmt

This should also later on ease the use of a requirements_frozen.txt
file to pin the build dependencies if needed/wanted.

Additionally, some formatting corrections in README.md (based on the
profile in .editorconfig) as well as adding the recommendation to use
a Python virtual environment. Python3 and Pip were already named, and
with Python3 there is the venv module (Python 3.3; Sep 2012) to manage
these so-called python virtual environments [venv], which are commonly
a preferred way to install dependencies within development projects
and build systems.

[venv]: https://docs.python.org/3/library/venv.html "venv — Creation of virtual environments — Python documentation"

* Remove deprecated theme configuration

For the configured Awesome Sphinx Theme [1] highlighting extension, the
sphinx-build currently yields the following diagnostics:

     WARNING: while setting up extension sphinxawesome_theme.highlighting: \
     You no longer have to include the `sphinxawsome_theme.highlighting` \
     extension. This extension will be removed in the next major release.

(via `make html`, the configuration file is `source/conf.py`.)

The diagnostic message was introduced by sphinxawesome-theme 5.2.0,
  released May 31, 2024. [2], [3]

Removing the extension from the list of extensions in the configuration
file levitates.

No changes to requirements.txt, the extension was transitive as bundled
by the Awesome Sphinx Theme [1], and 5.2.0 deprecates it with the new
feature to "Support `pygments_style_dark` option that allows you to set
a different syntax highlighting scheme in light and dark modes." [3]

[1]: https://sphinxawesome.xyz/ "Awesome Sphinx Theme — Create functional and beautiful websites for your documentation with Sphinx."
[2]: https://pypi.org/project/sphinxawesome-theme/5.2.0/#history
[3]: https://github.com/kai687/sphinxawesome-theme/releases/tag/5.2.0
2024-11-29 19:29:00 +01:00
Christoph M. Becker
2473f57ba7 Elevate C4013 to level 1 in CI (GH-16986)
C4013 warns about undefined functions[1], but for some reason it's only
a level 3 warning, and such suppressed by default (usually there will be
link errors afterwards, though).  It appears to be sensible to elevate
the warning to level 1, so it will be converted to a compile error.

[1] <https://learn.microsoft.com/en-us/cpp/error-messages/compiler-warnings/compiler-warning-level-3-c4013>
2024-11-29 12:15:26 +01:00
Ayesh Karunaratne
877d0cadf2 Merge branch 'PHP-8.4'
* PHP-8.4:
  CI: FreeBSD on VM - set `copyback: false`
2024-11-25 19:34:17 +07:00
Ayesh Karunaratne
cb90566164 Merge branch 'PHP-8.3' into PHP-8.4
* PHP-8.3:
  CI: FreeBSD on VM - set `copyback: false`
2024-11-25 19:33:38 +07:00
Ayesh Karunaratne
62b115d81d Merge branch 'PHP-8.2' into PHP-8.3
* PHP-8.2:
  CI: FreeBSD on VM - set `copyback: false`
2024-11-25 19:32:25 +07:00
Ayesh Karunaratne
9d61cb8fe7 Merge branch 'PHP-8.1' into PHP-8.2
* PHP-8.1:
  CI: FreeBSD on VM - set `copyback: false`
2024-11-25 19:31:45 +07:00
Ayesh Karunaratne
b263f351c4 CI: FreeBSD on VM - set copyback: false
The `vmactions/freebsd-vm` GitHub action rsyncs the work dir to to the
VM. This adds a lot of log output due to `rsync -v` usage.

Once the tests are compelte, the action copies the files _back_ by
running `rsync` in reverse. However, we do not need these files back
because we do not run any other steps that need access to the post-test
files.

Setting `copyback: false` disables this, and cuts the log size by about
5,000 lines.

Closes Closes GH-16916.
2024-11-25 19:30:19 +07:00
Jakub Zelenka
b3a615391a Merge branch 'PHP-8.4' 2024-11-24 19:48:06 +01:00
Jakub Zelenka
181b4c1861 Merge branch 'PHP-8.3' into PHP-8.4 2024-11-24 19:47:34 +01:00
Jakub Zelenka
af0f06d934 Merge branch 'PHP-8.2' into PHP-8.3 2024-11-24 19:46:13 +01:00
Jakub Zelenka
866d8d7ce6 Update code owners for mysqli, mysqlnd and pdo_mysql [ci skip] (#16921) 2024-11-24 19:45:22 +01:00
Ilija Tovilo
3aa4973acd Merge branch 'PHP-8.4'
* PHP-8.4:
  Enable -Werror for FreeBSD build
  [skip ci] Add --no-progress to FreeBSD build
  Move FreeBSD build to GitHub actions with QEMU
2024-11-20 14:29:52 +01:00
Ilija Tovilo
b3ab930a2f Enable -Werror for FreeBSD build 2024-11-20 14:28:40 +01:00
Ilija Tovilo
2b50534e27 Merge branch 'PHP-8.3' into PHP-8.4
* PHP-8.3:
  [skip ci] Add --no-progress to FreeBSD build
  Move FreeBSD build to GitHub actions with QEMU
2024-11-20 14:28:09 +01:00
Ilija Tovilo
dbd6c945f9 Merge branch 'PHP-8.2' into PHP-8.3
* PHP-8.2:
  [skip ci] Add --no-progress to FreeBSD build
  Move FreeBSD build to GitHub actions with QEMU
2024-11-20 14:26:55 +01:00
Ilija Tovilo
02ef371eab [skip ci] Add --no-progress to FreeBSD build 2024-11-20 14:25:54 +01:00
Ilija Tovilo
12f20ce407 Merge branch 'PHP-8.1' into PHP-8.2
* PHP-8.1:
  Move FreeBSD build to GitHub actions with QEMU
2024-11-20 14:25:25 +01:00
Ilija Tovilo
aca88baf5f Move FreeBSD build to GitHub actions with QEMU
Closes GH-16822
2024-11-20 14:24:02 +01:00
Ilija Tovilo
73f1e1bb50 Merge branch 'PHP-8.4'
* PHP-8.4:
  [skip ci] Don't test mysqli with libmysqlclient 8.4
2024-11-20 14:19:41 +01:00
Ilija Tovilo
5d4ae656c8 Merge branch 'PHP-8.3' into PHP-8.4
* PHP-8.3:
  [skip ci] Don't test mysqli with libmysqlclient 8.4
2024-11-20 14:19:33 +01:00
Ilija Tovilo
3f1e1ee467 Merge branch 'PHP-8.2' into PHP-8.3
* PHP-8.2:
  [skip ci] Don't test mysqli with libmysqlclient 8.4
2024-11-20 14:19:18 +01:00
Ilija Tovilo
aa40d3abcc Merge branch 'PHP-8.1' into PHP-8.2
* PHP-8.1:
  [skip ci] Don't test mysqli with libmysqlclient 8.4
2024-11-20 14:19:10 +01:00
Ilija Tovilo
e23ac8341a [skip ci] Don't test mysqli with libmysqlclient 8.4
There are compile errors with 8.4 that we are no longer fixing.
2024-11-20 14:19:02 +01:00
Ilija Tovilo
72ab374d6b Merge branch 'PHP-8.3' into PHP-8.4
* PHP-8.3:
  [skip ci] Backport GA root workflow changes
2024-11-20 13:42:45 +01:00
Ilija Tovilo
378307cc4e Merge branch 'PHP-8.2' into PHP-8.3
* PHP-8.2:
  [skip ci] Backport GA root workflow changes
2024-11-20 13:42:36 +01:00
Ilija Tovilo
f8c37dc971 Merge branch 'PHP-8.1' into PHP-8.2
* PHP-8.1:
  [skip ci] Backport GA root workflow changes
2024-11-20 13:42:28 +01:00
Ilija Tovilo
9acf0a4009 [skip ci] Backport GA root workflow changes 2024-11-20 13:41:39 +01:00
Christoph M. Becker
03cbb3ee58 Build com_dotnet shared by default
The official Windows builds and CI are doing this for ages, so it
appears to be overdue to finally switch the actual default.

Closes GH-16300.
2024-11-18 20:50:22 +01:00
Jakub Zelenka
07cef9fb65 Merge branch 'PHP-8.4' 2024-11-18 16:50:52 +01:00
Jakub Zelenka
e47f18156e Merge branch 'PHP-8.3' into PHP-8.4 2024-11-18 16:50:05 +01:00
Jakub Zelenka
1b6c3f7172 Merge branch 'PHP-8.2' into PHP-8.3 2024-11-18 16:48:50 +01:00
Jakub Zelenka
cae2582416 Run labeler only in php/php-src repository
Closes GH-16844
2024-11-18 16:43:15 +01:00
Christoph M. Becker
9128fb8f1e Stick with icu4c 74.2 on macOS CI for PHP-8.1
PHP-8.1 is not ready for ICU >= 75.1 which requires C++17 support.
Thus we force the usage of icu4c@74, what is scheduled for removal in
May 2025, though.

Closes GH-16789.
2024-11-15 14:24:24 +01:00
Christoph M. Becker
d1f86bc8eb Merge branch 'PHP-8.2' into PHP-8.3
* PHP-8.2:
  Need to define BREW_OPT
2024-11-13 21:24:20 +01:00
Christoph M. Becker
c69fdef760 Merge branch 'PHP-8.1' into PHP-8.2
* PHP-8.1:
  Need to define BREW_OPT
2024-11-13 21:23:56 +01:00
Christoph M. Becker
d6249b6e1f Need to define BREW_OPT
This is only defined as of PHP-8.4; alternatively we could also inline
the `brew --prefix` call, but that makes it harder for upward merges.

Closes GH-16785.
2024-11-13 21:23:27 +01:00
Christoph M. Becker
fa3421cd10 Merge branch 'PHP-8.4'
* PHP-8.4:
  Patch libcurl.pc for macOS builds
2024-11-13 19:40:52 +01:00
Christoph M. Becker
3d07b9e771 Merge branch 'PHP-8.3' into PHP-8.4
* PHP-8.3:
  Patch libcurl.pc for macOS builds
2024-11-13 19:40:21 +01:00
Christoph M. Becker
4c74487912 Merge branch 'PHP-8.2' into PHP-8.3
* PHP-8.2:
  Patch libcurl.pc for macOS builds
2024-11-13 19:38:49 +01:00
Christoph M. Becker
45487c6ec2 Merge branch 'PHP-8.1' into PHP-8.2
* PHP-8.1:
  Patch libcurl.pc for macOS builds
2024-11-13 19:38:07 +01:00