Merge branch 'MAGETWO-84100' of github.com:magento-trigger/magento2ce into MAGETWO-84100

Author: rganin

dev/tests/setup-integration/etc/install-config-mysql.php.dist

@@ -6,10 +6,10 @@
 
 return [
     'default' => [
-        'db-host' => '{{db_host}}',
-        'db-user' => '{{db_user}}',
-        'db-password' => '{{db_password}}',
-        'db-name' => '{{db_name}}',
+        'db-host' => '{{db-host}}',
+        'db-user' => '{{db-user}}',
+        'db-password' => '{{db-password}}',
+        'db-name' => '{{db-name}}',
         'db-prefix' => '',
         'backend-frontname' => 'admin',
         'admin-user' => 'admin',
@@ -21,15 +21,15 @@ return [
         'disable_modules' => 'all'
     ],
     'checkout' => [
-        'host' => '{{db_host}}',
-        'username' => '{{db_user}}',
-        'password' => '{{db_password}}',
-        'dbname' => '{{db_checkout}}'
+        'host' => '{{db-host}}',
+        'username' => '{{db-user}}',
+        'password' => '{{db-password}}',
+        'dbname' => '{{db-checkout}}'
     ],
     'sales' => [
-        'host' => '{{db_host}}',
-        'username' => '{{db_user}}',
-        'password' => '{{db_password}}',
-        'dbname' => '{{db_sales}}'
+        'host' => '{{db-host}}',
+        'username' => '{{db-user}}',
+        'password' => '{{db-password}}',
+        'dbname' => '{{db-sales}}'
     ]
 ];

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

@@ -78,9 +78,9 @@ public function testInstallation()
         );
 
         //Second time installation should not find anything as we do not change anything
-        $this->assertNull($diff->getAll());
+        self::assertNull($diff->getAll());
         $shardData = $this->describeTable->describeShard(Sharding::DEFAULT_CONNECTION);
-        $this->assertEquals($this->getData(), $shardData);
+        self::assertEquals($this->getData(), $shardData);
     }
 
     /**
@@ -155,9 +155,9 @@ public function testInstallationWithColumnsRemoval()
             $this->schemaConfig->getDeclarationConfig(),
             $this->schemaConfig->getDbConfig()
         );
-        $this->assertNull($diff->getAll());
+        self::assertNull($diff->getAll());
         $shardData = $this->describeTable->describeShard(Sharding::DEFAULT_CONNECTION);
-        $this->assertEquals($this->getData(), $shardData);
+        self::assertEquals($this->getData(), $shardData);
     }
 
     /**
@@ -192,9 +192,9 @@ public function testInstallationWithConstraintsModification()
             $this->schemaConfig->getDeclarationConfig(),
             $this->schemaConfig->getDbConfig()
         );
-        $this->assertNull($diff->getAll());
+        self::assertNull($diff->getAll());
         $shardData = $this->describeTable->describeShard(Sharding::DEFAULT_CONNECTION);
-        $this->assertEquals($this->getTrimmedData(), $shardData);
+        self::assertEquals($this->getTrimmedData(), $shardData);
     }
 
     /**
@@ -221,8 +221,8 @@ public function testInstallationWithDroppingTables()
             $this->schemaConfig->getDeclarationConfig(),
             $this->schemaConfig->getDbConfig()
         );
-        $this->assertNull($diff->getAll());
+        self::assertNull($diff->getAll());
         $shardData = $this->describeTable->describeShard(Sharding::DEFAULT_CONNECTION);
-        $this->assertEquals($this->getData(), $shardData);
+        self::assertEquals($this->getData(), $shardData);
     }
 }

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

@@ -55,31 +55,31 @@ public function testSchemaBuilder()
         );
         $dbSchema = $this->schemaConfig->getDeclarationConfig();
         $schemaTables = $dbSchema->getTables();
-        $this->assertArrayHasKey('reference_table', $dbSchema->getTables());
-        $this->assertArrayHasKey('test_table', $dbSchema->getTables());
+        self::assertArrayHasKey('reference_table', $dbSchema->getTables());
+        self::assertArrayHasKey('test_table', $dbSchema->getTables());
         //Test primary key and renaming
         $referenceTable = $schemaTables['reference_table'];
         /**
         * @var Internal $primaryKey
         */
         $primaryKey = $referenceTable->getPrimaryConstraint();
         $columns = $primaryKey->getColumns();
-        $this->assertEquals('tinyint_ref', reset($columns)->getName());
+        self::assertEquals('tinyint_ref', reset($columns)->getName());
         //Test column
         $testTable = $schemaTables['test_table'];
         /**
         * @var Timestamp $timestampColumn
         */
         $timestampColumn = $testTable->getColumnByName('timestamp');
-        $this->assertEquals('CURRENT_TIMESTAMP', $timestampColumn->getOnUpdate());
+        self::assertEquals('CURRENT_TIMESTAMP', $timestampColumn->getOnUpdate());
         //Test disabled
-        $this->assertArrayNotHasKey('varbinary_rename', $testTable->getColumns());
+        self::assertArrayNotHasKey('varbinary_rename', $testTable->getColumns());
         //Test foreign key
         /**
         * @var Reference $foreignKey
         */
         $foreignKey = $testTable->getConstraintByName('some_foreign_key');
-        $this->assertEquals('NO ACTION', $foreignKey->getOnDelete());
-        $this->assertEquals('tinyint_ref', $foreignKey->getReferenceColumn()->getName());
+        self::assertEquals('NO ACTION', $foreignKey->getOnDelete());
+        self::assertEquals('tinyint_ref', $foreignKey->getReferenceColumn()->getName());
     }
 }

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

@@ -85,12 +85,12 @@ public function testOldDiff()
         $generatedSchema = $this->schemaConfig->getDbConfig();
         $diff = $this->schemaDiff->diff($declarativeSchema, $generatedSchema);
         $allChanges = $diff->getAll();
-        $this->assertCount(1, $allChanges);
-        $this->assertEquals(
+        self::assertCount(1, $allChanges);
+        self::assertEquals(
             $this->getBigIntKeyXmlSensitiveData(),
             reset($allChanges)['modify_column'][0]->getNew()->getDiffSensitiveParams()
         );
-        $this->assertEquals(
+        self::assertEquals(
             $this->getBigIntKeyDbSensitiveData(),
             reset($allChanges)['modify_column'][0]->getOld()->getDiffSensitiveParams()
         );

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

@@ -40,7 +40,7 @@ public function setUp()
     public function testSuccessfullRead()
     {
         $schema = $this->reader->read('all');
-        $this->assertEquals($this->getData(), $schema);
+        self::assertEquals($this->getData(), $schema);
     }
 
     /**
@@ -78,6 +78,6 @@ public function testForeignKeyInterpreter()
     {
         $this->updateRevisionTo('foreign_key_interpreter');
         $schema = $this->reader->read('all');
-        $this->assertEquals($this->getData(), $schema);
+        self::assertEquals($this->getData(), $schema);
     }
 }

setup/src/Magento/Setup/Model/Declaration/Schema/Diff/SchemaDiff.php

@@ -71,10 +71,7 @@ public function diff(
         Schema $generatedSchema
     ) {
         $generatedTables = $generatedSchema->getTables();
-        $tableIndex = array_replace(
-            array_flip(array_keys($schema->getTables())),
-            array_flip(array_keys($generatedSchema->getTables()))
-        );
+        $tableIndex = array_flip(array_keys($schema->getTables()));
         $diff = $this->diffFactory->create(
             [
                 'tableIndexes' => $tableIndex,