Fix memory leak when calling xml_parse_into_struct() twice

Closes GH-12254.

The userland constants do not start with PHP_

Merge branch 'PHP-8.0' into PHP-8.1

* PHP-8.0:
Fix #70962: XML_OPTION_SKIP_WHITE strips embedded whitespace

Merge branch 'PHP-7.4' into PHP-8.0

* PHP-7.4:
Fix #70962: XML_OPTION_SKIP_WHITE strips embedded whitespace

Fix #70962: XML_OPTION_SKIP_WHITE strips embedded whitespace

We must never strip embedded whitespace; we only need to skip values
when that option is set, and make sure that we keep BC r

Fix #70962: XML_OPTION_SKIP_WHITE strips embedded whitespace

We must never strip embedded whitespace; we only need to skip values
when that option is set, and make sure that we keep BC regarding the
different behavior for "cdata" and "complete" elements (for the former,
the whole element is skipped; for the latter only the "value" key).

We also fix erroneous `int` types which should actually be `size_t`.

Co-authored-by: Christoph M. Becker <cmbecker69@gmx.de>

Closes GH-7493.

show more ...

Remove full stop from error message

Error messages shouldn't have a full stop. Period.

Closes GH-7369.

Merge branch 'PHP-8.0'

* PHP-8.0:
Fix return value of xml_parse(_into_struct) for recursive parsing

Fix return value of xml_parse(_into_struct) for recursive parsing

As of PHP 8.0.0, these functions are supposed to return int, so we
cannot return `false`. Since calling the parser recu

Fix return value of xml_parse(_into_struct) for recursive parsing

As of PHP 8.0.0, these functions are supposed to return int, so we
cannot return `false`. Since calling the parser recursively is a
programmer error, we throw an `Error` in this case.

Cf. <https://github.com/php/php-src/pull/7363>.

show more ...

Merge branch 'PHP-8.0'

* PHP-8.0:
Fix #81351: xml_parse may fail, but has no error code

Merge branch 'PHP-7.4' into PHP-8.0

* PHP-7.4:
Fix #81351: xml_parse may fail, but has no error code

Fix #81351: xml_parse may fail, but has no error code

The fix for bug #73151[1] cured the symptoms, but not the root cause,
namely xmlParse() must not be called recursively. Since that

Fix #81351: xml_parse may fail, but has no error code

The fix for bug #73151[1] cured the symptoms, but not the root cause,
namely xmlParse() must not be called recursively. Since that bugfix
also messed up the error handling, we basically revert it (but also
simplify the return), and then prevent calling the parser recursively.

[1] <https://github.com/php/php-src/pull/2166/commits/f2a8a8c068995a5d780882c556cedd53bce3827d>

Co-authored-by: Nikita Popov <nikita.ppv@gmail.com>

Closes GH-7363.

show more ...

Not serializable flag permeation

Fixed some spaces used instead of tabs

Update http->https in license (#6945)

1. Update: http://www.php.net/license/3_01.txt to https, as there is anyway server header "Location:" to https.
2. Update few license 3.0 to 3.01 as

Update http->https in license (#6945)

1. Update: http://www.php.net/license/3_01.txt to https, as there is anyway server header "Location:" to https.
2. Update few license 3.0 to 3.01 as 3.0 states "php 5.1.1, 4.1.1, and earlier".
3. In some license comments is "at through the world-wide-web" while most is without "at", so deleted.
4. fixed indentation in some files before |

show more ...

Use zend_string_equals_(literal_)ci() API more often

Also drive-by usage of zend_ini_parse_bool()

Closes GH-6844

Use zend_string_equals() API instead of strcmp() in various places

Closes GH-6784

Merge branch 'PHP-8.0'

* PHP-8.0:
Mark resource-like objects as non-comparable

Mark resource-like objects as non-comparable

As these hold on to some internal resource, there can't be two
"equal" objects with different identity. Make sure the lack of
public prop

Mark resource-like objects as non-comparable

As these hold on to some internal resource, there can't be two
"equal" objects with different identity. Make sure the lack of
public properties doesn't result in these being treated as always
equal.

show more ...

Add support for generating class entries from stubs

Closes GH-6289

Co-authored-by: Nikita Popov <nikita.ppv@gmail.com>

Replace zend_bool uses with bool

We're starting to see a mix between uses of zend_bool and bool.
Replace all usages with the standard bool type everywhere.

Of course, zend_bool

Replace zend_bool uses with bool

We're starting to see a mix between uses of zend_bool and bool.
Replace all usages with the standard bool type everywhere.

Of course, zend_bool is retained as an alias.

show more ...

Make convert_to_*_ex simple aliases of convert_to_*

Historically, the _ex variants separated the zval first, if a
conversion was necessary. This distinction no longer makes sense
sin

Make convert_to_*_ex simple aliases of convert_to_*

Historically, the _ex variants separated the zval first, if a
conversion was necessary. This distinction no longer makes sense
since PHP 7.

The only difference that was still left is that _ex checked whether
the type is the same first, but the usage of these macros did not
actually distinguish on whether such an inlined check is valuable
or not in a given context.

Also drop the unused convert_to_explicit_type macros.

show more ...

Rename XmlParser to XMLParser for consistency with XMLWriter/XMLReader

Fix XmlParser classname in stubs

Move custom type checks to ZPP

Closes GH-6034

Merge branch 'PHP-7.3' into PHP-7.4

* PHP-7.3:
Fix #79922: Crash after multiple calls to xml_parser_free()