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"/>

‎app/code/Magento/Catalog/Setup/Patch/Data/ChangePriceAttributeDefaultScope.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
use Magento\Catalog\Setup\CategorySetupFactory;
1111
use Magento\Framework\App\ResourceConnection;
1212
use Magento\Framework\Setup\ModuleDataSetupInterface;
13-
use Magento\Setup\Model\Patch\DataPatchInterface;
14-
use Magento\Setup\Model\Patch\PatchVersionInterface;
13+
use Magento\Framework\Setup\Patch\DataPatchInterface;
14+
use Magento\Framework\Setup\Patch\PatchVersionInterface;
1515

1616
/**
1717
* Class ChangePriceAttributeDefaultScope

‎app/code/Magento/Catalog/Setup/Patch/Data/DisallowUsingHtmlForProductName.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
use Magento\Catalog\Setup\CategorySetupFactory;
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

1515
/**
1616
* Class DisallowUsingHtmlForProductName.

‎app/code/Magento/Catalog/Setup/Patch/Data/InstallDefaultCategories.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
use Magento\Catalog\Setup\CategorySetupFactory;
1212
use Magento\Framework\App\ResourceConnection;
1313
use Magento\Framework\Setup\ModuleDataSetupInterface;
14-
use Magento\Setup\Model\Patch\DataPatchInterface;
15-
use Magento\Setup\Model\Patch\PatchVersionInterface;
14+
use Magento\Framework\Setup\Patch\DataPatchInterface;
15+
use Magento\Framework\Setup\Patch\PatchVersionInterface;
1616

1717
/**
1818
* Class InstallDefaultCategories data patch.

‎app/code/Magento/Catalog/Setup/Patch/Data/SetNewResourceModelsPaths.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
use Magento\Catalog\Setup\CategorySetupFactory;
1111
use Magento\Framework\App\ResourceConnection;
1212
use Magento\Framework\Setup\ModuleDataSetupInterface;
13-
use Magento\Setup\Model\Patch\DataPatchInterface;
14-
use Magento\Setup\Model\Patch\PatchVersionInterface;
13+
use Magento\Framework\Setup\Patch\DataPatchInterface;
14+
use Magento\Framework\Setup\Patch\PatchVersionInterface;
1515

1616
/**
1717
* Class SetNewResourceModelsPaths

‎app/code/Magento/Catalog/Setup/Patch/Data/UpdateDefaultAttributeValue.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
use Magento\Catalog\Setup\CategorySetupFactory;
1111
use Magento\Framework\App\ResourceConnection;
1212
use Magento\Framework\Setup\ModuleDataSetupInterface;
13-
use Magento\Setup\Model\Patch\DataPatchInterface;
14-
use Magento\Setup\Model\Patch\PatchVersionInterface;
13+
use Magento\Framework\Setup\Patch\DataPatchInterface;
14+
use Magento\Framework\Setup\Patch\PatchVersionInterface;
1515

1616
/**
1717
* Class UpdateDefaultAttributeValue

‎app/code/Magento/Catalog/Setup/Patch/Data/UpdateMediaAttributesBackendTypes.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
use Magento\Catalog\Setup\CategorySetupFactory;
1111
use Magento\Framework\App\ResourceConnection;
1212
use Magento\Framework\Setup\ModuleDataSetupInterface;
13-
use Magento\Setup\Model\Patch\DataPatchInterface;
14-
use Magento\Setup\Model\Patch\PatchVersionInterface;
13+
use Magento\Framework\Setup\Patch\DataPatchInterface;
14+
use Magento\Framework\Setup\Patch\PatchVersionInterface;
1515

1616
/**
1717
* Class UpdateMediaAttributesBackendTypes

‎app/code/Magento/Catalog/Setup/Patch/Data/UpdateProductAttributes.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
use Magento\Catalog\Setup\CategorySetupFactory;
1111
use Magento\Framework\App\ResourceConnection;
1212
use Magento\Framework\Setup\ModuleDataSetupInterface;
13-
use Magento\Setup\Model\Patch\DataPatchInterface;
14-
use Magento\Setup\Model\Patch\PatchVersionInterface;
13+
use Magento\Framework\Setup\Patch\DataPatchInterface;
14+
use Magento\Framework\Setup\Patch\PatchVersionInterface;
1515

1616
/**
1717
* Class UpdateProductAttributes

‎app/code/Magento/Catalog/Setup/Patch/Data/UpdateProductMetaDescription.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
use Magento\Eav\Setup\EavSetupFactory;
1111
use Magento\Framework\App\ResourceConnection;
1212
use Magento\Framework\Setup\ModuleDataSetupInterface;
13-
use Magento\Setup\Model\Patch\DataPatchInterface;
14-
use Magento\Setup\Model\Patch\PatchVersionInterface;
13+
use Magento\Framework\Setup\Patch\DataPatchInterface;
14+
use Magento\Framework\Setup\Patch\PatchVersionInterface;
1515

1616
/**
1717
* Class UpdateProductMetaDescription

‎app/code/Magento/Catalog/Setup/Patch/Data/UpgradeWebsiteAttributes.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
use Magento\Framework\EntityManager\MetadataPool;
1313
use Magento\Framework\Exception\LocalizedException;
1414
use Magento\Framework\Setup\ModuleDataSetupInterface;
15-
use Magento\Setup\Model\Patch\DataPatchInterface;
16-
use Magento\Setup\Model\Patch\PatchVersionInterface;
15+
use Magento\Framework\Setup\Patch\DataPatchInterface;
16+
use Magento\Framework\Setup\Patch\PatchVersionInterface;
1717

1818
/**
1919
* Class UpgradeWebsiteAttributes

‎app/code/Magento/Catalog/Setup/Patch/Data/UpgradeWidgetData.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
use Magento\Framework\DB\FieldToConvert;
1313
use Magento\Framework\DB\Select\QueryModifierFactory;
1414
use Magento\Framework\Setup\ModuleDataSetupInterface;
15-
use Magento\Setup\Model\Patch\DataPatchInterface;
16-
use Magento\Setup\Model\Patch\PatchVersionInterface;
15+
use Magento\Framework\Setup\Patch\DataPatchInterface;
16+
use Magento\Framework\Setup\Patch\PatchVersionInterface;
1717
use Magento\Widget\Setup\LayoutUpdateConverter;
1818

1919
/**

‎app/code/Magento/Catalog/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_entity" resource="default" engine="innodb" comment="Catalog Product Table">
1111
<column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" identity="true"
1212
comment="Entity Id"/>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
use Magento\Framework\DB\FieldDataConverterFactory;
1212
use Magento\Framework\DB\Select\QueryModifierFactory;
1313
use Magento\Framework\Setup\ModuleDataSetupInterface;
14-
use Magento\Setup\Model\Patch\DataPatchInterface;
15-
use Magento\Setup\Model\Patch\PatchVersionInterface;
14+
use Magento\Framework\Setup\Patch\DataPatchInterface;
15+
use Magento\Framework\Setup\Patch\PatchVersionInterface;
1616

1717
/**
1818
* Class ConvertSerializedDataToJson

‎app/code/Magento/CatalogInventory/Setup/Patch/Data/CreateDefaultStock.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
use Magento\Eav\Setup\EavSetupFactory;
1111
use Magento\Framework\App\ResourceConnection;
1212
use Magento\Framework\Setup\ModuleDataSetupInterface;
13-
use Magento\Setup\Model\Patch\DataPatchInterface;
14-
use Magento\Setup\Model\Patch\PatchVersionInterface;
13+
use Magento\Framework\Setup\Patch\DataPatchInterface;
14+
use Magento\Framework\Setup\Patch\PatchVersionInterface;
1515

1616
/**
1717
* Class CreateDefaultStock

‎app/code/Magento/CatalogInventory/Setup/Patch/Data/UpdateStockItemsWebsite.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
use Magento\CatalogInventory\Model\Indexer\Stock\Processor;
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

1515
/**
1616
* Class UpdateStockItemsWebsite

‎app/code/Magento/CatalogInventory/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="cataloginventory_stock" resource="default" engine="innodb" comment="Cataloginventory Stock">
1111
<column xsi:type="smallint" name="stock_id" padding="5" unsigned="true" nullable="false" identity="true"
1212
comment="Stock Id"/>

‎app/code/Magento/CatalogRule/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\EntityManager\MetadataPool;
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\Framework\DB\AggregatedFieldDataConverter;
1414
use Magento\Framework\DB\DataConverter\SerializedToJson;
1515
use Magento\Framework\DB\FieldToConvert;

‎app/code/Magento/CatalogRule/Setup/Patch/Data/UpdateClassAliasesForCatalogRules.php

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

99
use Magento\Framework\Setup\ModuleDataSetupInterface;
10-
use Magento\Setup\Model\Patch\DataPatchInterface;
11-
use Magento\Setup\Model\Patch\PatchVersionInterface;
10+
use Magento\Framework\Setup\Patch\DataPatchInterface;
11+
use Magento\Framework\Setup\Patch\PatchVersionInterface;
1212

1313
/**
1414
* Class UpdateClassAliasesForCatalogRules

‎app/code/Magento/CatalogRule/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="catalogrule" resource="default" engine="innodb" comment="CatalogRule">
1111
<column xsi:type="int" name="rule_id" padding="10" unsigned="true" nullable="false" identity="true"
1212
comment="Entity Id"/>

‎app/code/Magento/CatalogSearch/Setup/Patch/Data/SetInitialSearchWeightForAttributes.php

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

77
namespace Magento\CatalogSearch\Setup\Patch\Data;
88

9-
use Magento\Setup\Model\Patch\DataPatchInterface;
10-
use Magento\Setup\Model\Patch\PatchVersionInterface;
9+
use Magento\Framework\Setup\Patch\DataPatchInterface;
10+
use Magento\Framework\Setup\Patch\PatchVersionInterface;
1111
use Magento\Framework\Indexer\IndexerInterfaceFactory;
1212
use Magento\Catalog\Api\ProductAttributeRepositoryInterface;
1313

‎app/code/Magento/CatalogSearch/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_eav_attribute" resource="default" comment="Catalog EAV Attribute Table">
1111
<column xsi:type="float" name="search_weight" unsigned="false" nullable="false"
1212
default="1" comment="Search Weight"/>

‎app/code/Magento/CatalogUrlRewrite/Setup/Patch/Data/CreateUrlAttributes.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
use Magento\Eav\Setup\EavSetupFactory;
1111
use Magento\Framework\App\ResourceConnection;
1212
use Magento\Framework\Setup\ModuleDataSetupInterface;
13-
use Magento\Setup\Model\Patch\DataPatchInterface;
14-
use Magento\Setup\Model\Patch\PatchVersionInterface;
13+
use Magento\Framework\Setup\Patch\DataPatchInterface;
14+
use Magento\Framework\Setup\Patch\PatchVersionInterface;
1515

1616
/**
1717
* Class CreateUrlAttributes

‎app/code/Magento/CatalogUrlRewrite/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_url_rewrite_product_category" resource="default" engine="innodb"
1111
comment="url_rewrite_relation">
1212
<column xsi:type="int" name="url_rewrite_id" padding="10" unsigned="true" nullable="false" identity="false"

‎app/code/Magento/Checkout/Setup/Patch/Data/PrepareInitialCheckoutConfiguration.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
use Magento\Eav\Setup\EavSetupFactory;
1111
use Magento\Framework\App\ResourceConnection;
1212
use Magento\Framework\Setup\ModuleDataSetupInterface;
13-
use Magento\Setup\Model\Patch\DataPatchInterface;
14-
use Magento\Setup\Model\Patch\PatchVersionInterface;
13+
use Magento\Framework\Setup\Patch\DataPatchInterface;
14+
use Magento\Framework\Setup\Patch\PatchVersionInterface;
1515

1616
/**
1717
* Class PrepareInitialCheckoutConfiguration

‎app/code/Magento/CheckoutAgreements/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="checkout_agreement" resource="default" engine="innodb" comment="Checkout Agreement">
1111
<column xsi:type="int" name="agreement_id" padding="10" unsigned="true" nullable="false" identity="true"
1212
comment="Agreement Id"/>

‎app/code/Magento/Cms/Setup/Patch/Data/ConvertWidgetConditionsToJson.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
use Magento\Framework\App\ResourceConnection;
1111
use Magento\Framework\DB\Select\QueryModifierFactory;
1212
use Magento\Framework\Setup\ModuleDataSetupInterface;
13-
use Magento\Setup\Model\Patch\DataPatchInterface;
14-
use Magento\Setup\Model\Patch\PatchVersionInterface;
13+
use Magento\Framework\Setup\Patch\DataPatchInterface;
14+
use Magento\Framework\Setup\Patch\PatchVersionInterface;
1515
use Magento\Framework\DB\AggregatedFieldDataConverter;
1616
use Magento\Framework\DB\FieldToConvert;
1717
use Magento\Framework\EntityManager\MetadataPool;

‎app/code/Magento/Cms/Setup/Patch/Data/CreateDefaultPages.php

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

77
namespace Magento\Cms\Setup\Patch\Data;
88

9-
use Magento\Setup\Model\Patch\DataPatchInterface;
10-
use Magento\Setup\Model\Patch\PatchVersionInterface;
9+
use Magento\Framework\Setup\Patch\DataPatchInterface;
10+
use Magento\Framework\Setup\Patch\PatchVersionInterface;
1111
use Magento\Framework\Module\Setup\Migration;
1212
use Magento\Framework\Setup\ModuleDataSetupInterface;
1313

‎app/code/Magento/Cms/Setup/Patch/Data/UpdatePrivacyPolicyPage.php

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

99
use Magento\Cms\Model\PageFactory;
10-
use Magento\Setup\Model\Patch\DataPatchInterface;
11-
use Magento\Setup\Model\Patch\PatchVersionInterface;
10+
use Magento\Framework\Setup\Patch\DataPatchInterface;
11+
use Magento\Framework\Setup\Patch\PatchVersionInterface;
1212

1313
/**
1414
* Class UpdatePrivacyPolicyPage

‎app/code/Magento/Cms/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="cms_block" resource="default" engine="innodb" comment="CMS Block Table">
1111
<column xsi:type="smallint" name="block_id" padding="6" unsigned="false" nullable="false" identity="true"
1212
comment="Entity Id"/>

0 commit comments

Comments
 (0)