From 61bed75db85759385215a68ce145673c4a6dddfd Mon Sep 17 00:00:00 2001
From: belgattitude <belgattitude@gmail.com>
Date: Wed, 11 Oct 2017 11:41:11 +0200
Subject: [PATCH] Fixed strict assert for default int values
---
lib/Doctrine/DBAL/Schema/MySqlSchemaManager.php | 4 ++--
.../DBAL/Functional/Schema/MySqlSchemaManagerTest.php | 8 +++++---
2 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/lib/Doctrine/DBAL/Schema/MySqlSchemaManager.php b/lib/Doctrine/DBAL/Schema/MySqlSchemaManager.php
index 1f2896988..b1b93fdfd 100644
--- a/lib/Doctrine/DBAL/Schema/MySqlSchemaManager.php
+++ b/lib/Doctrine/DBAL/Schema/MySqlSchemaManager.php
@@ -198,8 +198,8 @@ class MySqlSchemaManager extends AbstractSchemaManager
];
if ($scale !== null && $precision !== null) {
- $options['scale'] = $scale;
- $options['precision'] = $precision;
+ $options['scale'] = (int) $scale;
+ $options['precision'] = (int) $precision;
}
$column = new Column($tableColumn['field'], Type::getType($type), $options);
diff --git a/tests/Doctrine/Tests/DBAL/Functional/Schema/MySqlSchemaManagerTest.php b/tests/Doctrine/Tests/DBAL/Functional/Schema/MySqlSchemaManagerTest.php
index c7f1516a7..a19b74b59 100644
--- a/tests/Doctrine/Tests/DBAL/Functional/Schema/MySqlSchemaManagerTest.php
+++ b/tests/Doctrine/Tests/DBAL/Functional/Schema/MySqlSchemaManagerTest.php
@@ -472,6 +472,7 @@ class MySqlSchemaManagerTest extends SchemaManagerFunctionalTestCase
$table->addColumn('col_datetime', 'datetime', ['default' => $currentTimeStampSql]);
$table->addColumn('col_datetime_null', 'datetime', ['notnull' => false, 'default' => null]);
$table->addColumn('col_int', 'integer', ['default' => 1]);
+ $table->addColumn('col_neg_int', 'integer', ['default' => -1]);
$table->addColumn('col_string', 'string', ['default' => 'A']);
$table->addColumn('col_decimal', 'decimal', ['scale' => 3, 'precision' => 6, 'default' => -2.3]);
$table->addColumn('col_date', 'date', ['default' => '2012-12-12']);
@@ -488,10 +489,11 @@ class MySqlSchemaManagerTest extends SchemaManagerFunctionalTestCase
self::assertInstanceOf(\DateTime::class, \DateTime::createFromFormat('Y-m-d H:i:s', $row['col_datetime']));
self::assertNull($row['col_datetime_null']);
- self::assertSame('1', $row['col_int']);
- self::assertSame('A', $row['col_string']);
- self::assertSame('-2.300', $row['col_decimal']);
self::assertSame('2012-12-12', $row['col_date']);
+ self::assertSame('A', $row['col_string']);
+ self::assertEquals(1, $row['col_int']);
+ self::assertEquals(-1, $row['col_neg_int']);
+ self::assertEquals('-2.300', $row['col_decimal']);
self::assertLessThan(5, $row['diff_seconds']);
}
--
2.21.0