Merge branch 'PHP-8.1' into PHP-8.2

* PHP-8.1:
Fix GH-11587 PDO::ATTR_STRINGIFY_FETCHES should return strings even in if PDO::ATTR_EMULATE_PREPARES is enabled

Fix GH-11587 PDO::ATTR_STRINGIFY_FETCHES should return strings even in if PDO::ATTR_EMULATE_PREPARES is enabled

This also includes a fix for the MySQL ND driver to actually respect the user

Fix GH-11587 PDO::ATTR_STRINGIFY_FETCHES should return strings even in if PDO::ATTR_EMULATE_PREPARES is enabled

This also includes a fix for the MySQL ND driver to actually respect the user decided behaviour.

Closes GH-11622

Signed-off-by: George Peter Banyard <girgias@php.net>

show more ...

Merge branch 'PHP-8.1' into PHP-8.2

ext/pdo_mysql: mysql_handle_closer nullify some freed data.

Close GH-10926

Fix debug output

Fix #81658: MYSQL_OPT_LOAD_DATA_LOCAL_DIR not available in MariaDB

This also introduces the boolean userland constant `MYSQLI_IS_MARIADB`.

Fixed some spaces used instead of tabs

Fix printf formats in mysql debug logging

Enable printf format verification and fix the reported errors.

Merge branch 'PHP-8.0'

* PHP-8.0:
Fixed bug #81037 PDO discards error message text from prepared statement

Closes GH-6978.

Merge branch 'PHP-7.4' into PHP-8.0

* PHP-7.4:
Fixed bug #81037 PDO discards error message text from prepared statement

Fixed bug #81037 PDO discards error message text from prepared statement

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 ...

Fixed bug #80908

The last insert ID should be an unsigned integer.

Closes GH-6810.

Add functions to convert i64/u64 to string

PDO implement half of this, but this functionality is generally
useful. Provide these as zend_u64_to_str and zend_i64_to_str to
complement

Add functions to convert i64/u64 to string

PDO implement half of this, but this functionality is generally
useful. Provide these as zend_u64_to_str and zend_i64_to_str to
complement zend_long_to_str.

show more ...

Add API to fetch bool value for PDO attribute values

Closes GH-6766

Use standard PDO way for fetching integer attribute values

Fix #80329: Add option to specify LOAD DATA LOCAL white list folder

* allow the user to specify a folder where files that can be sent
via LOAD DATA LOCAL can exist
* add mysqli.

Fix #80329: Add option to specify LOAD DATA LOCAL white list folder

* allow the user to specify a folder where files that can be sent
via LOAD DATA LOCAL can exist
* add mysqli.local_infile_directory for mysqli
(ignored if mysqli.allow_local_infile is enabled)
* add PDO::MYSQL_ATTR_LOCAL_INFILE_DIRECTORY for pdo_mysql
(ignored if PDO::MYSQL_ATTR_LOCAL_INFILE is enabled)
* add related tests
* fixes for building with libmysql 8.x
* small improvement in existing tests
* update php.ini-[development|production] files

Closes GH-6448.

Co-authored-by: Nikita Popov <nikic@php.net>

show more ...

Refactor PDO's last inserted ID handler to use and return zend_string

Closes GH-6617

Refactor PDO doer handler to use zend_string

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 ...

Refactor PDO's quoter handler to return a zend_string

Closes GH-6547

Voidify PDO's fetch_error handler

Boolify PDO's preparer handler

Voidify PDO's closer handler

Boolify PDO's quoter handler