-
-
Notifications
You must be signed in to change notification settings - Fork 150
Add polyfill for PDO driver specific subclasses #549
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
jnoordsij
wants to merge
10
commits into
symfony:1.x
Choose a base branch
from
jnoordsij:add-pdo-subdriver-constant-polyfill
base: 1.x
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
10 commits
Select commit
Hold shift + click to select a range
2e97b02
Add polyfill for PDO driver specific sub class constants
jnoordsij edce4e3
Fix compatibility with older PHP versions
jnoordsij 4fa7faa
Turn Pdo subclasses into functional polyfills
jnoordsij f9fdfa5
Add polyfilling for Pdo subclass methods
jnoordsij 3a70b81
Fixup constant values for PHP 8.5
jnoordsij b7444cf
Add conditional Pdo/Mysql class declaration
jnoordsij 15a7a4b
CS: method signatures to single line
jnoordsij a70cf2c
Add static connect method to PDO subclass polyfills
jnoordsij f42017a
Add test for class extension of PDO subclass
jnoordsij e04dc06
Only load PDO subclass polyfills when corresponding extension is loaded
jnoordsij File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,48 @@ | ||
| <?php | ||
|
|
||
| /* | ||
| * This file is part of the Symfony package. | ||
| * | ||
| * (c) Fabien Potencier <fabien@symfony.com> | ||
| * | ||
| * For the full copyright and license information, please view the LICENSE | ||
| * file that was distributed with this source code. | ||
| */ | ||
| namespace Pdo; | ||
|
|
||
| use PDO; | ||
| use PDOException; | ||
|
|
||
| if (\PHP_VERSION_ID < 80400 && extension_loaded('pdo_dblib')) { | ||
| class Dblib extends PDO | ||
| { | ||
| public const ATTR_CONNECTION_TIMEOUT = PDO::DBLIB_ATTR_CONNECTION_TIMEOUT; | ||
| public const ATTR_QUERY_TIMEOUT = PDO::DBLIB_ATTR_QUERY_TIMEOUT; | ||
| public const ATTR_STRINGIFY_UNIQUEIDENTIFIER = PDO::DBLIB_ATTR_STRINGIFY_UNIQUEIDENTIFIER; | ||
| public const ATTR_VERSION = PDO::DBLIB_ATTR_VERSION; | ||
| public const ATTR_TDS_VERSION = \PHP_VERSION_ID >= 70300 ? PDO::DBLIB_ATTR_TDS_VERSION : 1004; | ||
| public const ATTR_SKIP_EMPTY_ROWSETS = \PHP_VERSION_ID >= 70300 ? PDO::DBLIB_ATTR_SKIP_EMPTY_ROWSETS : 1005; | ||
| public const ATTR_DATETIME_CONVERT = \PHP_VERSION_ID >= 70300 ? \PDO::DBLIB_ATTR_DATETIME_CONVERT : 1006; | ||
|
|
||
| public function __construct(string $dsn, ?string $username = null, ?string $password = null, ?array $options = null) | ||
| { | ||
| parent::__construct($dsn, $username, $password, $options); | ||
|
|
||
| if (($driver = $this->getAttribute(PDO::ATTR_DRIVER_NAME)) !== 'dblib') | ||
| { | ||
| throw new PDOException("Pdo\Dblib::__construct() cannot be used for connecting to the \"$driver\" driver"); | ||
| } | ||
| } | ||
|
|
||
| public static function connect(string $dsn, ?string $username = null, ?string $password = null, ?array $options = null): self | ||
| { | ||
| try { | ||
| return new self($dsn, $username, $password, $options); | ||
| } catch (PDOException $e) { | ||
| throw preg_match('/Pdo\\\\Dblib::__construct\(\) cannot be used for connecting to the "([a-z]+)" driver/', $e->getMessage(), $matches) | ||
| ? new PDOException("Pdo\Dblib::connect() cannot be used for connecting to the \"{$matches[1]}\" driver") | ||
| : $e; | ||
| } | ||
| } | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,44 @@ | ||
| <?php | ||
|
|
||
| /* | ||
| * This file is part of the Symfony package. | ||
| * | ||
| * (c) Fabien Potencier <fabien@symfony.com> | ||
| * | ||
| * For the full copyright and license information, please view the LICENSE | ||
| * file that was distributed with this source code. | ||
| */ | ||
| namespace Pdo; | ||
|
|
||
| use PDO; | ||
| use PDOException; | ||
|
|
||
| if (\PHP_VERSION_ID < 80400 && extension_loaded('pdo_firebird')) { | ||
| class Firebird extends PDO | ||
| { | ||
| public const ATTR_DATE_FORMAT = PDO::FB_ATTR_DATE_FORMAT; | ||
| public const ATTR_TIME_FORMAT = PDO::FB_ATTR_TIME_FORMAT; | ||
| public const ATTR_TIMESTAMP_FORMAT = PDO::FB_ATTR_TIMESTAMP_FORMAT; | ||
|
|
||
| public function __construct(string $dsn, ?string $username = null, ?string $password = null, ?array $options = null) | ||
| { | ||
| parent::__construct($dsn, $username, $password, $options); | ||
|
|
||
| if (($driver = $this->getAttribute(PDO::ATTR_DRIVER_NAME)) !== 'firebird') | ||
| { | ||
| throw new PDOException("Pdo\Firebird::__construct() cannot be used for connecting to the \"$driver\" driver"); | ||
| } | ||
| } | ||
|
|
||
| public static function connect(string $dsn, ?string $username = null, ?string $password = null, ?array $options = null): self | ||
| { | ||
| try { | ||
| return new self($dsn, $username, $password, $options); | ||
| } catch (PDOException $e) { | ||
| throw preg_match('/Pdo\\\\Firebird::__construct\(\) cannot be used for connecting to the "([a-z]+)" driver/', $e->getMessage(), $matches) | ||
| ? new PDOException("Pdo\Firebird::connect() cannot be used for connecting to the \"{$matches[1]}\" driver") | ||
| : $e; | ||
| } | ||
| } | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,108 @@ | ||
| <?php | ||
|
|
||
| /* | ||
| * This file is part of the Symfony package. | ||
| * | ||
| * (c) Fabien Potencier <fabien@symfony.com> | ||
| * | ||
| * For the full copyright and license information, please view the LICENSE | ||
| * file that was distributed with this source code. | ||
| */ | ||
| namespace Pdo; | ||
|
|
||
| use PDO; | ||
| use PDOException; | ||
|
|
||
| if (\PHP_VERSION_ID < 80400 && extension_loaded('pdo_mysql')) { | ||
| // Feature detection for non-mysqlnd; see also https://www.php.net/manual/en/class.pdo-mysql.php#pdo-mysql.constants.attr-max-buffer-size | ||
| if (defined('PDO::MYSQL_ATTR_MAX_BUFFER_SIZE') && defined('PDO::MYSQL_ATTR_READ_DEFAULT_FILE') && defined('PDO::MYSQL_ATTR_READ_DEFAULT_GROUP')) | ||
| { | ||
| class Mysql extends PDO | ||
| { | ||
| public const ATTR_COMPRESS = PDO::MYSQL_ATTR_COMPRESS; | ||
| public const ATTR_DIRECT_QUERY = PDO::MYSQL_ATTR_DIRECT_QUERY; | ||
| public const ATTR_FOUND_ROWS = PDO::MYSQL_ATTR_FOUND_ROWS; | ||
| public const ATTR_IGNORE_SPACE = PDO::MYSQL_ATTR_IGNORE_SPACE; | ||
| public const ATTR_INIT_COMMAND = PDO::MYSQL_ATTR_INIT_COMMAND; | ||
| public const ATTR_LOCAL_INFILE = PDO::MYSQL_ATTR_LOCAL_INFILE; | ||
| public const ATTR_LOCAL_INFILE_DIRECTORY = \PHP_VERSION_ID >= 80100 ? \PDO::MYSQL_ATTR_LOCAL_INFILE_DIRECTORY : 1015; | ||
| public const ATTR_MAX_BUFFER_SIZE = PDO::MYSQL_ATTR_MAX_BUFFER_SIZE; | ||
| public const ATTR_MULTI_STATEMENTS = PDO::MYSQL_ATTR_MULTI_STATEMENTS; | ||
| public const ATTR_READ_DEFAULT_FILE = PDO::MYSQL_ATTR_READ_DEFAULT_FILE; | ||
| public const ATTR_READ_DEFAULT_GROUP = PDO::MYSQL_ATTR_READ_DEFAULT_GROUP; | ||
| public const ATTR_SERVER_PUBLIC_KEY = PDO::MYSQL_ATTR_SERVER_PUBLIC_KEY; | ||
| public const ATTR_SSL_CA = PDO::MYSQL_ATTR_SSL_CA; | ||
| public const ATTR_SSL_CAPATH = PDO::MYSQL_ATTR_SSL_CAPATH; | ||
| public const ATTR_SSL_CERT = PDO::MYSQL_ATTR_SSL_CERT; | ||
| public const ATTR_SSL_CIPHER = PDO::MYSQL_ATTR_SSL_CIPHER; | ||
| public const ATTR_SSL_KEY = PDO::MYSQL_ATTR_SSL_KEY; | ||
| public const ATTR_SSL_VERIFY_SERVER_CERT = PDO::MYSQL_ATTR_SSL_VERIFY_SERVER_CERT; | ||
| public const ATTR_USE_BUFFERED_QUERY = PDO::MYSQL_ATTR_USE_BUFFERED_QUERY; | ||
|
|
||
| public function __construct(string $dsn, ?string $username = null, ?string $password = null, ?array $options = null) | ||
| { | ||
| parent::__construct($dsn, $username, $password, $options); | ||
|
|
||
| if (($driver = $this->getAttribute(PDO::ATTR_DRIVER_NAME)) !== 'mysql') | ||
| { | ||
| throw new PDOException("Pdo\Mysql::__construct() cannot be used for connecting to the \"$driver\" driver"); | ||
| } | ||
| } | ||
|
|
||
| public static function connect(string $dsn, ?string $username = null, ?string $password = null, ?array $options = null): self | ||
| { | ||
| try { | ||
| return new self($dsn, $username, $password, $options); | ||
| } catch (PDOException $e) { | ||
| throw preg_match('/Pdo\\\\Mysql::__construct\(\) cannot be used for connecting to the "([a-z]+)" driver/', $e->getMessage(), $matches) | ||
| ? new PDOException("Pdo\Mysql::connect() cannot be used for connecting to the \"{$matches[1]}\" driver") | ||
| : $e; | ||
| } | ||
| } | ||
| } | ||
| } else { | ||
| class Mysql extends PDO | ||
| { | ||
| public const ATTR_COMPRESS = PDO::MYSQL_ATTR_COMPRESS; | ||
| public const ATTR_DIRECT_QUERY = PDO::MYSQL_ATTR_DIRECT_QUERY; | ||
| public const ATTR_FOUND_ROWS = PDO::MYSQL_ATTR_FOUND_ROWS; | ||
| public const ATTR_IGNORE_SPACE = PDO::MYSQL_ATTR_IGNORE_SPACE; | ||
| public const ATTR_INIT_COMMAND = PDO::MYSQL_ATTR_INIT_COMMAND; | ||
| public const ATTR_LOCAL_INFILE = PDO::MYSQL_ATTR_LOCAL_INFILE; | ||
| public const ATTR_LOCAL_INFILE_DIRECTORY = \PHP_VERSION_ID >= 80100 ? \PDO::MYSQL_ATTR_LOCAL_INFILE_DIRECTORY : 1015; | ||
| // public const ATTR_MAX_BUFFER_SIZE = PDO::MYSQL_ATTR_MAX_BUFFER_SIZE; // disabled for mysqlnd | ||
| public const ATTR_MULTI_STATEMENTS = PDO::MYSQL_ATTR_MULTI_STATEMENTS; | ||
| // public const ATTR_READ_DEFAULT_FILE = PDO::MYSQL_ATTR_READ_DEFAULT_FILE; // disabled for mysqlnd | ||
| // public const ATTR_READ_DEFAULT_GROUP = PDO::MYSQL_ATTR_READ_DEFAULT_GROUP; // disabled for mysqlnd | ||
| public const ATTR_SERVER_PUBLIC_KEY = PDO::MYSQL_ATTR_SERVER_PUBLIC_KEY; | ||
| public const ATTR_SSL_CA = PDO::MYSQL_ATTR_SSL_CA; | ||
| public const ATTR_SSL_CAPATH = PDO::MYSQL_ATTR_SSL_CAPATH; | ||
| public const ATTR_SSL_CERT = PDO::MYSQL_ATTR_SSL_CERT; | ||
| public const ATTR_SSL_CIPHER = PDO::MYSQL_ATTR_SSL_CIPHER; | ||
| public const ATTR_SSL_KEY = PDO::MYSQL_ATTR_SSL_KEY; | ||
| public const ATTR_SSL_VERIFY_SERVER_CERT = PDO::MYSQL_ATTR_SSL_VERIFY_SERVER_CERT; | ||
| public const ATTR_USE_BUFFERED_QUERY = PDO::MYSQL_ATTR_USE_BUFFERED_QUERY; | ||
|
|
||
| public function __construct(string $dsn, ?string $username = null, ?string $password = null, ?array $options = null) | ||
| { | ||
| parent::__construct($dsn, $username, $password, $options); | ||
|
|
||
| if (($driver = $this->getAttribute(PDO::ATTR_DRIVER_NAME)) !== 'mysql') | ||
| { | ||
| throw new PDOException("Pdo\Mysql::__construct() cannot be used for connecting to the \"$driver\" driver"); | ||
| } | ||
| } | ||
|
|
||
| public static function connect(string $dsn, ?string $username = null, ?string $password = null, ?array $options = null): self | ||
| { | ||
| try { | ||
| return new self($dsn, $username, $password, $options); | ||
| } catch (PDOException $e) { | ||
| throw preg_match('/Pdo\\\\Mysql::__construct\(\) cannot be used for connecting to the "([a-z]+)" driver/', $e->getMessage(), $matches) | ||
| ? new PDOException("Pdo\Mysql::connect() cannot be used for connecting to the \"{$matches[1]}\" driver") | ||
| : $e; | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,46 @@ | ||
| <?php | ||
|
|
||
| /* | ||
| * This file is part of the Symfony package. | ||
| * | ||
| * (c) Fabien Potencier <fabien@symfony.com> | ||
| * | ||
| * For the full copyright and license information, please view the LICENSE | ||
| * file that was distributed with this source code. | ||
| */ | ||
| namespace Pdo; | ||
|
|
||
| use PDO; | ||
| use PDOException; | ||
|
|
||
| if (\PHP_VERSION_ID < 80400 && extension_loaded('pdo_odbc')) { | ||
| class Odbc extends PDO | ||
| { | ||
| public const ATTR_USE_CURSOR_LIBRARY = PDO::ODBC_ATTR_USE_CURSOR_LIBRARY; | ||
| public const ATTR_ASSUME_UTF8 = PDO::ODBC_ATTR_ASSUME_UTF8; | ||
| public const SQL_USE_IF_NEEDED = PDO::ODBC_SQL_USE_IF_NEEDED; | ||
| public const SQL_USE_DRIVER = PDO::ODBC_SQL_USE_DRIVER; | ||
| public const SQL_USE_ODBC = PDO::ODBC_SQL_USE_ODBC; | ||
|
|
||
| public function __construct(string $dsn, ?string $username = null, ?string $password = null, ?array $options = null) | ||
| { | ||
| parent::__construct($dsn, $username, $password, $options); | ||
|
|
||
| if (($driver = $this->getAttribute(PDO::ATTR_DRIVER_NAME)) !== 'odbc') | ||
| { | ||
| throw new PDOException("Pdo\Odbc::__construct() cannot be used for connecting to the \"$driver\" driver"); | ||
| } | ||
| } | ||
|
|
||
| public static function connect(string $dsn, ?string $username = null, ?string $password = null, ?array $options = null): self | ||
| { | ||
| try { | ||
| return new self($dsn, $username, $password, $options); | ||
| } catch (PDOException $e) { | ||
| throw preg_match('/Pdo\\\\Odbc::__construct\(\) cannot be used for connecting to the "([a-z]+)" driver/', $e->getMessage(), $matches) | ||
| ? new PDOException("Pdo\Odbc::connect() cannot be used for connecting to the \"{$matches[1]}\" driver") | ||
| : $e; | ||
| } | ||
| } | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,99 @@ | ||
| <?php | ||
|
|
||
| /* | ||
| * This file is part of the Symfony package. | ||
| * | ||
| * (c) Fabien Potencier <fabien@symfony.com> | ||
| * | ||
| * For the full copyright and license information, please view the LICENSE | ||
| * file that was distributed with this source code. | ||
| */ | ||
| namespace Pdo; | ||
|
|
||
| use PDO; | ||
| use PDOException; | ||
|
|
||
| if (\PHP_VERSION_ID < 80400 && extension_loaded('pdo_pgsql')) { | ||
| class Pgsql extends PDO | ||
| { | ||
| public const ATTR_DISABLE_PREPARES = PDO::PGSQL_ATTR_DISABLE_PREPARES; | ||
|
|
||
| public function __construct(string $dsn, ?string $username = null, ?string $password = null, ?array $options = null) | ||
| { | ||
| parent::__construct($dsn, $username, $password, $options); | ||
|
|
||
| if (($driver = $this->getAttribute(PDO::ATTR_DRIVER_NAME)) !== 'pgsql') | ||
| { | ||
| throw new PDOException("Pdo\Pgsql::__construct() cannot be used for connecting to the \"$driver\" driver"); | ||
| } | ||
| } | ||
|
|
||
| public static function connect(string $dsn, ?string $username = null, ?string $password = null, ?array $options = null): self | ||
| { | ||
| try { | ||
| return new self($dsn, $username, $password, $options); | ||
| } catch (PDOException $e) { | ||
| throw preg_match('/Pdo\\\\Pgsql::__construct\(\) cannot be used for connecting to the "([a-z]+)" driver/', $e->getMessage(), $matches) | ||
| ? new PDOException("Pdo\Pgsql::connect() cannot be used for connecting to the \"{$matches[1]}\" driver") | ||
| : $e; | ||
| } | ||
| } | ||
|
|
||
| public function copyFromArray(string $tableName, array $rows, string $separator = "\t", string $nullAs = "\\\\N", ?string $fields = null): bool | ||
| { | ||
| return $this->pgsqlCopyFromArray($tableName, $rows, $separator, $nullAs, $fields); | ||
| } | ||
|
|
||
| public function copyFromFile(string $tableName, string $filename, string $separator = "\t", string $nullAs = "\\\\N", ?string $fields = null): bool | ||
| { | ||
| return $this->pgsqlCopyFromFile($tableName, $filename, $separator, $nullAs, $fields); | ||
| } | ||
|
|
||
| /** | ||
| * @return array|false | ||
| */ | ||
| public function copyToArray(string $tableName, string $separator = "\t", string $nullAs = "\\\\N", ?string $fields = null) | ||
| { | ||
| return $this->pgsqlCopyToArray($tableName, $separator, $nullAs, $fields); | ||
| } | ||
|
|
||
| public function copyToFile(string $tableName, string $filename, string $separator = "\t", string $nullAs = "\\\\N", ?string $fields = null): bool | ||
| { | ||
| return $this->pgsqlCopyToFile($tableName, $filename, $separator, $nullAs, $fields); | ||
| } | ||
|
|
||
| /** | ||
| * @return array|false | ||
| */ | ||
| public function getNotify(int $fetchMode = PDO::FETCH_DEFAULT, int $timeoutMilliseconds = 0) | ||
| { | ||
| return $this->pgsqlGetNotify($fetchMode, $timeoutMilliseconds); | ||
| } | ||
|
|
||
| public function getPid(): int | ||
| { | ||
| return $this->pgsqlGetPid(); | ||
| } | ||
|
|
||
| /** | ||
| * @return string|false | ||
| */ | ||
| public function lobCreate() | ||
| { | ||
| return $this->pgsqlLOBCreate(); | ||
| } | ||
|
|
||
| /** | ||
| * @return resource|false | ||
| */ | ||
| public function lobOpen(string $oid, string $mode = "rb") | ||
| { | ||
| return $this->pgsqlLOBOpen($oid, $mode); | ||
| } | ||
|
|
||
| public function lobUnlink(string $oid): bool | ||
| { | ||
| return $this->pgsqlLOBUnlink($oid); | ||
| } | ||
| } | ||
| } |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.