MC-14884: MySQL Upgrade - v8

magento · May 21, 2020 · 700de11 · 700de11
1 parent adc8191
commit 700de11
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 18 deletions.
diff --git a/composer.json b/composer.json
@@ -93,7 +93,7 @@
         "pdepend/pdepend": "~2.7.1",
         "phpcompatibility/php-compatibility": "^9.3",
         "phpmd/phpmd": "^2.8.0",
-        "phpstan/phpstan": "^0.12.3",
+        "phpstan/phpstan": ">=0.12.3 <=0.12.23",
         "phpunit/phpunit": "^9",
         "sebastian/phpcpd": "~5.0.0",
         "squizlabs/php_codesniffer": "~3.5.4"

diff --git a/composer.lock b/composer.lock
diff --git a/dev/tests/static/testsuite/Magento/Test/Php/_files/phpstan/phpstan.neon b/dev/tests/static/testsuite/Magento/Test/Php/_files/phpstan/phpstan.neon
@@ -33,3 +33,6 @@ services:
 		class: Magento\PhpStan\Formatters\FilteredErrorFormatter
 		arguments:
 			showTipsOfTheDay: false
+			checkThisOnly: false
+            inferPrivatePropertyTypeFromConstructor: true
+            checkMissingTypehints: %checkMissingTypehints%
diff --git a/...ternal/Magento/Framework/Setup/Declaration/Schema/Db/MySQL/Definition/Columns/Integer.php b/...ternal/Magento/Framework/Setup/Declaration/Schema/Db/MySQL/Definition/Columns/Integer.php
@@ -110,7 +110,6 @@ public function fromDefinition(array $data)
             $data['definition'],
             $matches
         )) {
-            $data['padding'] = null;
             // we have an agreement that tinyint(1) is Boolean
             if (isset($matches['padding'])
                 && $matches['type'] === 'tinyint'

diff --git a/.../Framework/Setup/Test/Unit/Declaration/Schema/Db/MySQL/Definition/Columns/IntegerTest.php b/.../Framework/Setup/Test/Unit/Declaration/Schema/Db/MySQL/Definition/Columns/IntegerTest.php
@@ -145,7 +145,7 @@ public function testToDefinition()
             ->with($column)
             ->willReturn('COMMENT "Comment"');
         $this->assertEquals(
-            '`int_column` int(10) UNSIGNED NOT NULL DEFAULT 0 AUTO_INCREMENT COMMENT "Comment"',
+            '`int_column` int UNSIGNED NOT NULL DEFAULT 0 AUTO_INCREMENT COMMENT "Comment"',
             $this->integer->toDefinition($column)
         );
     }
@@ -180,13 +180,15 @@ public function definitionDataProvider()
     {
         return [
             ['int'],
-            ['int(10)', 10],
+            ['int(10)'],
             ['tinyint'],
-            ['mediumint(5)', 5],
+            ['tinyint(1)', 1],
+            ['tinyint(2)'],
+            ['mediumint(5)'],
             ['mediumint'],
-            ['smallint(3)', 3],
+            ['smallint(3)'],
             ['smallint'],
-            ['bigint(10)', 10],
+            ['bigint(10)'],
             ['bigint'],
         ];
     }