Skip to content

Commit 6cd1dac

Browse files
sivaschenkosivaschenko
committed
#27536: Code review changes
1 parent 49f254a commit 6cd1dac

33 files changed

+701
-262
lines changed

‎app/code/Magento/Catalog/composer.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
"magento/module-directory": "*",
2121
"magento/module-eav": "*",
2222
"magento/module-indexer": "*",
23-
"magento/module-media-content-api": "*",
2423
"magento/module-media-storage": "*",
2524
"magento/module-msrp": "*",
2625
"magento/module-page-cache": "*",

‎app/code/Magento/Catalog/etc/di.xml

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1333,27 +1333,4 @@
13331333
</argument>
13341334
</arguments>
13351335
</type>
1336-
<type name="Magento\Catalog\Observer\MediaContent\Category">
1337-
<arguments>
1338-
<argument name="fields" xsi:type="array">
1339-
<item name="image" xsi:type="string">image</item>
1340-
<item name="description" xsi:type="string">description</item>
1341-
</argument>
1342-
</arguments>
1343-
</type>
1344-
<type name="Magento\Catalog\Observer\MediaContent\Product">
1345-
<arguments>
1346-
<argument name="fields" xsi:type="array">
1347-
<item name="description" xsi:type="string">description</item>
1348-
<item name="short_description" xsi:type="string">short_description</item>
1349-
</argument>
1350-
</arguments>
1351-
</type>
1352-
<type name="Magento\MediaContentApi\Api\ExtractAssetFromContentInterface">
1353-
<arguments>
1354-
<argument name="searchPatterns" xsi:type="array">
1355-
<item name="catalog_image" xsi:type="string">/^\/?media\/(.*)/</item>
1356-
</argument>
1357-
</arguments>
1358-
</type>
13591336
</config>

‎app/code/Magento/Catalog/etc/events.xml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -67,10 +67,4 @@
6767
<event name="catalog_category_prepare_save">
6868
<observer name="additional_authorization" instance="Magento\Catalog\Observer\CategoryDesignAuthorization" />
6969
</event>
70-
<event name="catalog_category_save_after">
71-
<observer name="media_content_catalog_category_save_after" instance="Magento\Catalog\Observer\MediaContent\Category" />
72-
</event>
73-
<event name="catalog_product_save_after">
74-
<observer name="media_content_catalog_product_save_after" instance="Magento\Catalog\Observer\MediaContent\Product" />
75-
</event>
7670
</config>

‎app/code/Magento/Cms/composer.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
"magento/module-backend": "*",
1111
"magento/module-catalog": "*",
1212
"magento/module-email": "*",
13-
"magento/module-media-content-api": "*",
1413
"magento/module-media-storage": "*",
1514
"magento/module-store": "*",
1615
"magento/module-theme": "*",

‎app/code/Magento/Cms/etc/di.xml

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -243,25 +243,4 @@
243243
</arguments>
244244
</type>
245245
<preference for="Magento\Cms\Model\Page\CustomLayoutRepositoryInterface" type="Magento\Cms\Model\Page\CustomLayout\CustomLayoutRepository" />
246-
<type name="Magento\Cms\Observer\MediaContent\Block">
247-
<arguments>
248-
<argument name="fields" xsi:type="array">
249-
<item name="content" xsi:type="string">content</item>
250-
</argument>
251-
</arguments>
252-
</type>
253-
<type name="Magento\Cms\Observer\MediaContent\Page">
254-
<arguments>
255-
<argument name="fields" xsi:type="array">
256-
<item name="content" xsi:type="string">content</item>
257-
</argument>
258-
</arguments>
259-
</type>
260-
<type name="Magento\MediaContentApi\Api\ExtractAssetFromContentInterface">
261-
<arguments>
262-
<argument name="searchPatterns" xsi:type="array">
263-
<item name="media_gallery" xsi:type="string">/{{media url="?(.*?)"?}}/</item>
264-
</argument>
265-
</arguments>
266-
</type>
267246
</config>

‎app/code/Magento/Cms/etc/events.xml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,4 @@
3939
<event name="cms_page_prepare_save">
4040
<observer name="validate_cms_page" instance="Magento\Cms\Observer\PageValidatorObserver" />
4141
</event>
42-
<event name="cms_page_save_after">
43-
<observer name="media_content_cms_page_save_after" instance="\Magento\Cms\Observer\MediaContent\Page" />
44-
</event>
45-
<event name="cms_block_save_after">
46-
<observer name="media_content_cms_block_save_after" instance="\Magento\Cms\Observer\MediaContent\Block" />
47-
</event>
4842
</config>

‎app/code/Magento/MediaContent/Model/ContentProcessor.php renamed to ‎app/code/Magento/MediaContent/Model/UpdateRelations.php

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,18 +11,20 @@
1111
use Magento\Framework\Exception\CouldNotSaveException;
1212
use Magento\Framework\Exception\IntegrationException;
1313
use Magento\MediaContentApi\Api\AssignAssetInterface;
14+
use Magento\MediaContentApi\Api\ExtractAssetFromContentInterface;
1415
use Magento\MediaContentApi\Api\GetAssetsUsedInContentInterface;
1516
use Magento\MediaContentApi\Api\UnassignAssetInterface;
17+
use Magento\MediaContentApi\Api\UpdateRelationsInterface;
1618
use Magento\MediaGalleryApi\Api\Data\AssetInterface;
1719
use Psr\Log\LoggerInterface;
1820

1921
/**
2022
* Process relation managing between media asset and content: assign or unassign relation if exists.
2123
*/
22-
class ContentProcessor
24+
class UpdateRelations implements UpdateRelationsInterface
2325
{
2426
/**
25-
* @var ExtractAssetFromContent
27+
* @var ExtractAssetFromContentInterface
2628
*/
2729
private $extractAssetFromContent;
2830

@@ -47,16 +49,14 @@ class ContentProcessor
4749
private $logger;
4850

4951
/**
50-
* ContentProcessor constructor.
51-
*
52-
* @param ExtractAssetFromContent $extractAssetFromContent
52+
* @param ExtractAssetFromContentInterface $extractAssetFromContent
5353
* @param AssignAssetInterface $assignAsset
5454
* @param GetAssetsUsedInContentInterface $getAssetsUsedInContent
5555
* @param UnassignAssetInterface $unassignAsset
5656
* @param LoggerInterface $logger
5757
*/
5858
public function __construct(
59-
ExtractAssetFromContent $extractAssetFromContent,
59+
ExtractAssetFromContentInterface $extractAssetFromContent,
6060
AssignAssetInterface $assignAsset,
6161
GetAssetsUsedInContentInterface $getAssetsUsedInContent,
6262
UnassignAssetInterface $unassignAsset,

‎app/code/Magento/MediaContent/etc/di.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,6 @@
1010
<preference for="Magento\MediaContentApi\Api\UnassignAssetInterface" type="Magento\MediaContent\Model\UnassignAsset"/>
1111
<preference for="Magento\MediaContentApi\Api\GetAssetsUsedInContentInterface" type="Magento\MediaContent\Model\GetAssetsUsedInContent"/>
1212
<preference for="Magento\MediaContentApi\Api\GetContentWithAssetInterface" type="Magento\MediaContent\Model\GetContentWithAsset"/>
13-
<preference for="Magento\MediaContentApi\Api\ModelProcessorInterface" type="Magento\MediaContent\Model\ModelProcessor"/>
1413
<preference for="Magento\MediaContentApi\Api\ExtractAssetFromContentInterface" type="Magento\MediaContent\Model\ExtractAssetFromContent"/>
14+
<preference for="Magento\MediaContentApi\Api\UpdateRelationsInterface" type="Magento\MediaContent\Model\UpdateRelations"/>
1515
</config>

‎app/code/Magento/MediaContentApi/Api/ModelProcessorInterface.php

Lines changed: 0 additions & 26 deletions
This file was deleted.

‎app/code/Magento/MediaContentApi/Api/UpdateRelationsInterface.php

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
<?php
2+
/**
3+
* Copyright © Magento, Inc. All rights reserved.
4+
* See COPYING.txt for license details.
5+
*/
6+
declare(strict_types=1);
7+
8+
namespace Magento\MediaContentApi\Api;
9+
10+
use Magento\Framework\Exception\CouldNotDeleteException;
11+
use Magento\Framework\Exception\CouldNotSaveException;
12+
use Magento\Framework\Exception\IntegrationException;
13+
use Magento\MediaContentApi\Api\AssignAssetInterface;
14+
use Magento\MediaContentApi\Api\ExtractAssetFromContentInterface;
15+
use Magento\MediaContentApi\Api\GetAssetsUsedInContentInterface;
16+
use Magento\MediaContentApi\Api\UnassignAssetInterface;
17+
use Magento\MediaGalleryApi\Api\Data\AssetInterface;
18+
use Psr\Log\LoggerInterface;
19+
20+
/**
21+
* Process relation managing between media asset and content: assign or unassign relation if exists.
22+
*/
23+
interface UpdateRelationsInterface
24+
{
25+
/**
26+
* Create new relation between media asset and content or updated existing
27+
*
28+
* @param string $type
29+
* @param string $field
30+
* @param string $entityId
31+
* @param string $data
32+
*/
33+
public function execute(string $type, string $field, string $entityId, string $data): void;
34+
}

0 commit comments

Comments
 (0)