Skip to content

Commit 31938d4

Browse files
committed
#29761: Added CreateAssetFromFileInterface
1 parent 6a48523 commit 31938d4

File tree

7 files changed

+41
-17
lines changed

7 files changed

+41
-17
lines changed

app/code/Magento/MediaGallerySynchronizationApi/Model/CreateAssetFromFile.php renamed to app/code/Magento/MediaGallerySynchronization/Model/CreateAssetFromFile.php

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
*/
66
declare(strict_types=1);
77

8-
namespace Magento\MediaGallerySynchronizationApi\Model;
8+
namespace Magento\MediaGallerySynchronization\Model;
99

1010
use Magento\Framework\App\Filesystem\DirectoryList;
1111
use Magento\Framework\Exception\FileSystemException;
@@ -15,12 +15,12 @@
1515
use Magento\MediaGalleryApi\Api\Data\AssetInterface;
1616
use Magento\MediaGalleryApi\Api\Data\AssetInterfaceFactory;
1717
use Magento\MediaGallerySynchronization\Model\Filesystem\GetFileInfo;
18-
use Magento\MediaGallerySynchronization\Model\GetContentHash;
18+
use Magento\MediaGallerySynchronizationApi\Model\CreateAssetFromFileInterface;
1919

2020
/**
2121
* Create media asset object based on the file information
2222
*/
23-
class CreateAssetFromFile
23+
class CreateAssetFromFile implements CreateAssetFromFileInterface
2424
{
2525
/**
2626
* @var Filesystem
@@ -69,11 +69,7 @@ public function __construct(
6969
}
7070

7171
/**
72-
* Create and format media asset object
73-
*
74-
* @param string $path
75-
* @return AssetInterface
76-
* @throws FileSystemException
72+
* @inheridoc
7773
*/
7874
public function execute(string $path): AssetInterface
7975
{

app/code/Magento/MediaGallerySynchronization/Model/GetAssetFromPath.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
use Magento\MediaGalleryApi\Api\Data\AssetInterface;
1313
use Magento\MediaGalleryApi\Api\Data\AssetInterfaceFactory;
1414
use Magento\MediaGalleryApi\Api\GetAssetsByPathsInterface;
15-
use Magento\MediaGallerySynchronizationApi\Model\CreateAssetFromFile;
15+
use Magento\MediaGallerySynchronizationApi\Model\CreateAssetFromFileInterface;
1616

1717
/**
1818
* Create media asset object based on the file information
@@ -30,19 +30,19 @@ class GetAssetFromPath
3030
private $assetFactory;
3131

3232
/**
33-
* @var CreateAssetFromFile
33+
* @var CreateAssetFromFileInterface
3434
*/
3535
private $createAssetFromFile;
3636

3737
/**
3838
* @param AssetInterfaceFactory $assetFactory
3939
* @param GetAssetsByPathsInterface $getMediaGalleryAssetByPath
40-
* @param CreateAssetFromFile $createAssetFromFile
40+
* @param CreateAssetFromFileInterface $createAssetFromFile
4141
*/
4242
public function __construct(
4343
AssetInterfaceFactory $assetFactory,
4444
GetAssetsByPathsInterface $getMediaGalleryAssetByPath,
45-
CreateAssetFromFile $createAssetFromFile
45+
CreateAssetFromFileInterface $createAssetFromFile
4646
) {
4747
$this->assetFactory = $assetFactory;
4848
$this->getAssetsByPaths = $getMediaGalleryAssetByPath;

app/code/Magento/MediaGallerySynchronization/etc/di.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
<preference for="Magento\MediaGallerySynchronizationApi\Api\SynchronizeInterface" type="Magento\MediaGallerySynchronization\Model\Synchronize"/>
1010
<preference for="Magento\MediaGallerySynchronizationApi\Model\FetchBatchesInterface" type="Magento\MediaGallerySynchronization\Model\FetchBatches"/>
1111
<preference for="Magento\MediaGallerySynchronizationApi\Api\SynchronizeFilesInterface" type="Magento\MediaGallerySynchronization\Model\SynchronizeFiles"/>
12+
<preference for="Magento\MediaGallerySynchronizationApi\Model\CreateAssetFromFileInterface" type="Magento\MediaGallerySynchronization\Model\CreateAssetFromFile"/>
1213
<type name="Magento\MediaGallerySynchronizationApi\Model\ImportFilesComposite">
1314
<arguments>
1415
<argument name="importers" xsi:type="array">
Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
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\MediaGallerySynchronizationApi\Model;
9+
10+
use Magento\Framework\Exception\FileSystemException;
11+
use Magento\MediaGalleryApi\Api\Data\AssetInterface;
12+
13+
/**
14+
* Create media asset object from the media file
15+
*/
16+
interface CreateAssetFromFileInterface
17+
{
18+
/**
19+
* Create media asset object from the media file
20+
*
21+
* @param string $path
22+
* @return AssetInterface
23+
* @throws FileSystemException
24+
*/
25+
public function execute(string $path): AssetInterface;
26+
}

app/code/Magento/MediaGallerySynchronizationApi/composer.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@
33
"description": "Magento module responsible for the media gallery synchronization implementation API",
44
"require": {
55
"php": "~7.3.0||~7.4.0",
6-
"magento/framework": "*"
6+
"magento/framework": "*",
7+
"magento/module-media-gallery-api": "*"
78
},
89
"type": "magento2-module",
910
"license": [

app/code/Magento/MediaGallerySynchronizationMetadata/Plugin/CreateAssetFromFileMetadata.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
use Magento\MediaGalleryApi\Api\Data\AssetInterface;
1313
use Magento\MediaGalleryApi\Api\Data\AssetInterfaceFactory;
1414
use Magento\MediaGalleryMetadataApi\Api\ExtractMetadataInterface;
15-
use Magento\MediaGallerySynchronizationApi\Model\CreateAssetFromFile;
15+
use Magento\MediaGallerySynchronizationApi\Model\CreateAssetFromFileInterface;
1616

1717
/**
1818
* Add metadata to the asset created from file
@@ -52,12 +52,12 @@ public function __construct(
5252
/**
5353
* Add metadata to the asset
5454
*
55-
* @param CreateAssetFromFile $createAssetFromFile
55+
* @param CreateAssetFromFileInterface $subject
5656
* @param AssetInterface $asset
5757
* @return AssetInterface
5858
* @SuppressWarnings(PHPMD.UnusedFormalParameter)
5959
*/
60-
public function afterExecute(CreateAssetFromFile $createAssetFromFile, AssetInterface $asset): AssetInterface
60+
public function afterExecute(CreateAssetFromFileInterface $subject, AssetInterface $asset): AssetInterface
6161
{
6262
$metadata = $this->extractMetadata->execute(
6363
$this->filesystem->getDirectoryRead(DirectoryList::MEDIA)->getAbsolutePath($asset->getPath())

app/code/Magento/MediaGallerySynchronizationMetadata/etc/di.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
</argument>
1414
</arguments>
1515
</type>
16-
<type name="Magento\MediaGallerySynchronizationApi\Model\CreateAssetFromFile">
16+
<type name="Magento\MediaGallerySynchronizationApi\Model\CreateAssetFromFileInterface">
1717
<plugin name="addMetadataToAssetCreatedFromFile" type="Magento\MediaGallerySynchronizationMetadata\Plugin\CreateAssetFromFileMetadata"/>
1818
</type>
1919
</config>

0 commit comments

Comments
 (0)