Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
D
doctrine-dbal
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Tomáš Trávníček
doctrine-dbal
Commits
f63c9893
Unverified
Commit
f63c9893
authored
Jun 26, 2020
by
Sergei Morozov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove deprecated driver classes
parent
190c1dc3
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
24 additions
and
37 deletions
+24
-37
UPGRADE.md
UPGRADE.md
+1
-0
DB2Driver.php
src/Driver/IBMDB2/DB2Driver.php
+0
-27
Driver.php
src/Driver/IBMDB2/Driver.php
+16
-3
DriverTest.php
tests/Functional/Driver/IBMDB2/DriverTest.php
+5
-5
StatementTest.php
tests/Functional/Driver/IBMDB2/StatementTest.php
+2
-2
No files found.
UPGRADE.md
View file @
f63c9893
...
@@ -5,6 +5,7 @@
...
@@ -5,6 +5,7 @@
-
`AbstractDriverException`
-
`AbstractDriverException`
-
`DriverException`
-
`DriverException`
-
`PDOException`
-
`PDOException`
-
`IBMDB2\DB2Driver`
-
`IBMDB2\DB2Exception`
-
`IBMDB2\DB2Exception`
-
`Mysqli\MysqliException`
-
`Mysqli\MysqliException`
-
`OCI8\OCI8Exception`
-
`OCI8\OCI8Exception`
...
...
src/Driver/IBMDB2/DB2Driver.php
deleted
100644 → 0
View file @
190c1dc3
<?php
namespace
Doctrine\DBAL\Driver\IBMDB2
;
use
Doctrine\DBAL\Driver\AbstractDB2Driver
;
/**
* IBM DB2 Driver.
*
* @deprecated Use {@link Driver} instead
*/
class
DB2Driver
extends
AbstractDB2Driver
{
/**
* {@inheritdoc}
*/
public
function
connect
(
array
$params
)
{
return
new
Connection
(
DataSourceName
::
fromConnectionParameters
(
$params
)
->
toString
(),
isset
(
$params
[
'persistent'
])
&&
$params
[
'persistent'
]
===
true
,
$params
[
'user'
]
??
''
,
$params
[
'password'
]
??
''
,
$params
[
'driver_options'
]
??
[]
);
}
}
src/Driver/IBMDB2/Driver.php
View file @
f63c9893
<?php
<?php
declare
(
strict_types
=
1
);
namespace
Doctrine\DBAL\Driver\IBMDB2
;
namespace
Doctrine\DBAL\Driver\IBMDB2
;
final
class
Driver
extends
DB2Driver
use
Doctrine\DBAL\Driver\AbstractDB2Driver
;
final
class
Driver
extends
AbstractDB2Driver
{
{
/**
* {@inheritdoc}
*/
public
function
connect
(
array
$params
)
{
return
new
Connection
(
DataSourceName
::
fromConnectionParameters
(
$params
)
->
toString
(),
isset
(
$params
[
'persistent'
])
&&
$params
[
'persistent'
]
===
true
,
$params
[
'user'
]
??
''
,
$params
[
'password'
]
??
''
,
$params
[
'driver_options'
]
??
[]
);
}
}
}
tests/Functional/Driver/IBMDB2/DriverTest.php
View file @
f63c9893
...
@@ -2,8 +2,8 @@
...
@@ -2,8 +2,8 @@
namespace
Doctrine\DBAL\Tests\Functional\Driver\IBMDB2
;
namespace
Doctrine\DBAL\Tests\Functional\Driver\IBMDB2
;
use
Doctrine\DBAL\Driver
;
use
Doctrine\DBAL\Driver
as
DriverInterface
;
use
Doctrine\DBAL\Driver\IBMDB2\D
B2D
river
;
use
Doctrine\DBAL\Driver\IBMDB2\Driver
;
use
Doctrine\DBAL\Tests\Functional\Driver\AbstractDriverTest
;
use
Doctrine\DBAL\Tests\Functional\Driver\AbstractDriverTest
;
use
function
extension_loaded
;
use
function
extension_loaded
;
...
@@ -18,7 +18,7 @@ class DriverTest extends AbstractDriverTest
...
@@ -18,7 +18,7 @@ class DriverTest extends AbstractDriverTest
parent
::
setUp
();
parent
::
setUp
();
if
(
$this
->
connection
->
getDriver
()
instanceof
D
B2D
river
)
{
if
(
$this
->
connection
->
getDriver
()
instanceof
Driver
)
{
return
;
return
;
}
}
...
@@ -35,8 +35,8 @@ class DriverTest extends AbstractDriverTest
...
@@ -35,8 +35,8 @@ class DriverTest extends AbstractDriverTest
self
::
markTestSkipped
(
'IBM DB2 does not support connecting without database name.'
);
self
::
markTestSkipped
(
'IBM DB2 does not support connecting without database name.'
);
}
}
protected
function
createDriver
()
:
Driver
protected
function
createDriver
()
:
Driver
Interface
{
{
return
new
D
B2D
river
();
return
new
Driver
();
}
}
}
}
tests/Functional/Driver/IBMDB2/StatementTest.php
View file @
f63c9893
...
@@ -4,7 +4,7 @@ declare(strict_types=1);
...
@@ -4,7 +4,7 @@ declare(strict_types=1);
namespace
Doctrine\DBAL\Tests\Functional\Driver\IBMDB2
;
namespace
Doctrine\DBAL\Tests\Functional\Driver\IBMDB2
;
use
Doctrine\DBAL\Driver\IBMDB2\D
B2D
river
;
use
Doctrine\DBAL\Driver\IBMDB2\Driver
;
use
Doctrine\DBAL\Driver\IBMDB2\Exception\StatementError
;
use
Doctrine\DBAL\Driver\IBMDB2\Exception\StatementError
;
use
Doctrine\DBAL\Tests\FunctionalTestCase
;
use
Doctrine\DBAL\Tests\FunctionalTestCase
;
...
@@ -24,7 +24,7 @@ class StatementTest extends FunctionalTestCase
...
@@ -24,7 +24,7 @@ class StatementTest extends FunctionalTestCase
parent
::
setUp
();
parent
::
setUp
();
if
(
$this
->
connection
->
getDriver
()
instanceof
D
B2D
river
)
{
if
(
$this
->
connection
->
getDriver
()
instanceof
Driver
)
{
return
;
return
;
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment