#1578: Move MediaGallery related modules to Magento core

- code review fixes
magento · Jul 20, 2020 · 64c2af4 · 64c2af4
1 parent deac2a2
commit 64c2af4
Show file tree

Hide file tree

Showing 30 changed files with 33 additions and 66 deletions.
diff --git a/AdobeStockImageAdminUi/etc/config.xml b/AdobeStockImageAdminUi/etc/config.xml
diff --git a/...aContentSynchronization/Model/Consume.php → ...ContentSynchronization/Model/Consumer.php b/...aContentSynchronization/Model/Consume.php → ...ContentSynchronization/Model/Consumer.php
@@ -12,7 +12,7 @@
 /**
  * Media content synchronization queue consumer.
  */
-class Consume
+class Consumer
 {
     /**
      * @var SynchronizeInterface

diff --git a/MediaContentSynchronization/Plugin/SynchronizeMediaContent.php b/MediaContentSynchronization/Plugin/SynchronizeMediaContent.php
@@ -9,7 +9,7 @@
 
 use Magento\MediaContentSynchronization\Model\Publish;
 use Magento\Framework\Exception\LocalizedException;
-use Magento\MediaGallerySynchronization\Model\Consume;
+use Magento\MediaGallerySynchronization\Model\Consumer;
 
 /**
  * Run media content synchronization after the media files consumer finish files synchronization.
@@ -32,10 +32,10 @@ public function __construct(Publish $publish)
     /**
      * Publish content synchronization request message to the queue.
      *
-     * @param Consume $subject
+     * @param Consumer $subject
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
-    public function afterExecute(Consume $subject): void
+    public function afterExecute(Consumer $subject): void
     {
         $this->publish->execute();
     }

diff --git a/MediaContentSynchronization/etc/communication.xml b/MediaContentSynchronization/etc/communication.xml
@@ -9,6 +9,6 @@
         xsi:noNamespaceSchemaLocation="urn:magento:framework:Communication/etc/communication.xsd">
     <topic name="media.content.synchronization" is_synchronous="false" request="string[]">
         <handler name="media.content.synchronization.handler"
-                 type="Magento\MediaContentSynchronization\Model\Consume" method="execute"/>
+                 type="Magento\MediaContentSynchronization\Model\Consumer" method="execute"/>
     </topic>
 </config>
diff --git a/MediaContentSynchronization/etc/di.xml b/MediaContentSynchronization/etc/di.xml
@@ -14,7 +14,7 @@
             </argument>
         </arguments>
     </type>
-    <type name="Magento\MediaGallerySynchronization\Model\Consume">
+    <type name="Magento\MediaGallerySynchronization\Model\Consumer">
         <plugin name="synchronize_media_content"
                 type="Magento\MediaContentSynchronization\Plugin\SynchronizeMediaContent"/>
     </type>

diff --git a/MediaContentSynchronization/etc/queue_consumer.xml b/MediaContentSynchronization/etc/queue_consumer.xml
@@ -7,5 +7,5 @@
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework-message-queue:etc/consumer.xsd">
     <consumer name="media.content.synchronization" queue="media.content.synchronization"
-              connection="db" handler="Magento\MediaContentSynchronization\Model\Consume::execute"/>
+              connection="db" handler="Magento\MediaContentSynchronization\Model\Consumer::execute"/>
 </config>
diff --git a/MediaGalleryMetadataApi/Api/ExtractMetadataInterface.php b/MediaGalleryMetadataApi/Api/ExtractMetadataInterface.php
@@ -8,7 +8,6 @@
 
 namespace Magento\MediaGalleryMetadataApi\Api;
 
-use Magento\Framework\Exception\LocalizedException;
 use Magento\MediaGalleryMetadataApi\Api\Data\MetadataInterface;
 
 /**

diff --git a/MediaGalleryMetadataApi/Model/AddMetadataComposite.php b/MediaGalleryMetadataApi/Model/AddMetadataComposite.php
@@ -14,7 +14,7 @@
 /**
  * Metadata writer pool
  */
-class AddMetadataComposite
+class AddMetadataComposite implements AddMetadataInterface
 {
     /**
      * @var AddMetadataInterface[]

diff --git a/MediaGalleryRenditions/Model/Config.php b/MediaGalleryRenditions/Model/Config.php
@@ -8,7 +8,7 @@
 
 namespace Magento\MediaGalleryRenditions\Model;
 
-use Magento\MediaGalleryRenditionsApi\Model\ConfigInterface;
+use Magento\MediaGalleryRenditionsApi\Api\ConfigInterface;
 use Magento\Framework\App\Config\ScopeConfigInterface;
 
 /**

diff --git a/...ryRenditionsApi/Model/ConfigInterface.php → ...leryRenditionsApi/Api/ConfigInterface.php b/...ryRenditionsApi/Model/ConfigInterface.php → ...leryRenditionsApi/Api/ConfigInterface.php
@@ -6,7 +6,7 @@
 
 declare(strict_types=1);
 
-namespace Magento\MediaGalleryRenditionsApi\Model;
+namespace Magento\MediaGalleryRenditionsApi\Api;
 
 /**
  * Class responsible for providing API access to Media Gallery Renditions system configuration

diff --git a/...aGallerySynchronization/Model/Consume.php → ...GallerySynchronization/Model/Consumer.php b/...aGallerySynchronization/Model/Consume.php → ...GallerySynchronization/Model/Consumer.php
@@ -12,7 +12,7 @@
 /**
  * Media gallery image synchronization queue consumer.
  */
-class Consume
+class Consumer
 {
     /**
      * @var SynchronizeInterface

diff --git a/MediaGallerySynchronization/etc/communication.xml b/MediaGallerySynchronization/etc/communication.xml
@@ -9,6 +9,6 @@
         xsi:noNamespaceSchemaLocation="urn:magento:framework:Communication/etc/communication.xsd">
     <topic name="media.gallery.synchronization" is_synchronous="false" request="string[]">
         <handler name="media.gallery.synchronization.handler"
-                 type="Magento\MediaGallerySynchronization\Model\Consume" method="execute"/>
+                 type="Magento\MediaGallerySynchronization\Model\Consumer" method="execute"/>
     </topic>
 </config>
diff --git a/MediaGallerySynchronization/etc/queue_consumer.xml b/MediaGallerySynchronization/etc/queue_consumer.xml
@@ -7,5 +7,5 @@
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework-message-queue:etc/consumer.xsd">
     <consumer name="media.gallery.synchronization" queue="media.gallery.synchronization"
-              connection="db" handler="Magento\MediaGallerySynchronization\Model\Consume::execute"/>
+              connection="db" handler="Magento\MediaGallerySynchronization\Model\Consumer::execute"/>
 </config>
diff --git a/MediaGallerySynchronizationApi/Model/FetchBatchesInterface.php b/MediaGallerySynchronizationApi/Model/FetchBatchesInterface.php
@@ -7,8 +7,6 @@
 
 namespace Magento\MediaGallerySynchronizationApi\Model;
 
-use Magento\Framework\Exception\LocalizedException;
-
 /**
  * Fetch data from database in batches
  */

diff --git a/MediaGalleryUi/Controller/Adminhtml/Image/Delete.php b/MediaGalleryUi/Controller/Adminhtml/Image/Delete.php
@@ -102,17 +102,14 @@ public function execute()
             $assets = $this->getAssetsByIds->execute($imageIds);
             $this->deleteImage->execute($assets);
             $responseCode = self::HTTP_OK;
-            $message = count($imageIds) > 1 ?
-                     'assets have been' :
-                     ' asset "' . current($assets)->getTitle() . '" has been';
+            if (count($imageIds) === 1) {
+                $message = sprintf('The asset %s has been successfully deleted', current($assets)->getTitle());
+            } else {
+                $message = 'Assets have been successfully deleted';
+            }
             $responseContent = [
                 'success' => true,
-                'message' => __(
-                    'The %message successfully deleted',
-                    [
-                        'message' => $message
-                    ]
-                ),
+                'message' => __($message),
             ];
         } catch (LocalizedException $exception) {
             $responseCode = self::HTTP_BAD_REQUEST;

diff --git a/MediaGalleryUi/Model/AssetDetailsProvider/CreatedAt.php b/MediaGalleryUi/Model/AssetDetailsProvider/CreatedAt.php
@@ -7,8 +7,6 @@
 
 namespace Magento\MediaGalleryUi\Model\AssetDetailsProvider;
 
-use Magento\Framework\Exception\IntegrationException;
-use Magento\MediaContentApi\Api\GetContentByAssetIdsInterface;
 use Magento\MediaGalleryApi\Api\Data\AssetInterface;
 use Magento\MediaGalleryUi\Model\AssetDetailsProviderInterface;
 

diff --git a/MediaGalleryUi/Model/AssetDetailsProvider/Height.php b/MediaGalleryUi/Model/AssetDetailsProvider/Height.php
@@ -8,7 +8,6 @@
 namespace Magento\MediaGalleryUi\Model\AssetDetailsProvider;
 
 use Magento\Framework\Exception\IntegrationException;
-use Magento\MediaContentApi\Api\GetContentByAssetIdsInterface;
 use Magento\MediaGalleryApi\Api\Data\AssetInterface;
 use Magento\MediaGalleryUi\Model\AssetDetailsProviderInterface;
 

diff --git a/MediaGalleryUi/Model/AssetDetailsProvider/Size.php b/MediaGalleryUi/Model/AssetDetailsProvider/Size.php
@@ -8,7 +8,6 @@
 namespace Magento\MediaGalleryUi\Model\AssetDetailsProvider;
 
 use Magento\Framework\Exception\IntegrationException;
-use Magento\MediaContentApi\Api\GetContentByAssetIdsInterface;
 use Magento\MediaGalleryApi\Api\Data\AssetInterface;
 use Magento\MediaGalleryUi\Model\AssetDetailsProviderInterface;
 

diff --git a/MediaGalleryUi/Model/AssetDetailsProvider/Type.php b/MediaGalleryUi/Model/AssetDetailsProvider/Type.php
@@ -8,7 +8,6 @@
 namespace Magento\MediaGalleryUi\Model\AssetDetailsProvider;
 
 use Magento\Framework\Exception\IntegrationException;
-use Magento\MediaContentApi\Api\GetContentByAssetIdsInterface;
 use Magento\MediaGalleryApi\Api\Data\AssetInterface;
 use Magento\MediaGalleryUi\Model\AssetDetailsProviderInterface;
 

diff --git a/MediaGalleryUi/Model/AssetDetailsProvider/UpdatedAt.php b/MediaGalleryUi/Model/AssetDetailsProvider/UpdatedAt.php
@@ -7,8 +7,6 @@
 
 namespace Magento\MediaGalleryUi\Model\AssetDetailsProvider;
 
-use Magento\Framework\Exception\IntegrationException;
-use Magento\MediaContentApi\Api\GetContentByAssetIdsInterface;
 use Magento\MediaGalleryApi\Api\Data\AssetInterface;
 use Magento\MediaGalleryUi\Model\AssetDetailsProviderInterface;
 

diff --git a/MediaGalleryUi/Model/AssetDetailsProvider/UsedIn.php b/MediaGalleryUi/Model/AssetDetailsProvider/UsedIn.php
@@ -71,15 +71,11 @@ private function getUsedIn(int $assetId): array
         foreach ($contentIdentities as $contentIdentity) {
             $entityId = $contentIdentity->getEntityId();
             $type = $this->contentTypes[$contentIdentity->getEntityType()] ?? $contentIdentity->getEntityType();
-            
+
             if (!isset($entityIds[$type])) {
                 $usedIn[$type] = 1;
             } elseif ($entityIds[$type]['entity_id'] !== $entityId) {
-                if (isset($usedIn[$type])) {
-                    $usedIn[$type] +=1;
-                } else {
-                    $usedIn[$type] = $usedIn[$type]+1;
-                }
+                    ++$usedIn[$type];
             }
             $entityIds[$type]['entity_id'] = $entityId;
         }

diff --git a/MediaGalleryUi/Model/AssetDetailsProvider/Width.php b/MediaGalleryUi/Model/AssetDetailsProvider/Width.php
@@ -8,7 +8,6 @@
 namespace Magento\MediaGalleryUi\Model\AssetDetailsProvider;
 
 use Magento\Framework\Exception\IntegrationException;
-use Magento\MediaContentApi\Api\GetContentByAssetIdsInterface;
 use Magento\MediaGalleryApi\Api\Data\AssetInterface;
 use Magento\MediaGalleryUi\Model\AssetDetailsProviderInterface;
 

diff --git a/MediaGalleryUi/Model/DeleteImage.php b/MediaGalleryUi/Model/DeleteImage.php
@@ -52,11 +52,10 @@ public function __construct(
     }
 
     /**
-     * Delete asset image physically from file storage and from data storage via MediaGallery plugin.
-     *
-     * @see \Magento\MediaGallery\Plugin\Wysiwyg\Images\Storage
+     * Delete asset image physically from file storage and from data storage.
      *
      * @param AssetInterface[] $assets
+     * @throws LocalizedException
      */
     public function execute(array $assets): void
     {

diff --git a/MediaGalleryUi/Model/Listing/DataProvider.php b/MediaGalleryUi/Model/Listing/DataProvider.php
@@ -15,7 +15,6 @@
 use Magento\Framework\App\RequestInterface;
 use Magento\Framework\View\Element\UiComponent\DataProvider\CollectionFactory;
 use Magento\Framework\View\Element\UiComponent\DataProvider\DataProvider as UiComponentDataProvider;
-use Magento\Framework\View\Element\UiComponent\DataProvider\SearchResult;
 use Magento\MediaGalleryUi\Ui\Component\Listing\Provider;
 
 /**

diff --git a/MediaGalleryUi/Plugin/ResizeSyncedFiles.php b/MediaGalleryUi/Plugin/ResizeSyncedFiles.php
@@ -10,6 +10,9 @@
 use Magento\MediaGallerySynchronization\Model\SynchronizeFiles;
 use Magento\Cms\Model\Wysiwyg\Images\Storage;
 
+/**
+ * Create resizes files that were synced
+ */
 class ResizeSyncedFiles
 {
     /**

diff --git a/MediaGalleryUi/Ui/Component/ImageUploaderStandAlone.php b/MediaGalleryUi/Ui/Component/ImageUploaderStandAlone.php
@@ -24,9 +24,10 @@ public function prepare(): void
             array_replace_recursive(
                 (array) $this->getData('config'),
                 [
-                    // phpcs:disable Magento2.Files.LineLength, Generic.Files.LineLength
-                    'actionsPath' => 'standalone_media_gallery_listing.standalone_media_gallery_listing.media_gallery_columns.thumbnail_url',
-                    'directoriesPath' => 'standalone_media_gallery_listing.standalone_media_gallery_listing.media_gallery_directories',
+                    'actionsPath' => 'standalone_media_gallery_listing.standalone_media_gallery_listing' .
+                        '.media_gallery_columns.thumbnail_url',
+                    'directoriesPath' => 'standalone_media_gallery_listing.standalone_media_gallery_listing' .
+                        '.media_gallery_directories',
                     'messagesPath' => 'standalone_media_gallery_listing.standalone_media_gallery_listing.messages'
                 ]
             )

diff --git a/MediaGalleryUi/Ui/Component/Listing/Columns/Url.php b/MediaGalleryUi/Ui/Component/Listing/Columns/Url.php
@@ -11,7 +11,6 @@
 use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Framework\View\Element\UiComponent\ContextInterface;
 use Magento\Framework\View\Element\UiComponentFactory;
-use Magento\Store\Model\Store;
 use Magento\Store\Model\StoreManagerInterface;
 use Magento\Ui\Component\Listing\Columns\Column;
 use Magento\Cms\Helper\Wysiwyg\Images;

diff --git a/MediaGalleryUi/Ui/Component/Listing/Provider.php b/MediaGalleryUi/Ui/Component/Listing/Provider.php
@@ -81,7 +81,7 @@ public function getData()
             $data[$key]['content_type'] = strtoupper(str_replace('image/', '', $asset['content_type']));
             $data[$key]['preview_url'] = $asset['path'];
             $data[$key]['keywords'] = isset($keywords[$asset['id']]) ? implode(",", $keywords[$asset['id']]) : '';
-            $data[$key]['source'] = empty($asset['source']) ? 'Local' : $asset['source'];
+            $data[$key]['source'] = empty($asset['source']) ? __('Local') : $asset['source'];
         }
         return $data;
     }

diff --git a/MediaGalleryUi/etc/config.xml b/MediaGalleryUi/etc/config.xml
@@ -9,7 +9,7 @@
     <default>
         <system>
             <media_gallery>
-                <enabled>1</enabled>
+                <enabled>0</enabled>
             </media_gallery>
         </system>
     </default>

diff --git a/MediaGalleryUiApi/Api/ConfigInterface.php b/MediaGalleryUiApi/Api/ConfigInterface.php
@@ -14,7 +14,7 @@
 interface ConfigInterface
 {
     /**
-     * Check if masonry grid UI is enabled for Magento media gallery
+     * Check if grid UI is enabled for Magento media gallery
      *
      * @return bool
      */
-Original file line number
+Diff line change
@@ Expand Up / @@ -8,7 +8,6 @@ @@
     namespace Magento\MediaGalleryMetadataApi\Api;
-    use Magento\Framework\Exception\LocalizedException;
     use Magento\MediaGalleryMetadataApi\Api\Data\MetadataInterface;
     /**
@@ Expand Down @@