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
5422bae0
Unverified
Commit
5422bae0
authored
Oct 13, 2017
by
belgattitude
Committed by
Luís Cobucci
Nov 19, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Majkl578 fix bc-break with return type
parent
f81afb19
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
5 deletions
+4
-5
AbstractMySQLDriver.php
lib/Doctrine/DBAL/Driver/AbstractMySQLDriver.php
+4
-5
No files found.
lib/Doctrine/DBAL/Driver/AbstractMySQLDriver.php
View file @
5422bae0
...
...
@@ -132,13 +132,12 @@ abstract class AbstractMySQLDriver implements Driver, ExceptionConverterDriver,
*/
public
function
createDatabasePlatformForVersion
(
$version
)
{
if
(
false
!==
stripos
(
$version
,
'mariadb'
)
&&
version_compare
(
$this
->
getMariaDbMysqlVersionNumber
(
$version
),
'10.2.7'
,
'>='
))
{
$mariadb
=
false
!==
stripos
(
$version
,
'mariadb'
);
if
(
$mariadb
&&
version_compare
(
$this
->
getMariaDbMysqlVersionNumber
(
$version
),
'10.2.7'
,
'>='
))
{
return
new
MariaDb1027Platform
();
}
if
(
false
===
stripos
(
$version
,
'mariadb'
)
&&
version_compare
(
$this
->
getOracleMysqlVersionNumber
(
$version
),
'5.7.9'
,
'>='
))
{
if
(
!
$mariadb
&&
version_compare
(
$this
->
getOracleMysqlVersionNumber
(
$version
),
'5.7.9'
,
'>='
))
{
return
new
MySQL57Platform
();
}
...
...
@@ -195,7 +194,7 @@ abstract class AbstractMySQLDriver implements Driver, ExceptionConverterDriver,
/**
* {@inheritdoc}
*/
public
function
getDatabase
(
\Doctrine\DBAL\Connection
$conn
)
:
?
string
public
function
getDatabase
(
\Doctrine\DBAL\Connection
$conn
)
{
$params
=
$conn
->
getParams
();
...
...
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