PHP 8 compatibility.

doctrine · Oct 16, 2020 · d417c8f · d417c8f
1 parent 29bf315
commit d417c8f
Show file tree

Hide file tree

Showing 10 changed files with 255 additions and 86 deletions.
diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
@@ -23,6 +23,7 @@ jobs:
  php-version:
  - "7.3"
  - "7.4"
+ - "8.0"
  deps:
  - "fixed"
  include:
@@ -183,6 +184,9 @@ jobs:
  - "11"
  - "12"
  - "13"
+ include:
+ - php-version: "8.0"
+ postgres-version: "13"
 
  services:
  postgres:
@@ -247,6 +251,13 @@ jobs:
  extension:
  - "mysqli"
  - "pdo_mysql"
+ include:
+ - php-version: "8.0"
+ mariadb-version: "10.5"
+ extension: "mysqli"
+ - php-version: "8.0"
+ mariadb-version: "10.5"
+ extension: "pdo_mysql"
 
  services:
  mariadb:
@@ -304,6 +315,7 @@ jobs:
  matrix:
  php-version:
  - "7.4"
+ - "8.0"
  mysql-version:
  - "5.7"
  - "8.0"

diff --git a/composer.json b/composer.json
@@ -32,7 +32,7 @@
  {"name": "Jonathan Wage", "email": "jonwage@gmail.com"}
  ],
  "require": {
- "php": "^7.3",
+ "php": "^7.3 || ^8",
  "ext-pdo": "*",
  "doctrine/cache": "^1.0",
  "doctrine/event-manager": "^1.0"

diff --git a/composer.lock b/composer.lock
diff --git a/lib/Doctrine/DBAL/Driver/PDOConnection.php b/lib/Doctrine/DBAL/Driver/PDOConnection.php
@@ -11,7 +11,6 @@
 use PDOStatement;
 
 use function assert;
-use function func_get_args;
 
 /**
  * PDO implementation of the Connection interface.
@@ -21,6 +20,8 @@
  */
 class PDOConnection extends PDO implements ConnectionInterface, ServerInfoAwareConnection
 {
+ use PDOQueryImplementation;
+
  /**
  * @internal The connection can be only instantiated by its driver.
  *
@@ -83,25 +84,6 @@ public function prepare($sql, $driverOptions = [])
  }
  }
 
- /**
- * {@inheritdoc}
- *
- * @return PDOStatement
- */
- public function query()
- {
- $args = func_get_args();
-
- try {
- $stmt = parent::query(...$args);
- assert($stmt instanceof PDOStatement);
-
- return $stmt;
- } catch (PDOException $exception) {
- throw Exception::new($exception);
- }
- }
-
  /**
  * {@inheritdoc}
  */

diff --git a/lib/Doctrine/DBAL/Driver/PDOQueryImplementation.php b/lib/Doctrine/DBAL/Driver/PDOQueryImplementation.php
@@ -0,0 +1,62 @@
+<?php
+
+namespace Doctrine\DBAL\Driver;
+
+use Doctrine\DBAL\Driver\PDO\Exception;
+use PDOException;
+use PDOStatement;
+
+use function assert;
+use function func_get_args;
+
+use const PHP_VERSION_ID;
+
+if (PHP_VERSION_ID >= 80000) {
+ /**
+ * @internal
+ */
+ trait PDOQueryImplementation
+ {
+ /**
+ * {@inheritdoc}
+ *
+ * @return PDOStatement
+ */
+ public function query(?string $query = null, ?int $fetchMode = null, mixed ...$fetchModeArgs)
+ {
+ try {
+ $stmt = parent::query($query, $fetchMode, ...$fetchModeArgs);
+ assert($stmt instanceof PDOStatement);
+
+ return $stmt;
+ } catch (PDOException $exception) {
+ throw Exception::new($exception);
+ }
+ }
+ }
+} else {
+ /**
+ * @internal
+ */
+ trait PDOQueryImplementation
+ {
+ /**
+ * {@inheritdoc}
+ *
+ * @return PDOStatement
+ */
+ public function query()
+ {
+ $args = func_get_args();
+
+ try {
+ $stmt = parent::query(...$args);
+ assert($stmt instanceof PDOStatement);
+
+ return $stmt;
+ } catch (PDOException $exception) {
+ throw Exception::new($exception);
+ }
+ }
+ }
+}
diff --git a/lib/Doctrine/DBAL/Driver/PDOStatement.php b/lib/Doctrine/DBAL/Driver/PDOStatement.php
@@ -10,9 +10,7 @@
 use PDOException;
 
 use function array_slice;
-use function assert;
 use function func_get_args;
-use function is_array;
 use function sprintf;
 use function trigger_error;
 
@@ -26,6 +24,8 @@
  */
 class PDOStatement extends \PDOStatement implements StatementInterface, Result
 {
+ use PDOStatementImplementations;
+
  private const PARAM_TYPE_MAP = [
  ParameterType::NULL => PDO::PARAM_NULL,
  ParameterType::INTEGER => PDO::PARAM_INT,
@@ -54,34 +54,6 @@ protected function __construct()
  {
  }
 
- /**
- * {@inheritdoc}
- *
- * @deprecated Use one of the fetch- or iterate-related methods.
- */
- public function setFetchMode($fetchMode, $arg2 = null, $arg3 = null)
- {
- $fetchMode = $this->convertFetchMode($fetchMode);
-
- // This thin wrapper is necessary to shield against the weird signature
- // of PDOStatement::setFetchMode(): even if the second and third
- // parameters are optional, PHP will not let us remove it from this
- // declaration.
- try {
- if ($arg2 === null && $arg3 === null) {
- return parent::setFetchMode($fetchMode);
- }
-
- if ($arg3 === null) {
- return parent::setFetchMode($fetchMode, $arg2);
- }
-
- return parent::setFetchMode($fetchMode, $arg2, $arg3);
- } catch (PDOException $exception) {
- throw Exception::new($exception);
- }
- }
-
  /**
  * {@inheritdoc}
  */
@@ -164,39 +136,6 @@ public function fetch($fetchMode = null, $cursorOrientation = PDO::FETCH_ORI_NEX
  }
  }
 
- /**
- * {@inheritdoc}
- *
- * @deprecated Use fetchAllNumeric(), fetchAllAssociative() or fetchFirstColumn() instead.
- */
- public function fetchAll($fetchMode = null, $fetchArgument = null, $ctorArgs = null)
- {
- $args = func_get_args();
-
- if (isset($args[0])) {
- $args[0] = $this->convertFetchMode($args[0]);
- }
-
- if ($fetchMode === null && $fetchArgument === null && $ctorArgs === null) {
- $args = [];
- } elseif ($fetchArgument === null && $ctorArgs === null) {
- $args = [$fetchMode];
- } elseif ($ctorArgs === null) {
- $args = [$fetchMode, $fetchArgument];
- } else {
- $args = [$fetchMode, $fetchArgument, $ctorArgs];
- }
-
- try {
- $data = parent::fetchAll(...$args);
- assert(is_array($data));
-
- return $data;
- } catch (PDOException $exception) {
- throw Exception::new($exception);
- }
- }
-
  /**
  * {@inheritdoc}
  *