1
0
mirror of https://github.com/php/php-src.git synced 2026-03-30 20:22:36 +02:00
Commit Graph

168 Commits

Author SHA1 Message Date
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
Christoph M. Becker
9196a72eb0 Patch libcurl.pc for macOS builds
cURL 8.11.0 added a couple of packages to `Requires.private`, but these
packages are irrelevant when building against a shared libcurl.  For
some reason, these private requirements are checked when we're doing
`pkg-config --cflags` (that happens with the preinstalled pkg-config
0.29.2, as well as with pkgconf 2.3.0).  To avoid further messing with
these packages, we just drop the `Requires.private` line from
libcurl.pc.

See GH-16741 for more details.

Closes GH-16783.
2024-11-13 19:36:58 +01:00
Ilija Tovilo
cf4c0182b6 Merge branch 'PHP-8.1' into PHP-8.2
* PHP-8.1:
  [CI] Backport usage of db service for 8.1
2024-10-30 12:21:34 +01:00
Ilija Tovilo
560a585117 [CI] Backport usage of db service for 8.1
Nightly already uses them. We're running into port clashes otherwise.

Closes GH-16647
2024-10-30 12:20:42 +01:00
Ilija Tovilo
d6839f77ee [skip ci] Remove duplicate icu dep on 8.4+
I see those were already added there
2024-10-28 16:47:53 +01:00
Ilija Tovilo
21165a83ca Merge branch 'PHP-8.3' into PHP-8.4
* PHP-8.3:
  Fix icu dependency for macos build
2024-10-28 16:41:25 +01:00
Ilija Tovilo
7e5ed4712d Merge branch 'PHP-8.2' into PHP-8.3
* PHP-8.2:
  Fix icu dependency for macos build
2024-10-28 16:41:16 +01:00
Ilija Tovilo
e3de1a1a21 Fix icu dependency for macos build
Closes GH-16627
2024-10-28 16:40:51 +01:00
Ilija Tovilo
3aa672dd25 Merge branch 'PHP-8.2' into PHP-8.3
* PHP-8.2:
  Backport CI fixes to security branches
2024-10-28 15:59:10 +01:00
Ilija Tovilo
8538ac2667 Merge branch 'PHP-8.1' into PHP-8.2
* PHP-8.1:
  Backport CI fixes to security branches
2024-10-28 15:58:58 +01:00
Ilija Tovilo
25c0993902 Backport CI fixes to security branches
Closes GH-16469

Working towards GH-16286

commit e0db221143b808d97bc3a44e9f0968c6308794b4
Author: Ilija Tovilo <ilija.tovilo@me.com>
Date:   Fri Oct 25 22:48:20 2024 +0200

    Move CFLAGS into ./configure command for consistency

commit 8ad67768250d181cd7fef30e0c866625bbd8ac94
Author: Ilija Tovilo <ilija.tovilo@me.com>
Date:   Fri Oct 25 22:47:03 2024 +0200

    Also upgrade nightly to macOS 13

commit 58a88ccb9f
Author: Ilija Tovilo <ilija.tovilo@me.com>
Date:   Wed Oct 23 19:07:59 2024 +0200

    Fix call to dc[n]gettext in tests with 0 $category

    This causes a segfault on PHP-8.1

commit 611af05c50
Author: Ilija Tovilo <ilija.tovilo@me.com>
Date:   Fri Dec 8 13:36:52 2023 +0100

    [skip ci] Skip intermittently failing curl test on macOS

    The test fails with "CURL ERROR: 56". I will create an issue for it shortly.

commit ec745178bb
Author: Ilija Tovilo <ilija.tovilo@me.com>
Date:   Wed Oct 23 19:05:32 2024 +0200

    Backport parts of 9999a0c for gettext

    See 9999a0cb75

commit 5ce703496f
Author: Niels Dossche <7771979+nielsdos@users.noreply.github.com>
Date:   Sun Jul 28 14:34:26 2024 +0200

    Fix CI failure on macOS after Curl update

commit 714a3e7071
Author: Niels Dossche <7771979+nielsdos@users.noreply.github.com>
Date:   Sat Jul 27 16:09:50 2024 +0200

    Fix CI failure after Curl update (#15124)

commit 4f2eb921b9
Author: Niels Dossche <7771979+nielsdos@users.noreply.github.com>
Date:   Thu May 23 22:20:37 2024 +0200

    Fix GH-14307: Test curl_basic_024 fails with curl 8.8.0

    Curl changed the behaviour, from the changelog:
      - lib: make protocol handlers store scheme name lowercase curl/curl@c294f9c

    From the docs: "The returned scheme might be upper or lowercase. Do
    comparisons case insensitively."

    Closes GH-14312.

commit 251195b41b
Author: Ayesh Karunaratne <ayesh@aye.sh>
Date:   Thu Feb 1 02:03:55 2024 +0700

    ext/curl: Fix failing tests due to string changes in libcurl 8.6.0

    Upstream libcurl 8.6.0 contains a change[^1] that caused a test failure.
    This fixes it by updating the test's `EXPECTF` to use a regex to account for both string patterns.

    [^1]: https://github.com/curl/curl/commit/45cf4755e71f#diff-a8a54563608f8155973318f4ddb61d7328dab512b8ff2b5cc48cc76979d4204cL1683

    Closes GH-13293.

commit fc5d83f2b1
Author: Christoph M. Becker <cmbecker69@gmx.de>
Date:   Wed Oct 16 22:46:20 2024 +0200

    Prepare for necessary move to macOS 13

    GH will remove macOS 12 runner images as of December 3rd, so we prepare
    for that.

    Besides the obvious need to change the runner, we also suppress a
    couple of warnings, because otherwise the build would fail due to
    `-Werror`.
2024-10-28 15:57:16 +01:00
Ilija Tovilo
301cda932b Merge branch 'PHP-8.2' into PHP-8.3
* PHP-8.2:
  [skip ci] Add unused asan param to configure-x64 action
2024-10-23 19:16:19 +02:00
Ilija Tovilo
9b7c506218 [skip ci] Add unused asan param to configure-x64 action
This param is passed by nightly to all branches. Add a unused argument to older
branches to avoid a warning.
2024-10-23 19:14:58 +02:00
Saki Takamachi
8497400b23 Backport 3237b8f471
This should fix the PDO_OCI and oci8 test failures due to more verbose
output of Oracle DB 23.5.

Closes GH-16107.
2024-10-11 23:55:50 +02:00
Christoph M. Becker
37561823e9 Fix GH-16367: macOS CI fails to configure ext/intl on master
Closes GH-16375.
2024-10-11 23:10:29 +02:00
Christoph M. Becker
258088310a Fix nightly builds regarding libavif
Currently, we're running LINUX_X64 Asan builds on ubuntu-20.04, where
libavif-dev is not available, so apt-x64 fails.  This PR is a follow up
to PR #16049 to pass the respective parameter to apt-x64, and to fix
the conditional check in configure-x64.

It might be clearer to just have an `avif` parameter or to pass the
runner version to these actions, but this should do for now.

Closes GH-16130.
2024-09-30 18:51:30 +02:00
Ilija Tovilo
b14d440a82 Merge branch 'PHP-8.3' into PHP-8.4
* PHP-8.3:
  Switch asan build to Ubuntu 24.04
2024-09-26 15:15:39 +02:00
Ilija Tovilo
91c06790de Switch asan build to Ubuntu 24.04
Closes GH-16065
2024-09-26 15:13:35 +02:00
Ilija Tovilo
271b9e685e Fix missing libavif-dev in asan nightly
Asan still runs on Ubuntu 20.04, which doesn't contain the libavif-dev package.

Closes GH-16049
2024-09-26 15:09:32 +02:00
Ilija Tovilo
50d5e96edb Fix nightly for 8.2
Backport of af721c9c36
2024-09-25 00:25:01 +02:00
Christoph M. Becker
051c886bc3 Merge branch 'PHP-8.3'
* PHP-8.3:
  Fix MySQL and MSSQL CI failures
2024-09-24 13:04:52 +02:00
武田 憲太郎
af721c9c36 Fix MySQL and MSSQL CI failures
* use mysql service container for nightly tests
* remove unnecessary mysql startup
* update mssql container to newer version

Closes GH-16011.
2024-09-24 13:03:26 +02:00
Peter Kokot
43dc2eb6d8 Remove redundant *spell* libraries on Alpine (#15890)
These were needed mostly for the PHP <= 8.3 pspell extension. The
nchant2-hunspell gets installed automatically as a dependency with
enchant2-dev if needed.
2024-09-17 18:14:44 +02:00
Peter Kokot
2324e32c7d Remove redundant Kerberos library installation (#15889)
This was once needed for the --with-kerberos configure options by
openssl or imap extensions.
2024-09-17 18:13:54 +02:00
Ilija Tovilo
1be989bbf0 [skip ci] Move brew install libsodium to reinstall
Gets rid of the "already installed" warning on master.
2024-09-17 12:35:07 +02:00
Ayesh Karunaratne
d5b3ffa762 ext/gd: enable avif tests on GH-Actions (#15850)
When the avif support was first added (GH-7026), php-src did not
use GitHub Actions. When we moved to GitHub Actions for CI, the
`--with-avif` option nor the `libavif-dev` dependencies were not
added.

Cirrus CI still runs the tests, and now that we no longer use
Travis CI, this brings parity to test avif on x64 tests on
GitHub Actions as well.

`libavif-dev` package's x86 builds seem to be missing[^1][^2] on older
Ubuntu versions, so this commit only adds it for x64 builds.

[^1]: https://packages.ubuntu.com/jammy/libavif-dev
[^2]: https://packages.ubuntu.com/noble/libavif-dev
2024-09-15 14:57:47 +02:00
Ilija Tovilo
f6a232cce2 Fix missing deps in macos arm build (GH-15881) 2024-09-14 00:53:24 +02:00
Ilija Tovilo
99bee73325 Merge branch 'PHP-8.3'
* PHP-8.3:
  Fix GA macOS brew warnings
2024-09-13 23:14:55 +02:00
Ilija Tovilo
a08d326941 Merge branch 'PHP-8.2' into PHP-8.3
* PHP-8.2:
  Fix GA macOS brew warnings
2024-09-13 23:10:19 +02:00
Ilija Tovilo
664e039069 Fix GA macOS brew warnings
These pollute the job overview.

Closes GH-15877
2024-09-13 23:10:08 +02:00
Ilija Tovilo
d7febabd23 Merge branch 'PHP-8.2' into PHP-8.3
* PHP-8.2:
  [skip ci] Backport libmysql build fix (d9a9696)
2024-09-02 12:09:36 +02:00
Ilija Tovilo
57f9041165 [skip ci] Backport libmysql build fix (d9a9696) 2024-09-02 12:08:55 +02:00
Arnaud Le Blanc
5b482b706e Alpine/Musl nightly job (#13925)
Co-authored-by: Michael Voříšek <mvorisek@mvorisek.cz>
2024-08-28 17:28:07 +02:00
Ilija Tovilo
37c22c4c7e Merge branch 'PHP-8.3'
* PHP-8.3:
  Fix git check in verify generated files (GH-15363)
2024-08-12 16:21:35 +02:00
Ilija Tovilo
cbe73a158f Merge branch 'PHP-8.2' into PHP-8.3
* PHP-8.2:
  Fix git check in verify generated files (GH-15363)
2024-08-12 16:20:24 +02:00
Ilija Tovilo
9be52dcd62 Fix git check in verify generated files (GH-15363)
Git 2.46.0 accidentally broke git diff --exit-code for files flagged with -diff.
Add the -a flag to restore the previous behavior. This issue is already fixed in
gits next branch.
2024-08-12 16:19:54 +02:00
Remi Collet
521178709e use libedit instead of readline for CI 2024-08-02 14:34:42 +02:00
Ilija Tovilo
8fd1388a7f Merge branch 'PHP-8.3'
* PHP-8.3:
  Remove GitHub actions junit artifacts
2024-06-13 14:09:17 +02:00
Ilija Tovilo
9cec164f76 Merge branch 'PHP-8.2' into PHP-8.3
* PHP-8.2:
  Remove GitHub actions junit artifacts
2024-06-13 14:07:43 +02:00
Ilija Tovilo
f598b58790 Remove GitHub actions junit artifacts
Nobody looks at those, and nightly regularly fails due to uploading them.

Closes GH-14555
2024-06-13 14:05:50 +02:00
武田 憲太郎
d9a9696e89 Fix libmysql download to stable URL 2024-05-04 17:54:18 +09:00
Saki Takamachi
cd2dea77ff Merge branch 'PHP-8.2' into PHP-8.3
* PHP-8.2:
  CI: fix oci setup (#14123)
2024-05-04 17:47:55 +09:00
Saki Takamachi
3237b8f471 CI: fix oci setup (#14123)
closes #14123
2024-05-04 17:47:27 +09:00
Arnaud Le Blanc
46b6ad6dae Inline GDB scripts in the PHP binary (#13600)
This inlines .gdbinit and php_gdb.py in the .debug_gdb_scripts section of the PHP binary so that GDB can auto-load them regardless of the current directory or the availability of the PHP source code (albeit some functionalities of php_gdb.py currently rely on the source being available).
2024-04-16 15:10:01 +02:00
Ayesh Karunaratne
a4534fafac ext/openssl: Remove kerberos support
Co-authored-by: Peter Kokot <peterkokot@gmail.com>
2024-03-23 15:12:06 +00:00
Nikita Popov
67184f5445 Fix PdoSqlite::loadExtension() test (#13736)
The test contained a syntax error and an incorrect use of loadExtension(), which returns void not bool.

Also install the necessary package in CI, so it gets tested there.
2024-03-17 22:27:09 +01:00
Máté Kocsis
577db99462 Verify stub aliases in CI (#13682)
In the same time, let's not verify implementation aliases since they may now legitimately differ from their aliased function/method counterparts (think about the ext/dom refactoring where e.g. many return type declarations have changed). Additionally, unnecessary `@no-verify` tags are cleaned up.
2024-03-13 23:32:35 +01:00
Shivam Mathur
edbef3e4ac Merge branch 'PHP-8.3'
* PHP-8.3:
Fix brew action (#13659)
We patch brew to ensure it overwrites files while linking the dependencies
2024-03-10 20:23:15 +05:30