Skip to content

D
doctrine-dbal
Unverified Commit 5422bae0 authored by belgattitude's avatar belgattitude Committed by Luís Cobucci
Browse files
Options

Majkl578 fix bc-break with return type

parent f81afb19
Show whitespace changes
Inline Side-by-side
Showing with 4 additions and 5 deletions
lib/Doctrine/DBAL/Driver/AbstractMySQLDriver.php
View file @ 5422bae0
...@@ -132,13 +132,12 @@ abstract class AbstractMySQLDriver implements Driver, ExceptionConverterDriver, ...@@ -132,13 +132,12 @@ abstract class AbstractMySQLDriver implements Driver, ExceptionConverterDriver,
*/ */
public function createDatabasePlatformForVersion($version) public function createDatabasePlatformForVersion($version)
{ {
if (false !== stripos($version, 'mariadb') $mariadb = false !== stripos($version, 'mariadb');
&& version_compare($this->getMariaDbMysqlVersionNumber($version), '10.2.7', '>=')) { if ($mariadb && version_compare($this->getMariaDbMysqlVersionNumber($version), '10.2.7', '>=')) {
return new MariaDb1027Platform(); return new MariaDb1027Platform();
} }
if (false === stripos($version, 'mariadb') if (!$mariadb && version_compare($this->getOracleMysqlVersionNumber($version), '5.7.9', '>=')) {
&& version_compare($this->getOracleMysqlVersionNumber($version), '5.7.9', '>=')) {
return new MySQL57Platform(); return new MySQL57Platform();
} }
...@@ -195,7 +194,7 @@ abstract class AbstractMySQLDriver implements Driver, ExceptionConverterDriver, ...@@ -195,7 +194,7 @@ abstract class AbstractMySQLDriver implements Driver, ExceptionConverterDriver,
/** /**
* {@inheritdoc} * {@inheritdoc}
*/ */
public function getDatabase(\Doctrine\DBAL\Connection $conn) : ?string public function getDatabase(\Doctrine\DBAL\Connection $conn)
{ {
$params = $conn->getParams(); $params = $conn->getParams();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment