Skip to content

Commit 962ef05

Browse files
authored
ENGCOM-4794: Removes usage of classes which don't exist from DB migration scripts. #22446
2 parents 2eef26e + c2eb5e3 commit 962ef05

File tree

2 files changed

+11
-9
lines changed

2 files changed

+11
-9
lines changed

app/code/Magento/Catalog/Setup/CategorySetup.php

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
use Magento\Catalog\Block\Adminhtml\Category\Helper\Pricestep;
1111
use Magento\Catalog\Block\Adminhtml\Category\Helper\Sortby\Available;
1212
use Magento\Catalog\Block\Adminhtml\Category\Helper\Sortby\DefaultSortby;
13-
use Magento\Catalog\Block\Adminhtml\Product\Helper\Form\BaseImage;
1413
use Magento\Catalog\Block\Adminhtml\Product\Helper\Form\Category as CategoryFormHelper;
1514
use Magento\Catalog\Block\Adminhtml\Product\Helper\Form\Weight as WeightFormHelper;
1615
use Magento\Catalog\Model\Attribute\Backend\Customlayoutupdate;
@@ -54,6 +53,8 @@
5453
use Magento\Theme\Model\Theme\Source\Theme;
5554

5655
/**
56+
* Setup category with default entities.
57+
*
5758
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
5859
*/
5960
class CategorySetup extends EavSetup
@@ -593,7 +594,6 @@ public function getDefaultEntities()
593594
'label' => 'Base Image',
594595
'input' => 'media_image',
595596
'frontend' => ImageFrontendModel::class,
596-
'input_renderer' => BaseImage::class,
597597
'required' => false,
598598
'sort_order' => 0,
599599
'global' => ScopedAttributeInterface::SCOPE_STORE,
@@ -626,7 +626,6 @@ public function getDefaultEntities()
626626
'type' => 'varchar',
627627
'label' => 'Media Gallery',
628628
'input' => 'gallery',
629-
'backend' => Media::class,
630629
'required' => false,
631630
'sort_order' => 4,
632631
'group' => 'Images',

app/code/Magento/Customer/Setup/Patch/Data/MigrateStoresAllowedCountriesToWebsite.php

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,14 @@
88

99
use Magento\Directory\Model\AllowedCountries;
1010
use Magento\Framework\Setup\ModuleDataSetupInterface;
11-
use Magento\Directory\Model\AllowedCountriesFactory;
1211
use Magento\Store\Model\ScopeInterface;
1312
use Magento\Store\Model\StoreManagerInterface;
1413
use Magento\Framework\Setup\Patch\DataPatchInterface;
1514
use Magento\Framework\Setup\Patch\PatchVersionInterface;
1615

16+
/**
17+
* Migrate store allowed countries to website.
18+
*/
1719
class MigrateStoresAllowedCountriesToWebsite implements DataPatchInterface, PatchVersionInterface
1820
{
1921
/**
@@ -27,7 +29,7 @@ class MigrateStoresAllowedCountriesToWebsite implements DataPatchInterface, Patc
2729
private $storeManager;
2830

2931
/**
30-
* @var AllowedCountriesFactory
32+
* @var AllowedCountries
3133
*/
3234
private $allowedCountries;
3335

@@ -48,10 +50,11 @@ public function __construct(
4850
}
4951

5052
/**
51-
* {@inheritdoc}
53+
* @inheritdoc
5254
*/
5355
public function apply()
5456
{
57+
5558
$this->moduleDataSetup->getConnection()->beginTransaction();
5659

5760
try {
@@ -149,7 +152,7 @@ private function mergeAllowedCountries(array $countries, array $newCountries, $i
149152
}
150153

151154
/**
152-
* {@inheritdoc}
155+
* @inheritdoc
153156
*/
154157
public static function getDependencies()
155158
{
@@ -159,15 +162,15 @@ public static function getDependencies()
159162
}
160163

161164
/**
162-
* {@inheritdoc}
165+
* @inheritdoc
163166
*/
164167
public static function getVersion()
165168
{
166169
return '2.0.9';
167170
}
168171

169172
/**
170-
* {@inheritdoc}
173+
* @inheritdoc
171174
*/
172175
public function getAliases()
173176
{

0 commit comments

Comments
 (0)