Merge branch 'hotfix/#2273-undefined-pdo-constant-fix-backport-2-5' into 2.5

Backport #2273 to 2.5

Merge branch 'hotfix/#2273-undefined-pdo-constant-fix-backport-2-5' into 2.5
Backport #2273 to 2.5
2bb8c066 · Marco Pivetta · 2a7faab7 · 527d8cd5 · 2bb8c066 · 2bb8c066
Commit 2bb8c066 authored Jan 05, 2016 by Marco Pivetta
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

Driver.php lib/Doctrine/DBAL/Driver/PDOPgSql/Driver.php +1 -1

DriverTest.php tests/Doctrine/Tests/DBAL/Driver/PDOPgSql/DriverTest.php +1 -1

No files found.
--- a/lib/Doctrine/DBAL/Driver/PDOPgSql/Driver.php
+++ b/lib/Doctrine/DBAL/Driver/PDOPgSql/Driver.php
@@ -45,7 +45,7 @@ class Driver extends AbstractPostgreSQLDriver
                $driverOptions
            );

-            if (PHP_VERSION_ID >= 50600
+            if (defined('PDO::PGSQL_ATTR_DISABLE_PREPARES')
                && (! isset($driverOptions[PDO::PGSQL_ATTR_DISABLE_PREPARES])
                    || true === $driverOptions[PDO::PGSQL_ATTR_DISABLE_PREPARES]
                )

--- a/tests/Doctrine/Tests/DBAL/Driver/PDOPgSql/DriverTest.php
+++ b/tests/Doctrine/Tests/DBAL/Driver/PDOPgSql/DriverTest.php
@@ -107,7 +107,7 @@ class DriverTest extends AbstractPostgreSQLDriverTest
     */
    private function skipWhenNotUsingPhp56AndPdoPgsql()
    {
-        if (PHP_VERSION_ID < 50600) {
+        if (! defined('PDO::PGSQL_ATTR_DISABLE_PREPARES')) {
            $this->markTestSkipped('Test requires PHP 5.6+');
        }