Skip to content

Commit 700de11

Browse files
committed
MC-14884: MySQL Upgrade - v8
1 parent adc8191 commit 700de11

File tree

5 files changed

+22
-18
lines changed

5 files changed

+22
-18
lines changed

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@
9393
"pdepend/pdepend": "~2.7.1",
9494
"phpcompatibility/php-compatibility": "^9.3",
9595
"phpmd/phpmd": "^2.8.0",
96-
"phpstan/phpstan": "^0.12.3",
96+
"phpstan/phpstan": ">=0.12.3 <=0.12.23",
9797
"phpunit/phpunit": "^9",
9898
"sebastian/phpcpd": "~5.0.0",
9999
"squizlabs/php_codesniffer": "~3.5.4"

composer.lock

Lines changed: 11 additions & 11 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dev/tests/static/testsuite/Magento/Test/Php/_files/phpstan/phpstan.neon

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,3 +33,6 @@ services:
3333
class: Magento\PhpStan\Formatters\FilteredErrorFormatter
3434
arguments:
3535
showTipsOfTheDay: false
36+
checkThisOnly: false
37+
inferPrivatePropertyTypeFromConstructor: true
38+
checkMissingTypehints: %checkMissingTypehints%

lib/internal/Magento/Framework/Setup/Declaration/Schema/Db/MySQL/Definition/Columns/Integer.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,6 @@ public function fromDefinition(array $data)
110110
$data['definition'],
111111
$matches
112112
)) {
113-
$data['padding'] = null;
114113
// we have an agreement that tinyint(1) is Boolean
115114
if (isset($matches['padding'])
116115
&& $matches['type'] === 'tinyint'

lib/internal/Magento/Framework/Setup/Test/Unit/Declaration/Schema/Db/MySQL/Definition/Columns/IntegerTest.php

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ public function testToDefinition()
145145
->with($column)
146146
->willReturn('COMMENT "Comment"');
147147
$this->assertEquals(
148-
'`int_column` int(10) UNSIGNED NOT NULL DEFAULT 0 AUTO_INCREMENT COMMENT "Comment"',
148+
'`int_column` int UNSIGNED NOT NULL DEFAULT 0 AUTO_INCREMENT COMMENT "Comment"',
149149
$this->integer->toDefinition($column)
150150
);
151151
}
@@ -180,13 +180,15 @@ public function definitionDataProvider()
180180
{
181181
return [
182182
['int'],
183-
['int(10)', 10],
183+
['int(10)'],
184184
['tinyint'],
185-
['mediumint(5)', 5],
185+
['tinyint(1)', 1],
186+
['tinyint(2)'],
187+
['mediumint(5)'],
186188
['mediumint'],
187-
['smallint(3)', 3],
189+
['smallint(3)'],
188190
['smallint'],
189-
['bigint(10)', 10],
191+
['bigint(10)'],
190192
['bigint'],
191193
];
192194
}

0 commit comments

Comments
 (0)