Skip to content

Commit

Permalink
Merge 2.13.x into 3.1.x
Browse files Browse the repository at this point in the history
  • Loading branch information
@derrabus
derrabus committed Oct 23, 2021
2 parents 9e524fd + 9e9e62e commit d3c7081
Show file tree
Hide file tree
Showing 14 changed files with 55 additions and 14 deletions.
3 changes: 3 additions & 0 deletions ci/github/phpunit/ibm_db2.xml
View file
Expand Up @@ -6,8 +6,11 @@
beStrictAboutTodoAnnotatedTests="true"
failOnRisky="true"
failOnWarning="true"
convertDeprecationsToExceptions="true"
>
<php>
<ini name="error_reporting" value="-1" />

<var name="db_driver" value="ibm_db2"/>
<var name="db_host" value="127.0.0.1"/>
<var name="db_user" value="db2inst1"/>
Expand Down
3 changes: 3 additions & 0 deletions ci/github/phpunit/mysqli-tls.xml
View file
Expand Up @@ -6,8 +6,11 @@
beStrictAboutTodoAnnotatedTests="true"
failOnRisky="true"
failOnWarning="true"
convertDeprecationsToExceptions="true"
>
<php>
<ini name="error_reporting" value="-1" />

<var name="db_driver" value="mysqli"/>
<var name="db_host" value="127.0.0.1"/>
<var name="db_port" value="3306"/>
Expand Down
3 changes: 3 additions & 0 deletions ci/github/phpunit/mysqli.xml
View file
Expand Up @@ -6,8 +6,11 @@
beStrictAboutTodoAnnotatedTests="true"
failOnRisky="true"
failOnWarning="true"
convertDeprecationsToExceptions="true"
>
<php>
<ini name="error_reporting" value="-1" />

<var name="db_driver" value="mysqli"/>
<var name="db_host" value="127.0.0.1" />
<var name="db_port" value="3306"/>
Expand Down
3 changes: 3 additions & 0 deletions ci/github/phpunit/oci8.xml
View file
Expand Up @@ -6,8 +6,11 @@
beStrictAboutTodoAnnotatedTests="true"
failOnRisky="true"
failOnWarning="true"
convertDeprecationsToExceptions="true"
>
<php>
<ini name="error_reporting" value="-1" />

<var name="db_driver" value="oci8"/>
<var name="db_host" value="localhost"/>
<var name="db_user" value="doctrine"/>
Expand Down
3 changes: 3 additions & 0 deletions ci/github/phpunit/pdo_mysql.xml
View file
Expand Up @@ -6,8 +6,11 @@
beStrictAboutTodoAnnotatedTests="true"
failOnRisky="true"
failOnWarning="true"
convertDeprecationsToExceptions="true"
>
<php>
<ini name="error_reporting" value="-1" />

<var name="db_driver" value="pdo_mysql"/>
<var name="db_host" value="127.0.0.1" />
<var name="db_port" value="3306"/>
Expand Down
3 changes: 3 additions & 0 deletions ci/github/phpunit/pdo_oci.xml
View file
Expand Up @@ -6,8 +6,11 @@
beStrictAboutTodoAnnotatedTests="true"
failOnRisky="true"
failOnWarning="true"
convertDeprecationsToExceptions="true"
>
<php>
<ini name="error_reporting" value="-1" />

<var name="db_driver" value="pdo_oci"/>
<var name="db_host" value="localhost"/>
<var name="db_user" value="doctrine"/>
Expand Down
3 changes: 3 additions & 0 deletions ci/github/phpunit/pdo_pgsql.xml
View file
Expand Up @@ -6,8 +6,11 @@
beStrictAboutTodoAnnotatedTests="true"
failOnRisky="true"
failOnWarning="true"
convertDeprecationsToExceptions="true"
>
<php>
<ini name="error_reporting" value="-1" />

<var name="db_driver" value="pdo_pgsql"/>
<var name="db_host" value="localhost" />
<var name="db_user" value="postgres" />
Expand Down
3 changes: 3 additions & 0 deletions ci/github/phpunit/pdo_sqlsrv.xml
View file
Expand Up @@ -6,8 +6,11 @@
beStrictAboutTodoAnnotatedTests="true"
failOnRisky="true"
failOnWarning="true"
convertDeprecationsToExceptions="true"
>
<php>
<ini name="error_reporting" value="-1" />

<var name="db_driver" value="pdo_sqlsrv"/>
<var name="db_host" value="127.0.0.1" />
<var name="db_user" value="sa" />
Expand Down
5 changes: 5 additions & 0 deletions ci/github/phpunit/sqlite.xml
View file
Expand Up @@ -6,7 +6,12 @@
beStrictAboutTodoAnnotatedTests="true"
failOnRisky="true"
failOnWarning="true"
convertDeprecationsToExceptions="true"
>
<php>
<ini name="error_reporting" value="-1" />
</php>

<testsuites>
<testsuite name="Doctrine DBAL Test Suite">
<directory>../../../tests</directory>
Expand Down
3 changes: 3 additions & 0 deletions ci/github/phpunit/sqlsrv.xml
View file
Expand Up @@ -6,8 +6,11 @@
beStrictAboutTodoAnnotatedTests="true"
failOnRisky="true"
failOnWarning="true"
convertDeprecationsToExceptions="true"
>
<php>
<ini name="error_reporting" value="-1" />

<var name="db_driver" value="sqlsrv"/>
<var name="db_host" value="127.0.0.1" />
<var name="db_user" value="sa" />
Expand Down
6 changes: 3 additions & 3 deletions src/Connection.php
View file
Expand Up @@ -1674,11 +1674,11 @@ private function _bindTypedValues(DriverStatement $stmt, array $params, array $t
* @param mixed $value The value to bind.
* @param int|string|Type|null $type The type to bind (PDO or DBAL).
*
* @return mixed[] [0] => the (escaped) value, [1] => the binding type.
* @return array{mixed, int} [0] => the (escaped) value, [1] => the binding type.
*
* @throws Exception
*/
private function getBindingInfo($value, $type)
private function getBindingInfo($value, $type): array
{
if (is_string($type)) {
$type = Type::getType($type);
Expand All @@ -1688,7 +1688,7 @@ private function getBindingInfo($value, $type)
$value = $type->convertToDatabaseValue($value, $this->getDatabasePlatform());
$bindingType = $type->getBindingType();
} else {
$bindingType = $type;
$bindingType = $type ?? ParameterType::STRING;
}

return [$value, $bindingType];
Expand Down
2 changes: 1 addition & 1 deletion src/Driver/PDO/SQLSrv/Statement.php
View file
Expand Up @@ -59,7 +59,7 @@ public function bindParam($param, &$variable, $type = ParameterType::STRING, $le
break;
}

return $this->statement->bindParam($param, $variable, $type, $length, $driverOptions);
return $this->statement->bindParam($param, $variable, $type, $length ?? 0, $driverOptions);
}

/**
Expand Down
7 changes: 5 additions & 2 deletions src/Schema/OracleSchemaManager.php
View file
Expand Up @@ -9,6 +9,7 @@
use function array_change_key_case;
use function array_values;
use function assert;
use function is_string;
use function preg_match;
use function str_replace;
use function strpos;
Expand Down Expand Up @@ -68,7 +69,7 @@ protected function _getPortableTableIndexesList($tableIndexes, $tableName = null
$keyName = strtolower($tableIndex['name']);
$buffer = [];

if (strtolower($tableIndex['is_primary']) === 'p') {
if ($tableIndex['is_primary'] === 'P') {
$keyName = 'primary';
$buffer['primary'] = true;
$buffer['non_unique'] = false;
Expand Down Expand Up @@ -108,7 +109,9 @@ protected function _getPortableTableColumnDefinition($tableColumn)
}

// Default values returned from database sometimes have trailing spaces.
$tableColumn['data_default'] = trim($tableColumn['data_default']);
if (is_string($tableColumn['data_default'])) {
$tableColumn['data_default'] = trim($tableColumn['data_default']);
}

if ($tableColumn['data_default'] === '' || $tableColumn['data_default'] === 'NULL') {
$tableColumn['data_default'] = null;
Expand Down
22 changes: 14 additions & 8 deletions src/Schema/PostgreSQLSchemaManager.php
View file
Expand Up @@ -21,7 +21,6 @@
use function preg_replace;
use function sprintf;
use function str_replace;
use function strlen;
use function strpos;
use function strtolower;
use function trim;
Expand Down Expand Up @@ -347,16 +346,22 @@ protected function _getPortableTableColumnDefinition($tableColumn)
$matches = [];

$autoincrement = false;
if (preg_match("/^nextval\('(.*)'(::.*)?\)$/", $tableColumn['default'], $matches) === 1) {

if (
$tableColumn['default'] !== null
&& preg_match("/^nextval\('(.*)'(::.*)?\)$/", $tableColumn['default'], $matches) === 1
) {
$tableColumn['sequence'] = $matches[1];
$tableColumn['default'] = null;
$autoincrement = true;
}

if (preg_match("/^['(](.*)[')]::/", $tableColumn['default'], $matches) === 1) {
$tableColumn['default'] = $matches[1];
} elseif (preg_match('/^NULL::/', $tableColumn['default']) === 1) {
$tableColumn['default'] = null;
if ($tableColumn['default'] !== null) {
if (preg_match("/^['(](.*)[')]::/", $tableColumn['default'], $matches) === 1) {
$tableColumn['default'] = $matches[1];
} elseif (preg_match('/^NULL::/', $tableColumn['default']) === 1) {
$tableColumn['default'] = null;
}
}

$length = $tableColumn['length'] ?? null;
Expand All @@ -380,7 +385,8 @@ protected function _getPortableTableColumnDefinition($tableColumn)

$dbType = strtolower($tableColumn['type']);
if (
strlen($tableColumn['domain_type']) > 0
$tableColumn['domain_type'] !== null
&& $tableColumn['domain_type'] !== ''
&& ! $this->_platform->hasDoctrineTypeMappingFor($tableColumn['type'])
) {
$dbType = strtolower($tableColumn['domain_type']);
Expand Down Expand Up @@ -520,7 +526,7 @@ protected function _getPortableTableColumnDefinition($tableColumn)
*/
private function fixVersion94NegativeNumericDefaultValue($defaultValue)
{
if (strpos($defaultValue, '(') === 0) {
if ($defaultValue !== null && strpos($defaultValue, '(') === 0) {
return trim($defaultValue, '()');
}

Expand Down

0 comments on commit d3c7081

Please sign in to comment.