Skip to content

Commit a1ed0bd

Browse files
rganinrganin
authored
Merge pull request #2143 from magento-trigger/MAGETWO-88054
MAGETWO-88054: Move declarative setup from setup to framework
2 parents 4979ddd + 8bfa1e5 commit a1ed0bd

File tree

460 files changed

+3973
-1783
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

460 files changed

+3973
-1783
lines changed

‎app/code/Magento/AdminNotification/etc/db_schema.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
*/
77
-->
88
<schema xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9-
xsi:noNamespaceSchemaLocation="urn:magento:setup:Model/Declaration/Schema/etc/schema.xsd">
9+
xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
1010
<table name="adminnotification_inbox" resource="default" engine="innodb" comment="Adminnotification Inbox">
1111
<column xsi:type="int" name="notification_id" padding="10" unsigned="true" nullable="false" identity="true"
1212
comment="Notification id"/>

‎app/code/Magento/Analytics/Setup/Patch/Data/PrepareInitialConfig.php

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,9 @@
77
namespace Magento\Analytics\Setup\Patch\Data;
88

99
use Magento\Analytics\Model\Config\Backend\Enabled\SubscriptionHandler;
10-
use Magento\Framework\App\ResourceConnection;
1110
use Magento\Framework\Setup\ModuleDataSetupInterface;
12-
use Magento\Setup\Model\Patch\DataPatchInterface;
13-
use Magento\Setup\Model\Patch\PatchVersionInterface;
11+
use Magento\Framework\Setup\Patch\DataPatchInterface;
12+
use Magento\Framework\Setup\Patch\PatchVersionInterface;
1413

1514
/**
1615
* Initial patch.

‎app/code/Magento/Authorization/Setup/Patch/Data/InitializeAuthRoles.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88

99
use Magento\Framework\App\ResourceConnection;
1010
use Magento\Framework\Setup\ModuleDataSetupInterface;
11-
use Magento\Setup\Model\Patch\DataPatchInterface;
12-
use Magento\Setup\Model\Patch\PatchVersionInterface;
11+
use Magento\Framework\Setup\Patch\DataPatchInterface;
12+
use Magento\Framework\Setup\Patch\PatchVersionInterface;
1313
use Magento\Authorization\Model\Acl\Role\Group as RoleGroup;
1414
use Magento\Authorization\Model\UserContextInterface;
1515

‎app/code/Magento/Authorization/etc/db_schema.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
*/
77
-->
88
<schema xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9-
xsi:noNamespaceSchemaLocation="urn:magento:setup:Model/Declaration/Schema/etc/schema.xsd">
9+
xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
1010
<table name="authorization_role" resource="default" engine="innodb" comment="Admin Role Table">
1111
<column xsi:type="int" name="role_id" padding="10" unsigned="true" nullable="false" identity="true"
1212
comment="Role ID"/>

‎app/code/Magento/Braintree/Setup/Patch/Data/ConvertSerializedDataToJson.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88

99
use Magento\Framework\App\ResourceConnection;
1010
use Magento\Framework\Setup\ModuleDataSetupInterface;
11-
use Magento\Setup\Model\Patch\DataPatchInterface;
12-
use Magento\Setup\Model\Patch\PatchVersionInterface;
11+
use Magento\Framework\Setup\Patch\DataPatchInterface;
12+
use Magento\Framework\Setup\Patch\PatchVersionInterface;
1313

1414
/**
1515
* Convert data fro php native serialized data to JSON.

‎app/code/Magento/Bundle/Setup/Patch/Data/ApplyAttributesUpdate.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88

99
use Magento\Framework\App\ResourceConnection;
1010
use Magento\Framework\Setup\ModuleDataSetupInterface;
11-
use Magento\Setup\Model\Patch\DataPatchInterface;
12-
use Magento\Setup\Model\Patch\PatchVersionInterface;
11+
use Magento\Framework\Setup\Patch\DataPatchInterface;
12+
use Magento\Framework\Setup\Patch\PatchVersionInterface;
1313
use Magento\Eav\Setup\EavSetup;
1414
use Magento\Eav\Setup\EavSetupFactory;
1515

‎app/code/Magento/Bundle/Setup/Patch/Data/UpdateBundleRelatedEntityTytpes.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
use Magento\Eav\Setup\EavSetupFactory;
1010
use Magento\Framework\App\ResourceConnection;
1111
use Magento\Framework\Setup\ModuleDataSetupInterface;
12-
use Magento\Setup\Model\Patch\DataPatchInterface;
13-
use Magento\Setup\Model\Patch\PatchVersionInterface;
12+
use Magento\Framework\Setup\Patch\DataPatchInterface;
13+
use Magento\Framework\Setup\Patch\PatchVersionInterface;
1414
use Magento\Catalog\Api\Data\ProductAttributeInterface;
1515
use Magento\Eav\Setup\EavSetup;
1616

‎app/code/Magento/Bundle/Setup/Patch/Schema/UpdateBundleRelatedSchema.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
namespace Magento\Bundle\Setup\Patch\Schema;
88

99
use Magento\Framework\Setup\SchemaSetupInterface;
10-
use Magento\Setup\Model\Patch\PatchVersionInterface;
11-
use Magento\Setup\Model\Patch\SchemaPatchInterface;
10+
use Magento\Framework\Setup\Patch\PatchVersionInterface;
11+
use Magento\Framework\Setup\Patch\SchemaPatchInterface;
1212

1313
/**
1414
* Class UpdateBundleRelatedSchema

‎app/code/Magento/Bundle/etc/db_schema.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
*/
77
-->
88
<schema xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9-
xsi:noNamespaceSchemaLocation="urn:magento:setup:Model/Declaration/Schema/etc/schema.xsd">
9+
xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
1010
<table name="catalog_product_bundle_option" resource="default" engine="innodb"
1111
comment="Catalog Product Bundle Option">
1212
<column xsi:type="int" name="option_id" padding="10" unsigned="true" nullable="false" identity="true"

‎app/code/Magento/Captcha/etc/db_schema.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
*/
77
-->
88
<schema xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9-
xsi:noNamespaceSchemaLocation="urn:magento:setup:Model/Declaration/Schema/etc/schema.xsd">
9+
xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
1010
<table name="captcha_log" resource="default" engine="innodb" comment="Count Login Attempts">
1111
<column xsi:type="varchar" name="type" nullable="false" length="32" comment="Type"/>
1212
<column xsi:type="varchar" name="value" nullable="false" length="32" comment="Value"/>

0 commit comments

Comments
 (0)