Skip to content

Commit 276d739

Browse files
committed
Replace use of Crate\PDO\PDO (deprecated) by Crate\PDO\PDOCrateDB
1 parent 283a0e4 commit 276d739

File tree

6 files changed

+13
-11
lines changed

6 files changed

+13
-11
lines changed

CHANGES.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ Unreleased
77

88
- Verified support on PHP 8.4 and PHP 8.5
99
- Reflection: Adjusted evaluation of column's ``is_nullable`` attribute for CrateDB >= 6.1
10+
- Dependencies: Replaced use of ``Crate\PDO\PDO`` (deprecated) by ``Crate\PDO\PDOCrateDB``
1011

1112
2024/02/02 4.0.2
1213
================

composer.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@
1717
"require": {
1818
"php": "^8.0|^8.1|^8.2|^8.3|^8.4|^8.5",
1919
"doctrine/dbal": "^2",
20-
"crate/crate-pdo": "^2"
20+
"crate/crate-pdo": "^2",
21+
"ext-pdo": "*"
2122
},
2223
"autoload": {
2324
"psr-0": {

src/Crate/DBAL/Driver/PDOCrate/PDOConnection.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@
2222

2323
namespace Crate\DBAL\Driver\PDOCrate;
2424

25-
use Crate\PDO\PDO;
25+
use Crate\PDO\PDOCrateDB;
2626
use Doctrine\DBAL\Driver\ServerInfoAwareConnection;
2727

28-
class PDOConnection extends PDO implements ServerInfoAwareConnection
28+
class PDOConnection extends PDOCrateDB implements ServerInfoAwareConnection
2929
{
3030
/**
3131
* @param string $dsn
@@ -36,8 +36,8 @@ class PDOConnection extends PDO implements ServerInfoAwareConnection
3636
public function __construct($dsn, $user = null, $password = null, array $options = null)
3737
{
3838
parent::__construct($dsn, $user, $password, $options);
39-
$this->setAttribute(PDO::ATTR_STATEMENT_CLASS, CrateStatement::class);
40-
$this->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
39+
$this->setAttribute(\PDO::ATTR_STATEMENT_CLASS, CrateStatement::class);
40+
$this->setAttribute(\PDO::ATTR_ERRMODE, \PDO::ERRMODE_EXCEPTION);
4141
}
4242

4343
/**

src/Crate/DBAL/Types/ArrayType.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222

2323
namespace Crate\DBAL\Types;
2424

25-
use Crate\PDO\PDO;
25+
use Crate\PDO\PDOCrateDB;
2626
use Doctrine\DBAL\Types\Type;
2727
use Doctrine\DBAL\Platforms\AbstractPlatform;
2828

@@ -53,7 +53,7 @@ public function getName()
5353
*/
5454
public function getBindingType()
5555
{
56-
return PDO::PARAM_ARRAY;
56+
return PDOCrateDB::PARAM_ARRAY;
5757
}
5858

5959
public function convertToDatabaseValue($value, AbstractPlatform $platform)

src/Crate/DBAL/Types/MapType.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
namespace Crate\DBAL\Types;
2424

2525
use Crate\DBAL\Platforms\CratePlatform;
26-
use Crate\PDO\PDO;
26+
use Crate\PDO\PDOCrateDB;
2727
use Doctrine\DBAL\Types\Type;
2828
use Doctrine\DBAL\Platforms\AbstractPlatform;
2929

@@ -59,7 +59,7 @@ public function getName()
5959
*/
6060
public function getBindingType()
6161
{
62-
return PDO::PARAM_OBJECT;
62+
return PDOCrateDB::PARAM_OBJECT;
6363
}
6464

6565
public function convertToDatabaseValue($value, AbstractPlatform $platform)

test/Crate/Test/DBAL/Functional/ConnectionTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
namespace Crate\Test\DBAL\Functional;
2323

2424
use Crate\Test\DBAL\DBALFunctionalTestCase;
25-
use Crate\PDO\PDO;
25+
use Crate\PDO\PDOCrateDB;
2626

2727
class ConnectionTestCase extends DBALFunctionalTestCase
2828
{
@@ -51,7 +51,7 @@ public function testBasicAuthConnection()
5151
$conn = \Doctrine\DBAL\DriverManager::getConnection($params);
5252
$this->assertEquals($auth[0], $conn->getUsername());
5353
$this->assertEquals($auth[1], $conn->getPassword());
54-
$auth_attr = $conn->getWrappedConnection()->getAttribute(PDO::CRATE_ATTR_HTTP_BASIC_AUTH);
54+
$auth_attr = $conn->getWrappedConnection()->getAttribute(PDOCrateDB::CRATE_ATTR_HTTP_BASIC_AUTH);
5555
$this->assertEquals($auth_attr, $auth);
5656
}
5757

0 commit comments

Comments
 (0)