Niels Dossche
e6fef2944b
Merge branch 'PHP-8.2' into PHP-8.3
...
* PHP-8.2:
Fix GH-12633: sqlite3_defensive.phpt fails with sqlite 3.44.0
Fix GH-12628: The gh11374 test fails on Alpinelinux
2023-11-10 00:12:47 +01:00
Niels Dossche
fbda6b50a3
Merge branch 'PHP-8.1' into PHP-8.2
...
* PHP-8.1:
Fix GH-12633: sqlite3_defensive.phpt fails with sqlite 3.44.0
Fix GH-12628: The gh11374 test fails on Alpinelinux
2023-11-10 00:08:09 +01:00
Niels Dossche
78fba9cb80
Fix GH-12628: The gh11374 test fails on Alpinelinux
...
Closes GH-12636.
2023-11-10 00:01:22 +01:00
Máté Kocsis
98e8e277b5
Merge branch 'PHP-8.2' into PHP-8.3
...
* PHP-8.2:
Fix GH-12558 Escape \N in generated stubs
2023-10-31 10:09:22 +01:00
Máté Kocsis
d4e40dc0e1
Fix GH-12558 Escape \N in generated stubs ( #12562 )
2023-10-31 10:06:56 +01:00
Dmitry Stogov
25cb2a40d6
Fix possible NULL dereference (crash on Zend/tests/arginfo_zpp_mismatch.phpt)
2023-10-23 10:23:36 +03:00
George Peter Banyard
d7273c5963
Merge branch 'PHP-8.2' into PHP-8.3
...
* PHP-8.2:
Prevents double call to internal iterator rewind handler
adds failing test case for #12060
2023-09-05 10:36:16 +01:00
George Peter Banyard
c672a06954
Merge branch 'PHP-8.1' into PHP-8.2
...
* PHP-8.1:
Prevents double call to internal iterator rewind handler
adds failing test case for #12060
2023-09-05 10:27:33 +01:00
ju1ius
9658d9ada4
adds failing test case for #12060
...
Signed-off-by: George Peter Banyard <girgias@php.net >
2023-09-05 10:23:22 +01:00
Niels Dossche
0b9702c9ed
Implement GH-11934: Allow to pass CData into struct and/or union fields
...
Co-authored-by: KapitanOczywisty <44417092+KapitanOczywisty@users.noreply.github.com >
Closes GH-11935.
2023-08-29 17:01:10 +02:00
Remi Collet
13d3564a51
Fix #12063 convert PHP single-quote to C double-quote string
2023-08-28 14:48:49 +02:00
Máté Kocsis
c934e24197
Fix GH-9967 Add support for generating custom function, class const, and property attributes in stubs
2023-08-26 21:35:31 +02:00
ju1ius
3e0e7e3f90
releases property attributes of internal classes ( #11980 )
...
* adds test case for internal class property attribute
* releases property attributes of internal classes
2023-08-24 16:07:00 +02:00
ju1ius
7f1c3bf09b
Adds support for DNF types in internal functions and properties ( #11969 )
...
Note that this does not add support for items generated by gen_stubs,
only for items registered dynamically via the Zend API.
Closes GH-10120
2023-08-19 00:11:06 +01:00
George Peter Banyard
82972f448f
Merge branch 'PHP-8.2'
...
* PHP-8.2:
Fix various bugs related to DNF types
2023-08-15 17:01:51 +01:00
George Peter Banyard
02a80c5b82
Fix various bugs related to DNF types
...
- GH-11958: DNF types in trait properties do not get bound properly
- GH-11883: Memory leak in zend_type_release() for non-arena allocated DNF types
- Internal trait bound to userland class would not be arena allocated
- Property DNF types were not properly deep copied during lazy loading
Co-authored-by: Ilija Tovilo <ilija.tovilo@me.com >
Co-authored-by: ju1ius <jules.bernable@gmail.com >
2023-08-15 15:34:33 +01:00
George Peter Banyard
65a02f482f
ext/zend_test: Move object handler test objects to their own file ( #11852 )
2023-08-02 18:52:55 +01:00
Ilija Tovilo
dc368d3983
Merge branch 'PHP-8.2'
...
* PHP-8.2:
Fix zend/test arginfo stub hash
2023-08-01 11:42:04 +02:00
Ilija Tovilo
e14421cd73
Merge branch 'PHP-8.1' into PHP-8.2
...
* PHP-8.1:
Fix zend/test arginfo stub hash
2023-08-01 11:41:46 +02:00
Ilija Tovilo
e61dbe54e9
Fix zend/test arginfo stub hash
2023-08-01 11:41:13 +02:00
Ben Ramsey
3d5f239474
Merge branch 'PHP-8.2'
2023-07-31 20:15:51 -05:00
Ben Ramsey
7ecb284926
Merge branch 'PHP-8.1' into PHP-8.2
2023-07-31 20:06:37 -05:00
Ben Ramsey
ebbccb3dc6
Merge branch 'PHP-8.0' into PHP-8.1
2023-07-31 20:01:03 -05:00
Niels Dossche
62228a2568
Disable global state test on Windows
...
It looks like the config.w32 uses CHECK_HEADER_ADD_INCLUDE to add the include
path to libxml into the search path.
That doesn't happen in zend-test.
To add to the Windows trouble, libxml is statically linked in, ext/libxml can
only be built statically but ext/zend-test can be built both statically and
dynamically.
So the regression tests won't work in all possible configurations anyway on Windows.
All of this is no problem on Linux because it just uses dynamic linking
and pkg-config, without any magic.
Signed-off-by: Ben Ramsey <ramsey@php.net >
2023-07-31 19:55:10 -05:00
Derick Rethans
193f879057
Merge branch 'PHP-8.2'
2023-07-31 20:24:25 +01:00
Derick Rethans
855dd2767a
Fixed another broken merge (sorry)
2023-07-31 20:24:20 +01:00
Derick Rethans
dcc429557d
Fixed artifacts from merging
2023-07-31 20:08:45 +01:00
Derick Rethans
797bd9f384
Merge branch 'PHP-8.2'
2023-07-31 20:05:28 +01:00
Derick Rethans
47a347e8b0
Merge branch 'PHP-8.1' into PHP-8.2
2023-07-31 20:05:20 +01:00
Derick Rethans
93b43ac238
Fix broken merge
2023-07-31 20:05:12 +01:00
Derick Rethans
86afbe10e2
Merge branch 'PHP-8.2'
2023-07-31 19:57:02 +01:00
Derick Rethans
deddf4692a
Merge branch 'PHP-8.1' into PHP-8.2
2023-07-31 19:54:44 +01:00
Derick Rethans
0870ebb862
Merge branch 'PHP-8.0' into PHP-8.1
2023-07-31 19:53:43 +01:00
Niels Dossche
c283c3ab0b
Sanitize libxml2 globals before parsing
...
Fixes GHSA-3qrf-m4j2-pcrr.
To parse a document with libxml2, you first need to create a parsing context.
The parsing context contains parsing options (e.g. XML_NOENT to substitute
entities) that the application (in this case PHP) can set.
Unfortunately, libxml2 also supports providing default set options.
For example, if you call xmlSubstituteEntitiesDefault(1) then the XML_NOENT
option will be added to the parsing options every time you create a parsing
context **even if the application never requested XML_NOENT**.
Third party extensions can override these globals, in particular the
substitute entity global. This causes entity substitution to be
unexpectedly active.
Fix it by setting the parsing options to a sane known value.
For API calls that depend on global state we introduce
PHP_LIBXML_SANITIZE_GLOBALS() and PHP_LIBXML_RESTORE_GLOBALS().
For other APIs that work directly with a context we introduce
php_libxml_sanitize_parse_ctxt_options().
2023-07-31 19:47:19 +01:00
Ilija Tovilo
9bcdf219ec
Resolve open_basedir paths on ini update
...
Closes GH-10987
2023-07-18 14:43:40 +02:00
Ilija Tovilo
1a0ef2c1cc
Revert "Remove name field from the zend_constant struct ( #10954 )"
...
This reverts commit f42992f580 .
Closes GH-11604
2023-07-17 22:32:41 +02:00
George Peter Banyard
d8696f9216
[RFC] Path to Saner Increment/Decrement operators ( #10358 )
...
* Add behavioural tests for incdec operators
* Add support to ++/-- for objects castable to _IS_NUMBER
* Add str_increment() function
* Add str_decrement() function
RFC: https://wiki.php.net/rfc/saner-inc-dec-operators
Co-authored-by: Ilija Tovilo <ilija.tovilo@me.com >
Co-authored-by: Arnaud Le Blanc <arnaud.lb@gmail.com >
2023-07-17 15:51:24 +01:00
Ilija Tovilo
188072a58f
Revert "Fix test after reverted commit"
...
This reverts commit 0ce4f91d73 .
2023-07-04 23:36:22 +02:00
Ilija Tovilo
7b355e8d34
Revert "Merge branch 'PHP-8.2'"
...
This reverts commit 45a3f178dc , reversing
changes made to b2a54bc6af .
2023-07-04 09:18:49 +02:00
Ilija Tovilo
ef4f08832c
Revert "Fix GH-9967 Add support for generating custom function, class const, and property attributes in stubs"
...
This reverts commit d7ab0ff0c8 .
2023-07-04 09:11:14 +02:00
Máté Kocsis
0ce4f91d73
Fix test after reverted commit
2023-07-03 16:49:45 +02:00
Máté Kocsis
45a3f178dc
Merge branch 'PHP-8.2'
...
* PHP-8.2:
Fix GH-9967 Add support for generating custom function, class const, and property attributes in stubs
Closes GH-10170
2023-07-03 11:17:08 +02:00
Máté Kocsis
d7ab0ff0c8
Fix GH-9967 Add support for generating custom function, class const, and property attributes in stubs
2023-07-03 08:32:58 +02:00
Máté Kocsis
3906bccc00
Add support for typed class constants in stubs
2023-07-01 11:50:04 +02:00
George Peter Banyard
80e90ad7ba
Add number or str ZPP macros
2023-06-18 13:09:03 +01:00
Ilija Tovilo
b3e33be443
Forward shutdown exceptions to user error handlers
...
Fixes GH-10695
Closes GH-110905
2023-06-15 17:11:22 +02:00
Máté Kocsis
96ea06a1d9
Add test for GH-11423
2023-06-15 01:06:29 +02:00
Michael Voříšek
bd03c0343e
Allow CTE on more CTE safe functions ( #10771 )
2023-05-16 21:59:26 +02:00
Jakub Zelenka
6d33a1ab70
Merge branch 'PHP-8.1' into PHP-8.2
2023-04-16 10:55:02 +01:00
Jakub Zelenka
84be9042f9
Add missing zend_test_crash message initialization
2023-04-16 10:54:39 +01:00