Fix #68712: suspicious if-else statements

Merge branch 'PHP-5.6' into PHP-7.0

Fix #66555: Always false condition in ext/gd/libgd/gdkanji.c

This issue has already been fixed in libgd[1], so we fix PHP's bundled
libgd accordingly.

[1] <https://github.com/li

Fix #66555: Always false condition in ext/gd/libgd/gdkanji.c

This issue has already been fixed in libgd[1], so we fix PHP's bundled
libgd accordingly.

[1] <https://github.com/libgd/libgd/commit/aa1d71c>

show more ...

Fix ClosedGeneratorException possibly thrown into wrong scope

Merge branch 'PHP-5.6' into PHP-7.0

Conflicts:
ext/standard/ftp_fopen_wrapper.c

Fix for bug #54431

Fixed bug #72647 (xmlrpc_encode() unexpected output after referencing array elements)

Update NEWs

Merge branch 'PHP-7.0' into PHP-7.1

Merge branch 'PHP-5.6' into PHP-7.0

# Resolved conflicts:
# ext/spl/spl_directory.c

Fix #72646: SplFileObject::getCsvControl does not return the escape character

This has obviously been missed when adding the $escape parameter to
SplFileObject::setCsvControl() in PHP 5.

Fix #72646: SplFileObject::getCsvControl does not return the escape character

This has obviously been missed when adding the $escape parameter to
SplFileObject::setCsvControl() in PHP 5.3, so we catch up on this.

show more ...

Merge branch 'PHP-7.0' into PHP-7.1

Merge branch 'PHP-5.6' into PHP-7.0

Fix #72330: CSV fields incorrectly split if escape char followed by UTF chars

We must not forget to properly reset the state for multibyte characters
following an escape character.

Update NEWS for 7.1.0beta1

Update NEWS

Fixed bug #72639 (Segfault when instantiating class that extends IntlCalendar and adds a property)

Prepare NEWS for 7.2

Prepare NEWS for beta2

update NEWs

Update NEWS for RFC: Additional Context in pcntl_signal Handler

Update NEWS with fixed OpenSSL 1.1 build

Update NEWs

Fixed bug #72629 (Caught exception assignment to variables ignores references).

Update NEWS