Skip to content

Commit 7de715a

Browse files
committed
MAGETWO-88409: Builds stabilization for PR
1 parent 299a5d6 commit 7de715a

File tree

4 files changed

+3
-4
lines changed

4 files changed

+3
-4
lines changed

dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/fixture/dry_run_log.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
* Copyright © Magento, Inc. All rights reserved.
44
* See COPYING.txt for license details.
55
*/
6+
// @codingStandardsIgnoreFile
67
return ['CREATE TABLE `reference_table` (
78
`tinyint_ref` tinyint(7) NOT NULL AUTO_INCREMENT ,
89
`tinyint_without_padding` tinyint(2) NOT NULL DEFAULT 0 ,

dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/fixture/dry_run_log_on_upgrade.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
* Copyright © Magento, Inc. All rights reserved.
44
* See COPYING.txt for license details.
55
*/
6+
// @codingStandardsIgnoreFile
67
return ['ALTER TABLE `reference_table` MODIFY COLUMN `tinyint_without_padding` tinyint(2) NOT NULL , MODIFY COLUMN `bigint_default_nullable` bigint(2) UNSIGNED NULL DEFAULT 123 , MODIFY COLUMN `bigint_not_default_not_nullable` bigint(20) NOT NULL
78
89
ALTER TABLE `auto_increment_test` MODIFY COLUMN `int_auto_increment_with_nullable` int(15) UNSIGNED NULL

dev/tests/setup-integration/testsuite/Magento/Setup/BCMultiModuleTest.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,6 @@ public function setUp()
6262
$this->tableData = $objectManager->get(TableData::class);
6363
$this->moduleResource = $objectManager->get(ModuleResource::class);
6464
$this->dbSchemaReader = $objectManager->get(DbSchemaReaderInterface::class);
65-
6665
}
6766

6867
/**

setup/src/Magento/Setup/Model/Installer.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -292,8 +292,7 @@ public function __construct(
292292
DataSetupFactory $dataSetupFactory,
293293
\Magento\Framework\Setup\SampleData\State $sampleDataState,
294294
ComponentRegistrar $componentRegistrar,
295-
PhpReadinessCheck $phpReadinessCheck,
296-
DeclarationInstaller $declarationInstaller = null
295+
PhpReadinessCheck $phpReadinessCheck
297296
) {
298297
$this->filePermissions = $filePermissions;
299298
$this->deploymentConfigWriter = $deploymentConfigWriter;
@@ -317,7 +316,6 @@ public function __construct(
317316
$this->sampleDataState = $sampleDataState;
318317
$this->componentRegistrar = $componentRegistrar;
319318
$this->phpReadinessCheck = $phpReadinessCheck;
320-
321319
$this->schemaPersistor = $this->objectManagerProvider->get()->get(SchemaPersistor::class);
322320
}
323321

0 commit comments

Comments
 (0)