Skip to content

Commit 5acfa1d

Browse files
authored
Merge branch 'master' into phar-3
2 parents 5c54810 + 6031497 commit 5acfa1d

File tree

1,365 files changed

+64042
-45200
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,365 files changed

+64042
-45200
lines changed

.github/CODEOWNERS

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -16,19 +16,19 @@
1616

1717
/.github @TimWolla
1818
/build/gen_stub.php @kocsismate
19-
/ext/bcmath @ndossche @SakiTakamachi
19+
/ext/bcmath @SakiTakamachi
2020
/ext/curl @adoy
2121
/ext/date @derickr
2222
/ext/dba @Girgias
23-
/ext/dom @ndossche
23+
/ext/dom @devnexen
2424
/ext/ffi @dstogov
2525
/ext/gd @devnexen
2626
/ext/gettext @devnexen
2727
/ext/gmp @Girgias
2828
/ext/intl @devnexen
29+
/ext/libxml @devnexen
2930
/ext/json @bukka
30-
/ext/lexbor @kocsismate @ndossche
31-
/ext/libxml @ndossche
31+
/ext/lexbor @kocsismate
3232
/ext/mbstring @alexdowad @youkidearitai
3333
/ext/mysqli @bukka @kamil-tekiela
3434
/ext/mysqlnd @bukka @kamil-tekiela @SakiTakamachi
@@ -47,17 +47,16 @@
4747
/ext/random @TimWolla @zeriyoshi
4848
/ext/reflection @DanielEScherzer
4949
/ext/session @Girgias
50-
/ext/simplexml @ndossche
51-
/ext/soap @ndossche
50+
/ext/simplexml @devnexen
51+
/ext/soap @devnexen
5252
/ext/sockets @devnexen
5353
/ext/spl @Girgias
5454
/ext/standard @bukka
55-
/ext/tidy @ndossche
5655
/ext/uri @kocsismate @TimWolla
57-
/ext/xml @ndossche
58-
/ext/xmlreader @ndossche
59-
/ext/xmlwriter @ndossche
60-
/ext/xsl @ndossche
56+
/ext/xml @devnexen
57+
/ext/xmlreader @devnexen
58+
/ext/xmlwriter @devnexen
59+
/ext/xsl @devnexen
6160
/main @bukka
6261
/sapi/fpm @bukka
6362
/Zend/Optimizer @dstogov

.github/ISSUE_TEMPLATE/bug_report.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,10 @@ body:
3131
Please make sure that the used PHP version [is a supported version](https://www.php.net/supported-versions.php).
3232
placeholder: |
3333
PHP 8.5.2 (cli) (built: Jan 21 2026 17:35:28) (NTS)
34-
Copyright (c) The PHP Group
34+
Copyright © The PHP Group and Contributors
3535
Built by Ubuntu
36-
Zend Engine v4.5.2, Copyright (c) Zend Technologies
37-
with Zend OPcache v8.5.2, Copyright (c), by Zend Technologies
36+
Zend Engine v4.5.2, Copyright © Zend by Perforce
37+
with Zend OPcache v8.5.2, Copyright ©, Zend by Perforce
3838
render: plain
3939
validations:
4040
required: true

CODING_STANDARDS.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,16 @@ rewritten to comply with these rules.
7979
return value for functions that perform some operation that may
8080
succeed or fail.
8181

82+
1. When throwing a `ValueError` or emitting a warning, use consistent
83+
phrasing for error messages. Common patterns are:
84+
85+
* Type errors: `must be of type int` (use the type name, not e.g. `must be an integer`)
86+
* Range/boundary: `must be between X and Y` / `must be greater than [or equal to] X` / `must be less than X` / `must be finite`
87+
* String constraints: `must not contain any null bytes` / `must not be empty` / `must be a single character`
88+
* Valid value: `must be a valid X` (e.g. `must be a valid encoding`, `must be a valid calendar ID`)
89+
* Enum-like: `must be one of X, Y, or Z`
90+
* Structural: `must have X` / `must have key X` / `must have N elements`
91+
8292
## User functions/methods naming conventions
8393

8494
1. Function names for user-level functions should be enclosed with in the

CONTRIBUTING.md

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ implement RFCs. Please be sure to include tests as appropriate!
3737
By submitting a pull request, you certify that you have the necessary rights
3838
to submit the work, that the work does not violate any third-party rights
3939
(including those of your employer, if applicable), and that you license your
40-
contribution under the PHP License or under another license if explicitly
41-
accepted by the PHP project maintainers.
40+
contribution under the [Modified BSD License](LICENSE) or under another license
41+
if explicitly accepted by the PHP project maintainers.
4242

4343
If you are fixing a bug, then please submit your PR against the lowest actively
4444
supported branch of PHP that the bug affects (only green branches on
@@ -439,15 +439,13 @@ New source code files should include the following header block:
439439
```c
440440
/*
441441
+----------------------------------------------------------------------+
442-
| Copyright (c) The PHP Group |
442+
| Copyright © The PHP Group and Contributors. |
443443
+----------------------------------------------------------------------+
444-
| This source file is subject to version 3.01 of the PHP license, |
445-
| that is bundled with this package in the file LICENSE, and is |
446-
| available through the world-wide-web at the following url: |
447-
| https://www.php.net/license/3_01.txt |
448-
| If you did not receive a copy of the PHP license and are unable to |
449-
| obtain it through the world-wide-web, please send a note to |
450-
| license@php.net so we can mail you a copy immediately. |
444+
| This source file is subject to the Modified BSD License that is |
445+
| bundled with this package in the file LICENSE, and is available |
446+
| through the World Wide Web at <https://www.php.net/license/>. |
447+
| |
448+
| SPDX-License-Identifier: BSD-3-Clause |
451449
+----------------------------------------------------------------------+
452450
| Author: |
453451
+----------------------------------------------------------------------+

EXTENSIONS

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -171,28 +171,28 @@ PRIMARY MAINTAINER: Christian Stocker <chregu@php.net> (2003 - 2011)
171171
Rob Richards <rrichards@php.net> (2003 - 2012)
172172
Marcus Börger <helly@php.net> (2003 - 2006)
173173
Nora Dossche <nielsdos@php.net> (2023 - 2026)
174-
MAINTENANCE: Odd fixes
174+
MAINTENANCE: Orphan
175175
STATUS: Working
176176
SINCE: 5.0
177177
-------------------------------------------------------------------------------
178178
EXTENSION: simplexml
179179
PRIMARY MAINTAINER: Marcus Börger <helly@php.net> (2003 - 2008)
180180
Nora Dossche <nielsdos@php.net> (2023 - 2026)
181-
MAINTENANCE: Odd fixes
181+
MAINTENANCE: Orphan
182182
STATUS: Working
183183
SINCE: 5.0
184184
-------------------------------------------------------------------------------
185185
EXTENSION: soap
186186
PRIMARY MAINTAINER: Dmitry Stogov <dmitry@php.net> (2004 - 2018)
187187
Nora Dossche <nielsdos@php.net> (2024 - 2026)
188-
MAINTENANCE: Odd fixes
188+
MAINTENANCE: Orphan
189189
STATUS: Working
190190
-------------------------------------------------------------------------------
191191
EXTENSION: xml
192192
PRIMARY MAINTAINER: Thies C. Arntzen <thies@thieso.net> (1999 - 2002)
193193
Rob Richards <rrichards@php.net> (2003 - 2013)
194194
Nora Dossche <nielsdos@php.net> (2023 - 2026)
195-
MAINTENANCE: Odd fixes
195+
MAINTENANCE: Orphan
196196
STATUS: Working
197197
-------------------------------------------------------------------------------
198198
EXTENSION: lexbor
@@ -206,28 +206,28 @@ EXTENSION: libxml
206206
PRIMARY MAINTAINER: Rob Richards <rrichards@php.net> (2003 - 2009)
207207
Christian Stocker <chregu@php.net> (2004 - 2011)
208208
Nora Dossche <nielsdos@php.net> (2023 - 2026)
209-
MAINTENANCE: Odd fixes
209+
MAINTENANCE: Orphan
210210
STATUS: Working
211211
-------------------------------------------------------------------------------
212212
EXTENSION: xmlreader
213213
PRIMARY MAINTAINER: Rob Richards <rrichards@php.net> (2004 - 2010)
214214
Christian Stocker <chregu@php.net> (2004 - 2004)
215215
Nora Dossche <nielsdos@php.net> (2023 - 2026)
216-
MAINTENANCE: Odd fixes
216+
MAINTENANCE: Orphan
217217
STATUS: Working
218218
-------------------------------------------------------------------------------
219219
EXTENSION: xmlwriter
220220
PRIMARY MAINTAINER: Rob Richards <rrichards@php.net> (2004 - 2010)
221221
Pierre-Alain Joye <pajoye@php.net> (2005-2009)
222222
Nora Dossche <nielsdos@php.net> (2023 - 2026)
223-
MAINTENANCE: Odd fixes
223+
MAINTENANCE: Orphan
224224
STATUS: Working
225225
-------------------------------------------------------------------------------
226226
EXTENSION: xsl
227227
PRIMARY MAINTAINER: Christian Stocker <chregu@php.net> (2003 - 2011)
228228
Rob Richards <rrichards@php.net> (2003 - 2010)
229229
Nora Dossche <nielsdos@php.net> (2023 - 2026)
230-
MAINTENANCE: Odd fixes
230+
MAINTENANCE: Orphan
231231
STATUS: Working
232232
SINCE: 5.0
233233
-------------------------------------------------------------------------------
@@ -496,7 +496,7 @@ PRIMARY MAINTAINER: John Coggeshall <john@php.net> (2003 - 2006)
496496
Ilia Alshanetsky <iliaa@php.net> (2003 - 2009)
497497
Nuno Lopes <nlopess@php.net> (2006 - 2012)
498498
Nora Dossche <nielsdos@php.net> (2025 - 2026)
499-
MAINTENANCE: Odd fixes
499+
MAINTENANCE: Orphan
500500
STATUS: Working
501501
-------------------------------------------------------------------------------
502502
EXTENSION: tokenizer

LICENSE

Lines changed: 25 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -1,68 +1,27 @@
1-
--------------------------------------------------------------------
2-
The PHP License, version 3.01
3-
Copyright (c) 1999 - 2026 The PHP Group. All rights reserved.
4-
--------------------------------------------------------------------
1+
Copyright © 1999–2026, The PHP Group and Contributors.
2+
Copyright © 1999–2026, Zend Technologies Ltd., a subsidiary company of Perforce Software, Inc.
53

64
Redistribution and use in source and binary forms, with or without
7-
modification, is permitted provided that the following conditions
8-
are met:
9-
10-
1. Redistributions of source code must retain the above copyright
11-
notice, this list of conditions and the following disclaimer.
12-
13-
2. Redistributions in binary form must reproduce the above copyright
14-
notice, this list of conditions and the following disclaimer in
15-
the documentation and/or other materials provided with the
16-
distribution.
17-
18-
3. The name "PHP" must not be used to endorse or promote products
19-
derived from this software without prior written permission. For
20-
written permission, please contact group@php.net.
21-
22-
4. Products derived from this software may not be called "PHP", nor
23-
may "PHP" appear in their name, without prior written permission
24-
from group@php.net. You may indicate that your software works in
25-
conjunction with PHP by saying "Foo for PHP" instead of calling
26-
it "PHP Foo" or "phpfoo"
27-
28-
5. The PHP Group may publish revised and/or new versions of the
29-
license from time to time. Each version will be given a
30-
distinguishing version number.
31-
Once covered code has been published under a particular version
32-
of the license, you may always continue to use it under the terms
33-
of that version. You may also choose to use such covered code
34-
under the terms of any subsequent version of the license
35-
published by the PHP Group. No one other than the PHP Group has
36-
the right to modify the terms applicable to covered code created
37-
under this License.
38-
39-
6. Redistributions of any form whatsoever must retain the following
40-
acknowledgment:
41-
"This product includes PHP software, freely available from
42-
<http://www.php.net/software/>".
43-
44-
THIS SOFTWARE IS PROVIDED BY THE PHP DEVELOPMENT TEAM ``AS IS'' AND
45-
ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
46-
THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
47-
PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE PHP
48-
DEVELOPMENT TEAM OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
49-
INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
50-
(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
51-
SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
52-
HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
53-
STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
54-
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
55-
OF THE POSSIBILITY OF SUCH DAMAGE.
56-
57-
--------------------------------------------------------------------
58-
59-
This software consists of voluntary contributions made by many
60-
individuals on behalf of the PHP Group.
61-
62-
The PHP Group can be contacted via Email at group@php.net.
63-
64-
For more information on the PHP Group and the PHP project,
65-
please see <http://www.php.net>.
66-
67-
PHP includes the Zend Engine, freely available at
68-
<http://www.zend.com>.
5+
modification, are permitted provided that the following conditions are met:
6+
7+
1. Redistributions of source code must retain the above copyright notice, this
8+
list of conditions and the following disclaimer.
9+
10+
2. Redistributions in binary form must reproduce the above copyright notice,
11+
this list of conditions and the following disclaimer in the documentation
12+
and/or other materials provided with the distribution.
13+
14+
3. Neither the name of the copyright holder nor the names of its
15+
contributors may be used to endorse or promote products derived from
16+
this software without specific prior written permission.
17+
18+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
19+
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
20+
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
21+
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
22+
FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
23+
DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
24+
SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
25+
CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
26+
OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
27+
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

NEWS

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -133,6 +133,8 @@ PHP NEWS
133133
- SPL:
134134
. DirectoryIterator key can now work better with filesystem supporting larger
135135
directory indexing. (David Carlier)
136+
. Fix bugs GH-8561, GH-8562, GH-8563, and GH-8564 (Fixing various
137+
SplFileObject iterator desync bugs). (iliaal)
136138

137139
- Sqlite3:
138140
. Fix NUL byte truncation in sqlite3 TEXT column handling. (ndossche)

README.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,10 @@
1111

1212
PHP is a popular general-purpose scripting language that is especially suited to
1313
web development. Fast, flexible and pragmatic, PHP powers everything from your
14-
blog to the most popular websites in the world. PHP is distributed under the
15-
[PHP License v3.01](LICENSE).
14+
blog to the most popular websites in the world.
15+
16+
PHP is distributed under the [Modified BSD License](LICENSE)
17+
(SPDX-License-Identifier: `BSD-3-Clause`).
1618

1719
[![Test](https://github.com/php/php-src/actions/workflows/test.yml/badge.svg)](https://github.com/php/php-src/actions/workflows/test.yml)
1820
[![Fuzzing Status](https://oss-fuzz-build-logs.storage.googleapis.com/badges/php.svg)](https://issues.oss-fuzz.com/issues?q=project:php)

TSRM/tsrm_win32.c

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,12 @@
11
/*
22
+----------------------------------------------------------------------+
3-
| Copyright (c) The PHP Group |
3+
| Copyright © The PHP Group and Contributors. |
44
+----------------------------------------------------------------------+
5-
| This source file is subject to version 3.01 of the PHP license, |
6-
| that is bundled with this package in the file LICENSE, and is |
7-
| available through the world-wide-web at the following url: |
8-
| https://www.php.net/license/3_01.txt |
9-
| If you did not receive a copy of the PHP license and are unable to |
10-
| obtain it through the world-wide-web, please send a note to |
11-
| license@php.net so we can mail you a copy immediately. |
5+
| This source file is subject to the Modified BSD License that is |
6+
| bundled with this package in the file LICENSE, and is available |
7+
| through the World Wide Web at <https://www.php.net/license/>. |
8+
| |
9+
| SPDX-License-Identifier: BSD-3-Clause |
1210
+----------------------------------------------------------------------+
1311
| Authors: Daniel Beulshausen <daniel@php4win.de> |
1412
+----------------------------------------------------------------------+

TSRM/tsrm_win32.h

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,12 @@
11
/*
22
+----------------------------------------------------------------------+
3-
| Copyright (c) The PHP Group |
3+
| Copyright © The PHP Group and Contributors. |
44
+----------------------------------------------------------------------+
5-
| This source file is subject to version 3.01 of the PHP license, |
6-
| that is bundled with this package in the file LICENSE, and is |
7-
| available through the world-wide-web at the following url: |
8-
| https://www.php.net/license/3_01.txt |
9-
| If you did not receive a copy of the PHP license and are unable to |
10-
| obtain it through the world-wide-web, please send a note to |
11-
| license@php.net so we can mail you a copy immediately. |
5+
| This source file is subject to the Modified BSD License that is |
6+
| bundled with this package in the file LICENSE, and is available |
7+
| through the World Wide Web at <https://www.php.net/license/>. |
8+
| |
9+
| SPDX-License-Identifier: BSD-3-Clause |
1210
+----------------------------------------------------------------------+
1311
| Authors: Daniel Beulshausen <daniel@php4win.de> |
1412
+----------------------------------------------------------------------+

0 commit comments

Comments
 (0)