Skip to content

Commit 7ac3bf6

Browse files
committed
Revert path related changes, use correct classes instead depricated
1 parent ef2731b commit 7ac3bf6

File tree

4 files changed

+8
-11
lines changed

4 files changed

+8
-11
lines changed

app/code/Magento/MediaGallery/Model/ResourceModel/DeleteAssetsByPaths.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,6 @@ public function execute(array $paths): void
5555
foreach ($paths as $path) {
5656
try {
5757
$this->validateDirectoryPath($path);
58-
$path = count(explode('/', $path)) > 1 ? $path : '/' . $path;
5958
$this->deleteAssetsByDirectoryPath($path);
6059
} catch (\Exception $exception) {
6160
$this->logger->critical($exception);

app/code/Magento/MediaGallery/Plugin/Wysiwyg/Images/Storage.php

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

99
namespace Magento\MediaGallery\Plugin\Wysiwyg\Images;
1010

11-
use Magento\Cms\Model\Wysiwyg\Images;
1211
use Magento\MediaGalleryApi\Api\DeleteAssetsByPathsInterface;
1312
use Magento\Cms\Model\Wysiwyg\Images\Storage as StorageSubject;
1413
use Magento\Framework\App\Filesystem\DirectoryList;
@@ -75,7 +74,6 @@ public function afterDeleteFile(StorageSubject $subject, StorageSubject $result,
7574
}
7675

7776
try {
78-
7977
$this->deleteMediaAssetByPath->execute([$relativePath]);
8078
} catch (\Exception $exception) {
8179
$this->logger->critical($exception);

dev/tests/integration/testsuite/Magento/MediaGallery/_files/media_asset.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
use Magento\MediaGalleryApi\Api\Data\AssetInterface;
99
use Magento\MediaGalleryApi\Api\Data\AssetInterfaceFactory;
10-
use Magento\MediaGalleryApi\Model\Asset\Command\SaveInterface;
10+
use Magento\MediaGalleryApi\Api\SaveAssetsInterface;
1111
use Magento\TestFramework\Helper\Bootstrap;
1212

1313
$objectManager = Bootstrap::getObjectManager();
@@ -26,6 +26,6 @@
2626
'size' => 12877
2727
]
2828
);
29-
/** @var SaveInterface $mediaSave */
30-
$mediaSave = $objectManager->get(SaveInterface::class);
31-
$mediaId = $mediaSave->execute($mediaAsset);
29+
/** @var SaveAssetsInterface $mediaSave */
30+
$mediaSave = $objectManager->get(SaveAssetsInterface::class);
31+
$mediaId = $mediaSave->execute([$mediaAsset]);

dev/tests/integration/testsuite/Magento/MediaGallery/_files/media_asset_rollback.php

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

8-
use Magento\MediaGalleryApi\Model\Asset\Command\DeleteByPathInterface;
8+
use Magento\MediaGalleryApi\Api\DeleteAssetsByPathsInterface;
99
use Magento\TestFramework\Helper\Bootstrap;
1010

1111
$objectManager = Bootstrap::getObjectManager();
1212

13-
/** @var DeleteByPathInterface $mediaSave */
14-
$mediaAssetDelete = $objectManager->get(DeleteByPathInterface::class);
13+
/** @var DeleteAssetsByPathsInterface $mediaSave */
14+
$mediaAssetDelete = $objectManager->get(DeleteAssetsByPathsInterface::class);
1515

1616
try {
17-
$mediaAssetDelete->execute('testDirectory/path.jpg');
17+
$mediaAssetDelete->execute(['testDirectory/path.jpg']);
1818
} catch (\Exception $exception) {
1919

2020
}

0 commit comments

Comments
 (0)