Skip to content

Commit a57ce05

Browse files
committed
Don't export php_pdo_int.h
This is, as the name and a comment in the header imply, an internal header which is not supposed to be used by extensions other than PDO (not even by drivers). Since there is apparently no need to include this header in the parsers of the drivers, we remove these includes, and no longer declare the header to be installed. Given that the header is only exported for a couple of weeks[1], this is not considered to be a BC break, because it's unlikely that external drivers have already been adjusted to use this header, and otherwise they can still be fixed; PHP 8.4 is still in the pre-release stage. [1] <#14797> Closes GH-15688.
1 parent 1a126c5 commit a57ce05

File tree

7 files changed

+4
-6
lines changed

7 files changed

+4
-6
lines changed

NEWS

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,10 @@ PHP NEWS
2020
- GD:
2121
. Added gdImageClone to bundled libgd. (David Carlier)
2222

23+
- PDO:
24+
. The internal header php_pdo_int.h is no longer installed; it is not
25+
supposed to be used by PDO drivers. (cmb)
26+
2327
- PDO_Firebird:
2428
. Fixed GH-15604 (Always make input parameters nullable). (sim1984)
2529

ext/pdo/config.m4

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ if test "$PHP_PDO" != "no"; then
1616
pdo_sql_parser.h
1717
php_pdo_driver.h
1818
php_pdo_error.h
19-
php_pdo_int.h
2019
php_pdo.h
2120
]))
2221
PHP_ADD_MAKEFILE_FRAGMENT

ext/pdo/config.w32

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ if (PHP_PDO != "no") {
1010
"pdo_sql_parser.h " +
1111
"php_pdo_driver.h " +
1212
"php_pdo_error.h " +
13-
"php_pdo_int.h " +
1413
"php_pdo.h"
1514
);
1615
}

ext/pdo/pdo_sql_parser.re

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616

1717
#include "php.h"
1818
#include "php_pdo_driver.h"
19-
#include "php_pdo_int.h"
2019
#include "pdo_sql_parser.h"
2120

2221
static int default_scanner(pdo_scanner_t *s)

ext/pdo_mysql/mysql_sql_parser.re

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717

1818
#include "php.h"
1919
#include "ext/pdo/php_pdo_driver.h"
20-
#include "ext/pdo/php_pdo_int.h"
2120
#include "ext/pdo/pdo_sql_parser.h"
2221

2322
int pdo_mysql_scanner(pdo_scanner_t *s)

ext/pdo_pgsql/pgsql_sql_parser.re

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717

1818
#include "php.h"
1919
#include "ext/pdo/php_pdo_driver.h"
20-
#include "ext/pdo/php_pdo_int.h"
2120
#include "ext/pdo/pdo_sql_parser.h"
2221

2322
int pdo_pgsql_scanner(pdo_scanner_t *s)

ext/pdo_sqlite/sqlite_sql_parser.re

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717

1818
#include "php.h"
1919
#include "ext/pdo/php_pdo_driver.h"
20-
#include "ext/pdo/php_pdo_int.h"
2120
#include "ext/pdo/pdo_sql_parser.h"
2221

2322
int pdo_sqlite_scanner(pdo_scanner_t *s)

0 commit comments

Comments
 (0)