MAGETWO-81030: Schema Validation

- resoving conflicts

Author: rganin

app/etc/di.xml

@@ -1460,9 +1460,9 @@
             <argument name="rules" xsi:type="array">
                 <item name="check_references" xsi:type="object">Magento\Framework\Setup\Declaration\Schema\Declaration\ValidationRules\CheckReferenceColumnHasIndex</item>
                 <item name="real_types" xsi:type="object">Magento\Framework\Setup\Declaration\Schema\Declaration\ValidationRules\RealTypes</item>
-                <item name="check_primary_key" xsi:type="object">Magento\Setup\Model\Declaration\Schema\Declaration\ValidationRules\PrimaryKeyCanBeCreated</item>
-                <item name="inconsistence_references" xsi:type="object">Magento\Setup\Model\Declaration\Schema\Declaration\ValidationRules\IncosistentReferenceDefinition</item>
-                <item name="auto_increment_validation" xsi:type="object">Magento\Setup\Model\Declaration\Schema\Declaration\ValidationRules\AutoIncrementColumnValidation</item>
+                <item name="check_primary_key" xsi:type="object">Magento\Framework\Setup\Declaration\Schema\Declaration\ValidationRules\PrimaryKeyCanBeCreated</item>
+                <item name="inconsistence_references" xsi:type="object">Magento\Framework\Setup\Declaration\Schema\Declaration\ValidationRules\IncosistentReferenceDefinition</item>
+                <item name="auto_increment_validation" xsi:type="object">Magento\Framework\Setup\Declaration\Schema\Declaration\ValidationRules\AutoIncrementColumnValidation</item>
             </argument>
         </arguments>
     </type>

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

@@ -8,7 +8,7 @@
 
 use Magento\Framework\Module\DbVersionInfo;
 use Magento\Framework\Module\ModuleResource;
-use Magento\Setup\Model\Declaration\Schema\Db\DbSchemaReaderInterface;
+use Magento\Framework\Setup\Declaration\Schema\Db\DbSchemaReaderInterface;
 use Magento\TestFramework\Deploy\CliCommand;
 use Magento\TestFramework\Deploy\TableData;
 use Magento\TestFramework\Deploy\TestModuleManager;

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

@@ -6,7 +6,7 @@
 
 namespace Magento\Setup;
 
-use Magento\Setup\Model\Declaration\Schema\SchemaConfig;
+use Magento\Framework\Setup\Declaration\Schema\SchemaConfig;
 use Magento\TestFramework\Deploy\CliCommand;
 use Magento\TestFramework\Deploy\TestModuleManager;
 use Magento\TestFramework\Helper\Bootstrap;