Merge branch '3.4' into 4.4
* 3.4: [Cache] Fix compat wth DBAL v3
This commit is contained in:
commit
ddf795390a
@ -420,16 +420,21 @@ trait PdoTrait
|
|||||||
$this->driver = 'mysql';
|
$this->driver = 'mysql';
|
||||||
break;
|
break;
|
||||||
case $driver instanceof \Doctrine\DBAL\Driver\PDOSqlite\Driver:
|
case $driver instanceof \Doctrine\DBAL\Driver\PDOSqlite\Driver:
|
||||||
|
case $driver instanceof \Doctrine\DBAL\Driver\PDO\SQLite\Driver:
|
||||||
$this->driver = 'sqlite';
|
$this->driver = 'sqlite';
|
||||||
break;
|
break;
|
||||||
case $driver instanceof \Doctrine\DBAL\Driver\PDOPgSql\Driver:
|
case $driver instanceof \Doctrine\DBAL\Driver\PDOPgSql\Driver:
|
||||||
|
case $driver instanceof \Doctrine\DBAL\Driver\PDO\PgSQL\Driver:
|
||||||
$this->driver = 'pgsql';
|
$this->driver = 'pgsql';
|
||||||
break;
|
break;
|
||||||
case $driver instanceof \Doctrine\DBAL\Driver\OCI8\Driver:
|
case $driver instanceof \Doctrine\DBAL\Driver\OCI8\Driver:
|
||||||
case $driver instanceof \Doctrine\DBAL\Driver\PDOOracle\Driver:
|
case $driver instanceof \Doctrine\DBAL\Driver\PDOOracle\Driver:
|
||||||
|
case $driver instanceof \Doctrine\DBAL\Driver\PDO\OCI\Driver:
|
||||||
$this->driver = 'oci';
|
$this->driver = 'oci';
|
||||||
break;
|
break;
|
||||||
case $driver instanceof \Doctrine\DBAL\Driver\SQLSrv\Driver:
|
case $driver instanceof \Doctrine\DBAL\Driver\SQLSrv\Driver:
|
||||||
|
case $driver instanceof \Doctrine\DBAL\Driver\PDOSqlsrv\Driver:
|
||||||
|
case $driver instanceof \Doctrine\DBAL\Driver\PDO\SQLSrv\Driver:
|
||||||
$this->driver = 'sqlsrv';
|
$this->driver = 'sqlsrv';
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
|
@ -326,16 +326,21 @@ class PdoStore implements StoreInterface
|
|||||||
$this->driver = 'mysql';
|
$this->driver = 'mysql';
|
||||||
break;
|
break;
|
||||||
case $driver instanceof \Doctrine\DBAL\Driver\PDOSqlite\Driver:
|
case $driver instanceof \Doctrine\DBAL\Driver\PDOSqlite\Driver:
|
||||||
|
case $driver instanceof \Doctrine\DBAL\Driver\PDO\SQLite\Driver:
|
||||||
$this->driver = 'sqlite';
|
$this->driver = 'sqlite';
|
||||||
break;
|
break;
|
||||||
case $driver instanceof \Doctrine\DBAL\Driver\PDOPgSql\Driver:
|
case $driver instanceof \Doctrine\DBAL\Driver\PDOPgSql\Driver:
|
||||||
|
case $driver instanceof \Doctrine\DBAL\Driver\PDO\PgSQL\Driver:
|
||||||
$this->driver = 'pgsql';
|
$this->driver = 'pgsql';
|
||||||
break;
|
break;
|
||||||
case $driver instanceof \Doctrine\DBAL\Driver\OCI8\Driver:
|
case $driver instanceof \Doctrine\DBAL\Driver\OCI8\Driver:
|
||||||
case $driver instanceof \Doctrine\DBAL\Driver\PDOOracle\Driver:
|
case $driver instanceof \Doctrine\DBAL\Driver\PDOOracle\Driver:
|
||||||
|
case $driver instanceof \Doctrine\DBAL\Driver\PDO\OCI\Driver:
|
||||||
$this->driver = 'oci';
|
$this->driver = 'oci';
|
||||||
break;
|
break;
|
||||||
case $driver instanceof \Doctrine\DBAL\Driver\SQLSrv\Driver:
|
case $driver instanceof \Doctrine\DBAL\Driver\SQLSrv\Driver:
|
||||||
|
case $driver instanceof \Doctrine\DBAL\Driver\PDOSqlsrv\Driver:
|
||||||
|
case $driver instanceof \Doctrine\DBAL\Driver\PDO\SQLSrv\Driver:
|
||||||
$this->driver = 'sqlsrv';
|
$this->driver = 'sqlsrv';
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
|
Reference in New Issue
Block a user