Commit a61c38a70b4 for php.net
commit a61c38a70b45d93fefdd8224eff067f8f4a36170
Merge: 5cd9a3b0475 cf9bb87ec24
Author: ndossche <7771979+ndossche@users.noreply.github.com>
Date: Thu Jun 25 08:31:59 2026 +0200
Merge branch 'PHP-8.5'
* PHP-8.5:
[ci skip] Update heading
soap: do not overwrite the parsed host on a protocol-relative redirect
diff --cc ext/bcmath/libbcmath/src/convert.c
index b6003e58682,601aa5613a2..772223220ef
--- a/ext/bcmath/libbcmath/src/convert.c
+++ b/ext/bcmath/libbcmath/src/convert.c
@@@ -1,14 -1,16 +1,14 @@@
/*
+----------------------------------------------------------------------+
- | Copyright (c) The PHP Group |
+ | Copyright © The PHP Group and Contributors. |
+----------------------------------------------------------------------+
- | This source file is subject to version 3.01 of the PHP license, |
- | that is bundled with this package in the file LICENSE, and is |
- | available through the world-wide-web at the following url: |
- | https://www.php.net/license/3_01.txt |
- | If you did not receive a copy of the PHP license and are unable to |
- | obtain it through the world-wide-web, please send a note to |
- | license@php.net so we can mail you a copy immediately. |
+ | This source file is subject to the Modified BSD License that is |
+ | bundled with this package in the file LICENSE, and is available |
+ | through the World Wide Web at <https://www.php.net/license/>. |
+ | |
+ | SPDX-License-Identifier: BSD-3-Clause |
+----------------------------------------------------------------------+
- | Authors: Niels Dossche <nielsdos@php.net> |
+ | Authors: Nora Dossche <ndossche@php.net> |
+----------------------------------------------------------------------+
*/
diff --cc ext/bcmath/libbcmath/src/convert.h
index 69ff63b48e0,f148f48227c..15af4216f85
--- a/ext/bcmath/libbcmath/src/convert.h
+++ b/ext/bcmath/libbcmath/src/convert.h
@@@ -1,14 -1,16 +1,14 @@@
/*
+----------------------------------------------------------------------+
- | Copyright (c) The PHP Group |
+ | Copyright © The PHP Group and Contributors. |
+----------------------------------------------------------------------+
- | This source file is subject to version 3.01 of the PHP license, |
- | that is bundled with this package in the file LICENSE, and is |
- | available through the world-wide-web at the following url: |
- | https://www.php.net/license/3_01.txt |
- | If you did not receive a copy of the PHP license and are unable to |
- | obtain it through the world-wide-web, please send a note to |
- | license@php.net so we can mail you a copy immediately. |
+ | This source file is subject to the Modified BSD License that is |
+ | bundled with this package in the file LICENSE, and is available |
+ | through the World Wide Web at <https://www.php.net/license/>. |
+ | |
+ | SPDX-License-Identifier: BSD-3-Clause |
+----------------------------------------------------------------------+
- | Authors: Niels Dossche <nielsdos@php.net> |
+ | Authors: Nora Dossche <ndossche@php.net> |
+----------------------------------------------------------------------+
*/
diff --cc ext/dom/html5_parser.c
index 583de89ecc4,34320a122f5..667db5acb07
--- a/ext/dom/html5_parser.c
+++ b/ext/dom/html5_parser.c
@@@ -1,14 -1,16 +1,14 @@@
/*
+----------------------------------------------------------------------+
- | Copyright (c) The PHP Group |
+ | Copyright © The PHP Group and Contributors. |
+----------------------------------------------------------------------+
- | This source file is subject to version 3.01 of the PHP license, |
- | that is bundled with this package in the file LICENSE, and is |
- | available through the world-wide-web at the following url: |
- | https://www.php.net/license/3_01.txt |
- | If you did not receive a copy of the PHP license and are unable to |
- | obtain it through the world-wide-web, please send a note to |
- | license@php.net so we can mail you a copy immediately. |
+ | This source file is subject to the Modified BSD License that is |
+ | bundled with this package in the file LICENSE, and is available |
+ | through the World Wide Web at <https://www.php.net/license/>. |
+ | |
+ | SPDX-License-Identifier: BSD-3-Clause |
+----------------------------------------------------------------------+
- | Authors: Niels Dossche <nielsdos@php.net> |
+ | Authors: Nora Dossche <ndossche@php.net> |
+----------------------------------------------------------------------+
*/
diff --cc ext/dom/html5_parser.h
index 43f7cf4f84c,76e60ea8c67..6824052957a
--- a/ext/dom/html5_parser.h
+++ b/ext/dom/html5_parser.h
@@@ -1,14 -1,16 +1,14 @@@
/*
+----------------------------------------------------------------------+
- | Copyright (c) The PHP Group |
+ | Copyright © The PHP Group and Contributors. |
+----------------------------------------------------------------------+
- | This source file is subject to version 3.01 of the PHP license, |
- | that is bundled with this package in the file LICENSE, and is |
- | available through the world-wide-web at the following url: |
- | https://www.php.net/license/3_01.txt |
- | If you did not receive a copy of the PHP license and are unable to |
- | obtain it through the world-wide-web, please send a note to |
- | license@php.net so we can mail you a copy immediately. |
+ | This source file is subject to the Modified BSD License that is |
+ | bundled with this package in the file LICENSE, and is available |
+ | through the World Wide Web at <https://www.php.net/license/>. |
+ | |
+ | SPDX-License-Identifier: BSD-3-Clause |
+----------------------------------------------------------------------+
- | Authors: Niels Dossche <nielsdos@php.net> |
+ | Authors: Nora Dossche <ndossche@php.net> |
+----------------------------------------------------------------------+
*/
diff --cc ext/dom/html5_serializer.c
index ad3e24e0082,fc1202ef0e0..2276a53f14f
--- a/ext/dom/html5_serializer.c
+++ b/ext/dom/html5_serializer.c
@@@ -1,14 -1,16 +1,14 @@@
/*
+----------------------------------------------------------------------+
- | Copyright (c) The PHP Group |
+ | Copyright © The PHP Group and Contributors. |
+----------------------------------------------------------------------+
- | This source file is subject to version 3.01 of the PHP license, |
- | that is bundled with this package in the file LICENSE, and is |
- | available through the world-wide-web at the following url: |
- | https://www.php.net/license/3_01.txt |
- | If you did not receive a copy of the PHP license and are unable to |
- | obtain it through the world-wide-web, please send a note to |
- | license@php.net so we can mail you a copy immediately. |
+ | This source file is subject to the Modified BSD License that is |
+ | bundled with this package in the file LICENSE, and is available |
+ | through the World Wide Web at <https://www.php.net/license/>. |
+ | |
+ | SPDX-License-Identifier: BSD-3-Clause |
+----------------------------------------------------------------------+
- | Authors: Niels Dossche <nielsdos@php.net> |
+ | Authors: Nora Dossche <ndossche@php.net> |
+----------------------------------------------------------------------+
*/
diff --cc ext/dom/html5_serializer.h
index e4ae67861ee,c05d7d02a37..aeffa67af02
--- a/ext/dom/html5_serializer.h
+++ b/ext/dom/html5_serializer.h
@@@ -1,14 -1,16 +1,14 @@@
/*
+----------------------------------------------------------------------+
- | Copyright (c) The PHP Group |
+ | Copyright © The PHP Group and Contributors. |
+----------------------------------------------------------------------+
- | This source file is subject to version 3.01 of the PHP license, |
- | that is bundled with this package in the file LICENSE, and is |
- | available through the world-wide-web at the following url: |
- | https://www.php.net/license/3_01.txt |
- | If you did not receive a copy of the PHP license and are unable to |
- | obtain it through the world-wide-web, please send a note to |
- | license@php.net so we can mail you a copy immediately. |
+ | This source file is subject to the Modified BSD License that is |
+ | bundled with this package in the file LICENSE, and is available |
+ | through the World Wide Web at <https://www.php.net/license/>. |
+ | |
+ | SPDX-License-Identifier: BSD-3-Clause |
+----------------------------------------------------------------------+
- | Authors: Niels Dossche <nielsdos@php.net> |
+ | Authors: Nora Dossche <ndossche@php.net> |
+----------------------------------------------------------------------+
*/
diff --cc ext/dom/html_collection.c
index 0a24d4909cf,2f156de2532..2aed253ab8d
--- a/ext/dom/html_collection.c
+++ b/ext/dom/html_collection.c
@@@ -1,14 -1,16 +1,14 @@@
/*
+----------------------------------------------------------------------+
- | Copyright (c) The PHP Group |
+ | Copyright © The PHP Group and Contributors. |
+----------------------------------------------------------------------+
- | This source file is subject to version 3.01 of the PHP license, |
- | that is bundled with this package in the file LICENSE, and is |
- | available through the world-wide-web at the following url: |
- | https://www.php.net/license/3_01.txt |
- | If you did not receive a copy of the PHP license and are unable to |
- | obtain it through the world-wide-web, please send a note to |
- | license@php.net so we can mail you a copy immediately. |
+ | This source file is subject to the Modified BSD License that is |
+ | bundled with this package in the file LICENSE, and is available |
+ | through the World Wide Web at <https://www.php.net/license/>. |
+ | |
+ | SPDX-License-Identifier: BSD-3-Clause |
+----------------------------------------------------------------------+
- | Authors: Niels Dossche <nielsdos@php.net> |
+ | Authors: Nora Dossche <ndossche@php.net> |
+----------------------------------------------------------------------+
*/
diff --cc ext/dom/html_collection.h
index f7e8effc16e,363381046f0..5f9f5948873
--- a/ext/dom/html_collection.h
+++ b/ext/dom/html_collection.h
@@@ -1,14 -1,16 +1,14 @@@
/*
+----------------------------------------------------------------------+
- | Copyright (c) The PHP Group |
+ | Copyright © The PHP Group and Contributors. |
+----------------------------------------------------------------------+
- | This source file is subject to version 3.01 of the PHP license, |
- | that is bundled with this package in the file LICENSE, and is |
- | available through the world-wide-web at the following url: |
- | https://www.php.net/license/3_01.txt |
- | If you did not receive a copy of the PHP license and are unable to |
- | obtain it through the world-wide-web, please send a note to |
- | license@php.net so we can mail you a copy immediately. |
+ | This source file is subject to the Modified BSD License that is |
+ | bundled with this package in the file LICENSE, and is available |
+ | through the World Wide Web at <https://www.php.net/license/>. |
+ | |
+ | SPDX-License-Identifier: BSD-3-Clause |
+----------------------------------------------------------------------+
- | Authors: Niels Dossche <nielsdos@php.net> |
+ | Authors: Nora Dossche <ndossche@php.net> |
+----------------------------------------------------------------------+
*/
diff --cc ext/dom/html_document.c
index 58f07e079dd,0f642e81b7a..ddf8f3f66f8
--- a/ext/dom/html_document.c
+++ b/ext/dom/html_document.c
@@@ -1,14 -1,16 +1,14 @@@
/*
+----------------------------------------------------------------------+
- | Copyright (c) The PHP Group |
+ | Copyright © The PHP Group and Contributors. |
+----------------------------------------------------------------------+
- | This source file is subject to version 3.01 of the PHP license, |
- | that is bundled with this package in the file LICENSE, and is |
- | available through the world-wide-web at the following url: |
- | https://www.php.net/license/3_01.txt |
- | If you did not receive a copy of the PHP license and are unable to |
- | obtain it through the world-wide-web, please send a note to |
- | license@php.net so we can mail you a copy immediately. |
+ | This source file is subject to the Modified BSD License that is |
+ | bundled with this package in the file LICENSE, and is available |
+ | through the World Wide Web at <https://www.php.net/license/>. |
+ | |
+ | SPDX-License-Identifier: BSD-3-Clause |
+----------------------------------------------------------------------+
- | Authors: Niels Dossche <nielsdos@php.net> |
+ | Authors: Nora Dossche <ndossche@php.net> |
+----------------------------------------------------------------------+
*/
diff --cc ext/dom/infra.c
index 33026d8a752,76d585cf18b..fe7dd97de40
--- a/ext/dom/infra.c
+++ b/ext/dom/infra.c
@@@ -1,14 -1,16 +1,14 @@@
/*
+----------------------------------------------------------------------+
- | Copyright (c) The PHP Group |
+ | Copyright © The PHP Group and Contributors. |
+----------------------------------------------------------------------+
- | This source file is subject to version 3.01 of the PHP license, |
- | that is bundled with this package in the file LICENSE, and is |
- | available through the world-wide-web at the following url: |
- | https://www.php.net/license/3_01.txt |
- | If you did not receive a copy of the PHP license and are unable to |
- | obtain it through the world-wide-web, please send a note to |
- | license@php.net so we can mail you a copy immediately. |
+ | This source file is subject to the Modified BSD License that is |
+ | bundled with this package in the file LICENSE, and is available |
+ | through the World Wide Web at <https://www.php.net/license/>. |
+ | |
+ | SPDX-License-Identifier: BSD-3-Clause |
+----------------------------------------------------------------------+
- | Authors: Niels Dossche <nielsdos@php.net> |
+ | Authors: Nora Dossche <ndossche@php.net> |
+----------------------------------------------------------------------+
*/
diff --cc ext/dom/infra.h
index 4cf8ad26c78,59700ce1012..890654bcd1c
--- a/ext/dom/infra.h
+++ b/ext/dom/infra.h
@@@ -1,14 -1,16 +1,14 @@@
/*
+----------------------------------------------------------------------+
- | Copyright (c) The PHP Group |
+ | Copyright © The PHP Group and Contributors. |
+----------------------------------------------------------------------+
- | This source file is subject to version 3.01 of the PHP license, |
- | that is bundled with this package in the file LICENSE, and is |
- | available through the world-wide-web at the following url: |
- | https://www.php.net/license/3_01.txt |
- | If you did not receive a copy of the PHP license and are unable to |
- | obtain it through the world-wide-web, please send a note to |
- | license@php.net so we can mail you a copy immediately. |
+ | This source file is subject to the Modified BSD License that is |
+ | bundled with this package in the file LICENSE, and is available |
+ | through the World Wide Web at <https://www.php.net/license/>. |
+ | |
+ | SPDX-License-Identifier: BSD-3-Clause |
+----------------------------------------------------------------------+
- | Authors: Niels Dossche <nielsdos@php.net> |
+ | Authors: Nora Dossche <ndossche@php.net> |
+----------------------------------------------------------------------+
*/
diff --cc ext/dom/inner_outer_html_mixin.c
index e1bf226d860,e337d5fd3b0..0e40f8b07a3
--- a/ext/dom/inner_outer_html_mixin.c
+++ b/ext/dom/inner_outer_html_mixin.c
@@@ -1,14 -1,16 +1,14 @@@
/*
+----------------------------------------------------------------------+
- | Copyright (c) The PHP Group |
+ | Copyright © The PHP Group and Contributors. |
+----------------------------------------------------------------------+
- | This source file is subject to version 3.01 of the PHP license, |
- | that is bundled with this package in the file LICENSE, and is |
- | available through the world-wide-web at the following url: |
- | https://www.php.net/license/3_01.txt |
- | If you did not receive a copy of the PHP license and are unable to |
- | obtain it through the world-wide-web, please send a note to |
- | license@php.net so we can mail you a copy immediately. |
+ | This source file is subject to the Modified BSD License that is |
+ | bundled with this package in the file LICENSE, and is available |
+ | through the World Wide Web at <https://www.php.net/license/>. |
+ | |
+ | SPDX-License-Identifier: BSD-3-Clause |
+----------------------------------------------------------------------+
- | Authors: Niels Dossche <nielsdos@php.net> |
+ | Authors: Nora Dossche <ndossche@php.net> |
+----------------------------------------------------------------------+
*/
diff --cc ext/dom/internal_helpers.h
index 725c8222f42,c741b2fbeda..f64ac57fc09
--- a/ext/dom/internal_helpers.h
+++ b/ext/dom/internal_helpers.h
@@@ -1,14 -1,16 +1,14 @@@
/*
+----------------------------------------------------------------------+
- | Copyright (c) The PHP Group |
- +----------------------------------------------------------------------+
- | This source file is subject to version 3.01 of the PHP license, |
- | that is bundled with this package in the file LICENSE, and is |
- | available through the world-wide-web at the following url: |
- | https://www.php.net/license/3_01.txt |
- | If you did not receive a copy of the PHP license and are unable to |
- | obtain it through the world-wide-web, please send a note to |
- | license@php.net so we can mail you a copy immediately. |
+ | Copyright © The PHP Group and Contributors. |
+ +----------------------------------------------------------------------+
+ | This source file is subject to the Modified BSD License that is |
+ | bundled with this package in the file LICENSE, and is available |
+ | through the World Wide Web at <https://www.php.net/license/>. |
+ | |
+ | SPDX-License-Identifier: BSD-3-Clause |
+----------------------------------------------------------------------+
- | Authors: Niels Dossche <nielsdos@php.net> |
+ | Authors: Nora Dossche <ndossche@php.net> |
+----------------------------------------------------------------------+
*/
diff --cc ext/dom/namespace_compat.c
index 420759b369e,d453f17848a..1815b2dd441
--- a/ext/dom/namespace_compat.c
+++ b/ext/dom/namespace_compat.c
@@@ -1,14 -1,16 +1,14 @@@
/*
+----------------------------------------------------------------------+
- | Copyright (c) The PHP Group |
+ | Copyright © The PHP Group and Contributors. |
+----------------------------------------------------------------------+
- | This source file is subject to version 3.01 of the PHP license, |
- | that is bundled with this package in the file LICENSE, and is |
- | available through the world-wide-web at the following url: |
- | https://www.php.net/license/3_01.txt |
- | If you did not receive a copy of the PHP license and are unable to |
- | obtain it through the world-wide-web, please send a note to |
- | license@php.net so we can mail you a copy immediately. |
+ | This source file is subject to the Modified BSD License that is |
+ | bundled with this package in the file LICENSE, and is available |
+ | through the World Wide Web at <https://www.php.net/license/>. |
+ | |
+ | SPDX-License-Identifier: BSD-3-Clause |
+----------------------------------------------------------------------+
- | Authors: Niels Dossche <nielsdos@php.net> |
+ | Authors: Nora Dossche <ndossche@php.net> |
+----------------------------------------------------------------------+
*/
diff --cc ext/dom/namespace_compat.h
index dc66021e5ec,55efca381a1..dac7de88353
--- a/ext/dom/namespace_compat.h
+++ b/ext/dom/namespace_compat.h
@@@ -1,14 -1,16 +1,14 @@@
/*
+----------------------------------------------------------------------+
- | Copyright (c) The PHP Group |
+ | Copyright © The PHP Group and Contributors. |
+----------------------------------------------------------------------+
- | This source file is subject to version 3.01 of the PHP license, |
- | that is bundled with this package in the file LICENSE, and is |
- | available through the world-wide-web at the following url: |
- | https://www.php.net/license/3_01.txt |
- | If you did not receive a copy of the PHP license and are unable to |
- | obtain it through the world-wide-web, please send a note to |
- | license@php.net so we can mail you a copy immediately. |
+ | This source file is subject to the Modified BSD License that is |
+ | bundled with this package in the file LICENSE, and is available |
+ | through the World Wide Web at <https://www.php.net/license/>. |
+ | |
+ | SPDX-License-Identifier: BSD-3-Clause |
+----------------------------------------------------------------------+
- | Authors: Niels Dossche <nielsdos@php.net> |
+ | Authors: Nora Dossche <ndossche@php.net> |
+----------------------------------------------------------------------+
*/
diff --cc ext/dom/nodelist.h
index 084ce33b549,7cdfedd3f73..3e60c4daa02
--- a/ext/dom/nodelist.h
+++ b/ext/dom/nodelist.h
@@@ -1,14 -1,16 +1,14 @@@
/*
+----------------------------------------------------------------------+
- | Copyright (c) The PHP Group |
+ | Copyright © The PHP Group and Contributors. |
+----------------------------------------------------------------------+
- | This source file is subject to version 3.01 of the PHP license, |
- | that is bundled with this package in the file LICENSE, and is |
- | available through the world-wide-web at the following url: |
- | https://www.php.net/license/3_01.txt |
- | If you did not receive a copy of the PHP license and are unable to |
- | obtain it through the world-wide-web, please send a note to |
- | license@php.net so we can mail you a copy immediately. |
+ | This source file is subject to the Modified BSD License that is |
+ | bundled with this package in the file LICENSE, and is available |
+ | through the World Wide Web at <https://www.php.net/license/>. |
+ | |
+ | SPDX-License-Identifier: BSD-3-Clause |
+----------------------------------------------------------------------+
- | Authors: Niels Dossche <nielsdos@php.net> |
+ | Authors: Nora Dossche <ndossche@php.net> |
+----------------------------------------------------------------------+
*/
diff --cc ext/dom/obj_map.h
index 1853cce354e,beed08bbb16..f6306fc4ab9
--- a/ext/dom/obj_map.h
+++ b/ext/dom/obj_map.h
@@@ -1,14 -1,16 +1,14 @@@
/*
+----------------------------------------------------------------------+
- | Copyright (c) The PHP Group |
+ | Copyright © The PHP Group and Contributors. |
+----------------------------------------------------------------------+
- | This source file is subject to version 3.01 of the PHP license, |
- | that is bundled with this package in the file LICENSE, and is |
- | available through the world-wide-web at the following url: |
- | https://www.php.net/license/3_01.txt |
- | If you did not receive a copy of the PHP license and are unable to |
- | obtain it through the world-wide-web, please send a note to |
- | license@php.net so we can mail you a copy immediately. |
+ | This source file is subject to the Modified BSD License that is |
+ | bundled with this package in the file LICENSE, and is available |
+ | through the World Wide Web at <https://www.php.net/license/>. |
+ | |
+ | SPDX-License-Identifier: BSD-3-Clause |
+----------------------------------------------------------------------+
- | Authors: Niels Dossche <nielsdos@php.net> |
+ | Authors: Nora Dossche <ndossche@php.net> |
+----------------------------------------------------------------------+
*/
diff --cc ext/dom/parentnode/css_selectors.c
index 7254bd909a0,fd7f7b50c6a..0fc0cc1ef0f
--- a/ext/dom/parentnode/css_selectors.c
+++ b/ext/dom/parentnode/css_selectors.c
@@@ -1,14 -1,16 +1,14 @@@
/*
+----------------------------------------------------------------------+
- | Copyright (c) The PHP Group |
+ | Copyright © The PHP Group and Contributors. |
+----------------------------------------------------------------------+
- | This source file is subject to version 3.01 of the PHP license, |
- | that is bundled with this package in the file LICENSE, and is |
- | available through the world-wide-web at the following url: |
- | https://www.php.net/license/3_01.txt |
- | If you did not receive a copy of the PHP license and are unable to |
- | obtain it through the world-wide-web, please send a note to |
- | license@php.net so we can mail you a copy immediately. |
+ | This source file is subject to the Modified BSD License that is |
+ | bundled with this package in the file LICENSE, and is available |
+ | through the World Wide Web at <https://www.php.net/license/>. |
+ | |
+ | SPDX-License-Identifier: BSD-3-Clause |
+----------------------------------------------------------------------+
- | Authors: Niels Dossche <nielsdos@php.net> |
+ | Authors: Nora Dossche <ndossche@php.net> |
+----------------------------------------------------------------------+
*/
diff --cc ext/dom/parentnode/tree.c
index 696c42ba64f,17e09d6ad78..13a99023781
--- a/ext/dom/parentnode/tree.c
+++ b/ext/dom/parentnode/tree.c
@@@ -1,15 -1,17 +1,15 @@@
/*
+----------------------------------------------------------------------+
- | Copyright (c) The PHP Group |
+ | Copyright © The PHP Group and Contributors. |
+----------------------------------------------------------------------+
- | This source file is subject to version 3.01 of the PHP license, |
- | that is bundled with this package in the file LICENSE, and is |
- | available through the world-wide-web at the following url: |
- | https://www.php.net/license/3_01.txt |
- | If you did not receive a copy of the PHP license and are unable to |
- | obtain it through the world-wide-web, please send a note to |
- | license@php.net so we can mail you a copy immediately. |
+ | This source file is subject to the Modified BSD License that is |
+ | bundled with this package in the file LICENSE, and is available |
+ | through the World Wide Web at <https://www.php.net/license/>. |
+ | |
+ | SPDX-License-Identifier: BSD-3-Clause |
+----------------------------------------------------------------------+
| Authors: Benjamin Eberlei <beberlei@php.net> |
- | Niels Dossche <nielsdos@php.net> |
+ | Nora Dossche <ndossche@php.net> |
+----------------------------------------------------------------------+
*/
diff --cc ext/dom/private_data.c
index 373a79cbe71,66b3f4f87f2..dd624a2c2e9
--- a/ext/dom/private_data.c
+++ b/ext/dom/private_data.c
@@@ -1,14 -1,16 +1,14 @@@
/*
+----------------------------------------------------------------------+
- | Copyright (c) The PHP Group |
+ | Copyright © The PHP Group and Contributors. |
+----------------------------------------------------------------------+
- | This source file is subject to version 3.01 of the PHP license, |
- | that is bundled with this package in the file LICENSE, and is |
- | available through the world-wide-web at the following url: |
- | https://www.php.net/license/3_01.txt |
- | If you did not receive a copy of the PHP license and are unable to |
- | obtain it through the world-wide-web, please send a note to |
- | license@php.net so we can mail you a copy immediately. |
+ | This source file is subject to the Modified BSD License that is |
+ | bundled with this package in the file LICENSE, and is available |
+ | through the World Wide Web at <https://www.php.net/license/>. |
+ | |
+ | SPDX-License-Identifier: BSD-3-Clause |
+----------------------------------------------------------------------+
- | Authors: Niels Dossche <nielsdos@php.net> |
+ | Authors: Nora Dossche <ndossche@php.net> |
+----------------------------------------------------------------------+
*/
diff --cc ext/dom/private_data.h
index c64e96eb1a6,109f06c9050..086cd7bfc59
--- a/ext/dom/private_data.h
+++ b/ext/dom/private_data.h
@@@ -1,14 -1,16 +1,14 @@@
/*
+----------------------------------------------------------------------+
- | Copyright (c) The PHP Group |
+ | Copyright © The PHP Group and Contributors. |
+----------------------------------------------------------------------+
- | This source file is subject to version 3.01 of the PHP license, |
- | that is bundled with this package in the file LICENSE, and is |
- | available through the world-wide-web at the following url: |
- | https://www.php.net/license/3_01.txt |
- | If you did not receive a copy of the PHP license and are unable to |
- | obtain it through the world-wide-web, please send a note to |
- | license@php.net so we can mail you a copy immediately. |
+ | This source file is subject to the Modified BSD License that is |
+ | bundled with this package in the file LICENSE, and is available |
+ | through the World Wide Web at <https://www.php.net/license/>. |
+ | |
+ | SPDX-License-Identifier: BSD-3-Clause |
+----------------------------------------------------------------------+
- | Authors: Niels Dossche <nielsdos@php.net> |
+ | Authors: Nora Dossche <ndossche@php.net> |
+----------------------------------------------------------------------+
*/
diff --cc ext/dom/serialize_common.h
index 88088558e90,c2a37e4b98b..c6566e2f37c
--- a/ext/dom/serialize_common.h
+++ b/ext/dom/serialize_common.h
@@@ -1,14 -1,16 +1,14 @@@
/*
+----------------------------------------------------------------------+
- | Copyright (c) The PHP Group |
+ | Copyright © The PHP Group and Contributors. |
+----------------------------------------------------------------------+
- | This source file is subject to version 3.01 of the PHP license, |
- | that is bundled with this package in the file LICENSE, and is |
- | available through the world-wide-web at the following url: |
- | https://www.php.net/license/3_01.txt |
- | If you did not receive a copy of the PHP license and are unable to |
- | obtain it through the world-wide-web, please send a note to |
- | license@php.net so we can mail you a copy immediately. |
+ | This source file is subject to the Modified BSD License that is |
+ | bundled with this package in the file LICENSE, and is available |
+ | through the World Wide Web at <https://www.php.net/license/>. |
+ | |
+ | SPDX-License-Identifier: BSD-3-Clause |
+----------------------------------------------------------------------+
- | Authors: Niels Dossche <nielsdos@php.net> |
+ | Authors: Nora Dossche <ndossche@php.net> |
+----------------------------------------------------------------------+
*/
diff --cc ext/dom/token_list.c
index 2f1fa3c9e73,524ff699f41..0e779761655
--- a/ext/dom/token_list.c
+++ b/ext/dom/token_list.c
@@@ -1,14 -1,16 +1,14 @@@
/*
+----------------------------------------------------------------------+
- | Copyright (c) The PHP Group |
+ | Copyright © The PHP Group and Contributors. |
+----------------------------------------------------------------------+
- | This source file is subject to version 3.01 of the PHP license, |
- | that is bundled with this package in the file LICENSE, and is |
- | available through the world-wide-web at the following url: |
- | https://www.php.net/license/3_01.txt |
- | If you did not receive a copy of the PHP license and are unable to |
- | obtain it through the world-wide-web, please send a note to |
- | license@php.net so we can mail you a copy immediately. |
+ | This source file is subject to the Modified BSD License that is |
+ | bundled with this package in the file LICENSE, and is available |
+ | through the World Wide Web at <https://www.php.net/license/>. |
+ | |
+ | SPDX-License-Identifier: BSD-3-Clause |
+----------------------------------------------------------------------+
- | Authors: Niels Dossche <nielsdos@php.net> |
+ | Authors: Nora Dossche <ndossche@php.net> |
+----------------------------------------------------------------------+
*/
diff --cc ext/dom/token_list.h
index 7bddd6c9b46,124ea7a0c47..80cc094ddd8
--- a/ext/dom/token_list.h
+++ b/ext/dom/token_list.h
@@@ -1,14 -1,16 +1,14 @@@
/*
+----------------------------------------------------------------------+
- | Copyright (c) The PHP Group |
+ | Copyright © The PHP Group and Contributors. |
+----------------------------------------------------------------------+
- | This source file is subject to version 3.01 of the PHP license, |
- | that is bundled with this package in the file LICENSE, and is |
- | available through the world-wide-web at the following url: |
- | https://www.php.net/license/3_01.txt |
- | If you did not receive a copy of the PHP license and are unable to |
- | obtain it through the world-wide-web, please send a note to |
- | license@php.net so we can mail you a copy immediately. |
+ | This source file is subject to the Modified BSD License that is |
+ | bundled with this package in the file LICENSE, and is available |
+ | through the World Wide Web at <https://www.php.net/license/>. |
+ | |
+ | SPDX-License-Identifier: BSD-3-Clause |
+----------------------------------------------------------------------+
- | Authors: Niels Dossche <nielsdos@php.net> |
+ | Authors: Nora Dossche <ndossche@php.net> |
+----------------------------------------------------------------------+
*/
diff --cc ext/dom/xml_document.c
index e5966352dc7,ad7f3e9497f..707356227af
--- a/ext/dom/xml_document.c
+++ b/ext/dom/xml_document.c
@@@ -1,14 -1,16 +1,14 @@@
/*
+----------------------------------------------------------------------+
- | Copyright (c) The PHP Group |
+ | Copyright © The PHP Group and Contributors. |
+----------------------------------------------------------------------+
- | This source file is subject to version 3.01 of the PHP license, |
- | that is bundled with this package in the file LICENSE, and is |
- | available through the world-wide-web at the following url: |
- | https://www.php.net/license/3_01.txt |
- | If you did not receive a copy of the PHP license and are unable to |
- | obtain it through the world-wide-web, please send a note to |
- | license@php.net so we can mail you a copy immediately. |
+ | This source file is subject to the Modified BSD License that is |
+ | bundled with this package in the file LICENSE, and is available |
+ | through the World Wide Web at <https://www.php.net/license/>. |
+ | |
+ | SPDX-License-Identifier: BSD-3-Clause |
+----------------------------------------------------------------------+
- | Authors: Niels Dossche <nielsdos@php.net> |
+ | Authors: Nora Dossche <ndossche@php.net> |
+----------------------------------------------------------------------+
*/
diff --cc ext/dom/xml_serializer.c
index da43f24aab0,5e6a6f93b91..9c761f6d442
--- a/ext/dom/xml_serializer.c
+++ b/ext/dom/xml_serializer.c
@@@ -1,14 -1,16 +1,14 @@@
/*
+----------------------------------------------------------------------+
- | Copyright (c) The PHP Group |
+ | Copyright © The PHP Group and Contributors. |
+----------------------------------------------------------------------+
- | This source file is subject to version 3.01 of the PHP license, |
- | that is bundled with this package in the file LICENSE, and is |
- | available through the world-wide-web at the following url: |
- | https://www.php.net/license/3_01.txt |
- | If you did not receive a copy of the PHP license and are unable to |
- | obtain it through the world-wide-web, please send a note to |
- | license@php.net so we can mail you a copy immediately. |
+ | This source file is subject to the Modified BSD License that is |
+ | bundled with this package in the file LICENSE, and is available |
+ | through the World Wide Web at <https://www.php.net/license/>. |
+ | |
+ | SPDX-License-Identifier: BSD-3-Clause |
+----------------------------------------------------------------------+
- | Authors: Niels Dossche <nielsdos@php.net> |
+ | Authors: Nora Dossche <ndossche@php.net> |
+----------------------------------------------------------------------+
*/
diff --cc ext/dom/xml_serializer.h
index e686083a27a,a129785042e..4ada97f0e79
--- a/ext/dom/xml_serializer.h
+++ b/ext/dom/xml_serializer.h
@@@ -1,14 -1,16 +1,14 @@@
/*
+----------------------------------------------------------------------+
- | Copyright (c) The PHP Group |
+ | Copyright © The PHP Group and Contributors. |
+----------------------------------------------------------------------+
- | This source file is subject to version 3.01 of the PHP license, |
- | that is bundled with this package in the file LICENSE, and is |
- | available through the world-wide-web at the following url: |
- | https://www.php.net/license/3_01.txt |
- | If you did not receive a copy of the PHP license and are unable to |
- | obtain it through the world-wide-web, please send a note to |
- | license@php.net so we can mail you a copy immediately. |
+ | This source file is subject to the Modified BSD License that is |
+ | bundled with this package in the file LICENSE, and is available |
+ | through the World Wide Web at <https://www.php.net/license/>. |
+ | |
+ | SPDX-License-Identifier: BSD-3-Clause |
+----------------------------------------------------------------------+
- | Authors: Niels Dossche <nielsdos@php.net> |
+ | Authors: Nora Dossche <ndossche@php.net> |
+----------------------------------------------------------------------+
*/
diff --cc ext/dom/xpath_callbacks.h
index 072f5219633,80c2ee8b740..4bf79b5df84
--- a/ext/dom/xpath_callbacks.h
+++ b/ext/dom/xpath_callbacks.h
@@@ -1,14 -1,16 +1,14 @@@
/*
+----------------------------------------------------------------------+
- | Copyright (c) The PHP Group |
+ | Copyright © The PHP Group and Contributors. |
+----------------------------------------------------------------------+
- | This source file is subject to version 3.01 of the PHP license, |
- | that is bundled with this package in the file LICENSE, and is |
- | available through the world-wide-web at the following url: |
- | https://www.php.net/license/3_01.txt |
- | If you did not receive a copy of the PHP license and are unable to |
- | obtain it through the world-wide-web, please send a note to |
- | license@php.net so we can mail you a copy immediately. |
+ | This source file is subject to the Modified BSD License that is |
+ | bundled with this package in the file LICENSE, and is available |
+ | through the World Wide Web at <https://www.php.net/license/>. |
+ | |
+ | SPDX-License-Identifier: BSD-3-Clause |
+----------------------------------------------------------------------+
- | Authors: Niels Dossche <nielsdos@php.net> |
+ | Authors: Nora Dossche <ndossche@php.net> |
+----------------------------------------------------------------------+
*/
diff --cc ext/lexbor/php_lexbor.c
index 85f84062440,f18a09a5c4f..570190eee23
--- a/ext/lexbor/php_lexbor.c
+++ b/ext/lexbor/php_lexbor.c
@@@ -1,14 -1,16 +1,14 @@@
/*
+----------------------------------------------------------------------+
- | Copyright (c) The PHP Group |
+ | Copyright © The PHP Group and Contributors. |
+----------------------------------------------------------------------+
- | This source file is subject to version 3.01 of the PHP license, |
- | that is bundled with this package in the file LICENSE, and is |
- | available through the world-wide-web at the following url: |
- | https://www.php.net/license/3_01.txt |
- | If you did not receive a copy of the PHP license and are unable to |
- | obtain it through the world-wide-web, please send a note to |
- | license@php.net so we can mail you a copy immediately. |
+ | This source file is subject to the Modified BSD License that is |
+ | bundled with this package in the file LICENSE, and is available |
+ | through the World Wide Web at <https://www.php.net/license/>. |
+ | |
+ | SPDX-License-Identifier: BSD-3-Clause |
+----------------------------------------------------------------------+
- | Authors: Niels Dossche <nielsdos@php.net> |
+ | Authors: Nora Dossche <ndossche@php.net> |
| Mate Kocsis <kocsismate@php.net> |
+----------------------------------------------------------------------+
*/
diff --cc ext/lexbor/php_lexbor.h
index 15599838854,cf89c12f4d2..dccedb28b29
--- a/ext/lexbor/php_lexbor.h
+++ b/ext/lexbor/php_lexbor.h
@@@ -1,14 -1,16 +1,14 @@@
/*
+----------------------------------------------------------------------+
- | Copyright (c) The PHP Group |
+ | Copyright © The PHP Group and Contributors. |
+----------------------------------------------------------------------+
- | This source file is subject to version 3.01 of the PHP license, |
- | that is bundled with this package in the file LICENSE, and is |
- | available through the world-wide-web at the following url: |
- | https://www.php.net/license/3_01.txt |
- | If you did not receive a copy of the PHP license and are unable to |
- | obtain it through the world-wide-web, please send a note to |
- | license@php.net so we can mail you a copy immediately. |
+ | This source file is subject to the Modified BSD License that is |
+ | bundled with this package in the file LICENSE, and is available |
+ | through the World Wide Web at <https://www.php.net/license/>. |
+ | |
+ | SPDX-License-Identifier: BSD-3-Clause |
+----------------------------------------------------------------------+
- | Authors: Niels Dossche <nielsdos@php.net> |
+ | Authors: Nora Dossche <ndossche@php.net> |
| Mate Kocsis <kocsismate@php.net> |
+----------------------------------------------------------------------+
*/
diff --cc ext/libxml/image_svg.c
index 69343fe298b,e92b3ffca7e..88dfdfd81fd
--- a/ext/libxml/image_svg.c
+++ b/ext/libxml/image_svg.c
@@@ -1,14 -1,16 +1,14 @@@
/*
+----------------------------------------------------------------------+
- | Copyright (c) The PHP Group |
+ | Copyright © The PHP Group and Contributors. |
+----------------------------------------------------------------------+
- | This source file is subject to version 3.01 of the PHP license, |
- | that is bundled with this package in the file LICENSE, and is |
- | available through the world-wide-web at the following url: |
- | https://www.php.net/license/3_01.txt |
- | If you did not receive a copy of the PHP license and are unable to |
- | obtain it through the world-wide-web, please send a note to |
- | license@php.net so we can mail you a copy immediately. |
+ | This source file is subject to the Modified BSD License that is |
+ | bundled with this package in the file LICENSE, and is available |
+ | through the World Wide Web at <https://www.php.net/license/>. |
+ | |
+ | SPDX-License-Identifier: BSD-3-Clause |
+----------------------------------------------------------------------+
- | Authors: Niels Dossche <nielsdos@php.net> |
+ | Authors: Nora Dossche <ndossche@php.net> |
+----------------------------------------------------------------------+
*/
diff --cc ext/libxml/image_svg.h
index b665c2c8d91,6a346e2b9b8..9e13ef2a421
--- a/ext/libxml/image_svg.h
+++ b/ext/libxml/image_svg.h
@@@ -1,14 -1,16 +1,14 @@@
/*
+----------------------------------------------------------------------+
- | Copyright (c) The PHP Group |
+ | Copyright © The PHP Group and Contributors. |
+----------------------------------------------------------------------+
- | This source file is subject to version 3.01 of the PHP license, |
- | that is bundled with this package in the file LICENSE, and is |
- | available through the world-wide-web at the following url: |
- | https://www.php.net/license/3_01.txt |
- | If you did not receive a copy of the PHP license and are unable to |
- | obtain it through the world-wide-web, please send a note to |
- | license@php.net so we can mail you a copy immediately. |
+ | This source file is subject to the Modified BSD License that is |
+ | bundled with this package in the file LICENSE, and is available |
+ | through the World Wide Web at <https://www.php.net/license/>. |
+ | |
+ | SPDX-License-Identifier: BSD-3-Clause |
+----------------------------------------------------------------------+
- | Authors: Niels Dossche <nielsdos@php.net> |
- | Authors: Nora Dossche <ndossche@php.net> |
++ | Authors: Nora Dossche <ndossche@php.net> |
+----------------------------------------------------------------------+
*/
diff --cc ext/libxml/mime_sniff.c
index b78a7a2d31b,ae9fa06c2e3..2e54d579814
--- a/ext/libxml/mime_sniff.c
+++ b/ext/libxml/mime_sniff.c
@@@ -1,14 -1,16 +1,14 @@@
/*
+----------------------------------------------------------------------+
- | Copyright (c) The PHP Group |
+ | Copyright © The PHP Group and Contributors. |
+----------------------------------------------------------------------+
- | This source file is subject to version 3.01 of the PHP license, |
- | that is bundled with this package in the file LICENSE, and is |
- | available through the world-wide-web at the following url: |
- | https://www.php.net/license/3_01.txt |
- | If you did not receive a copy of the PHP license and are unable to |
- | obtain it through the world-wide-web, please send a note to |
- | license@php.net so we can mail you a copy immediately. |
+ | This source file is subject to the Modified BSD License that is |
+ | bundled with this package in the file LICENSE, and is available |
+ | through the World Wide Web at <https://www.php.net/license/>. |
+ | |
+ | SPDX-License-Identifier: BSD-3-Clause |
+----------------------------------------------------------------------+
- | Authors: Niels Dossche <nielsdos@php.net> |
+ | Authors: Nora Dossche <ndossche@php.net> |
+----------------------------------------------------------------------+
*/