Merge pull request #1701 from sivaschenko/removed-media-modules

Media modules moved to magento2 repo

Author: lenaorobei

.coveralls.yml

@@ -10,8 +10,8 @@
 
 use Magento\AdobeImsApi\Api\ConfigInterface;
 use Magento\AdobeStockClientApi\Api\ClientInterface;
-use Magento\Config\Block\System\Config\Form\Field;
 use Magento\Backend\Block\Template\Context;
+use Magento\Config\Block\System\Config\Form\Field;
 use Magento\Framework\Data\Form\Element\AbstractElement;
 
 /**

.travis.yml

@@ -8,8 +8,8 @@
 
 namespace Magento\AdobeStockAdminUi\Controller\Adminhtml\System\Config;
 
-use Magento\AdobeStockClientApi\Api\ClientInterface;
 use Magento\AdobeImsApi\Api\ConfigInterface;
+use Magento\AdobeStockClientApi\Api\ClientInterface;
 use Magento\Backend\App\Action;
 use Magento\Backend\App\Action\Context;
 use Magento\Framework\App\Action\HttpGetActionInterface;
@@ -88,7 +88,7 @@ public function execute() : ResultInterface
             $message = __('An error occurred during test Adobe Stock API connection');
             $isConnectionEstablished = false;
         }
-        /** @var Json $resultJson */
+
         $resultJson = $this->resultJsonFactory->create();
         return $resultJson->setData(
             [

AdobeStockAdminUi/Block/Adminhtml/System/Config/TestConnection.php

@@ -5,6 +5,6 @@
  */
 -->
 <div if="visible" attr="class: messageClass" translate="message"></div>
-<button class="scalable" type="button" data-bind="click: testConnection" data-ui-id="adobe-stock-integration-buttons-test-connection">
+<button class="scalable" type="button" click="testConnection" data-ui-id="adobe-stock-integration-buttons-test-connection">
     <span text="buttonLabel"></span>
 </button>

AdobeStockAdminUi/Controller/Adminhtml/System/Config/TestConnection.php

@@ -11,7 +11,7 @@
 use Magento\Framework\Api\AttributeValueFactory;
 use Magento\Framework\Api\Search\Document;
 use Magento\Framework\Api\Search\SearchResultInterface;
-use Magento\MediaGalleryApi\Model\Asset\Command\GetByIdInterface;
+use Magento\MediaGalleryApi\Api\GetAssetsByIdsInterface;
 
 /**
  * Class is used for adding an additional assets attributes such as is_downloaded or path to the search results
@@ -33,23 +33,23 @@ class AppendAttributes
     private $loadByIds;
 
     /**
-     * @var GetByIdInterface
+     * @var GetAssetsByIdsInterface
      */
-    private $getMediaGalleryAssetById;
+    private $getMediaGalleryAssetsByIds;
 
     /**
      * @param AttributeValueFactory $attributeValueFactory
      * @param LoadByIdsInterface $loadByIds
-     * @param GetByIdInterface $getMediaGalleryAssetById
+     * @param GetAssetsByIdsInterface $getMediaGalleryAssetById
      */
     public function __construct(
         AttributeValueFactory $attributeValueFactory,
         LoadByIdsInterface $loadByIds,
-        GetByIdInterface $getMediaGalleryAssetById
+        GetAssetsByIdsInterface $getMediaGalleryAssetById
     ) {
         $this->attributeValueFactory = $attributeValueFactory;
         $this->loadByIds = $loadByIds;
-        $this->getMediaGalleryAssetById = $getMediaGalleryAssetById;
+        $this->getMediaGalleryAssetsByIds = $getMediaGalleryAssetById;
     }
 
     /**
@@ -89,9 +89,9 @@ static function ($item) {
                 continue;
             }
 
-            $path = $this->getMediaGalleryAssetById->execute(
-                $assets[$item->getId()]->getMediaGalleryId()
-            )->getPath();
+            $path = $this->getMediaGalleryAssetsByIds->execute(
+                [$assets[$item->getId()]->getMediaGalleryId()]
+            )[0]->getPath();
 
             $this->addAttributes(
                 $item,

AdobeStockAdminUi/view/adminhtml/web/template/connection.html

@@ -20,7 +20,6 @@
 use Magento\Framework\Api\ExtensionAttribute\JoinProcessorInterface;
 use Magento\Framework\Api\SearchCriteria\CollectionProcessorInterface;
 use Magento\Framework\Api\SearchCriteriaInterface;
-use Magento\Framework\Exception\IntegrationException;
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Exception\NoSuchEntityException;
 use Psr\Log\LoggerInterface;
@@ -117,7 +116,6 @@ public function save(AssetInterface $asset): void
     public function getList(SearchCriteriaInterface $searchCriteria): AssetSearchResultsInterface
     {
         try {
-            /** @var AssetCollection $collection */
             $collection = $this->collectionFactory->create();
             $this->joinProcessor->process(
                 $collection,
@@ -126,7 +124,6 @@ public function getList(SearchCriteriaInterface $searchCriteria): AssetSearchRes
 
             $this->collectionProcessor->process($searchCriteria, $collection);
 
-            /** @var AssetSearchResultsInterface $searchResults */
             $searchResults = $this->searchResultFactory->create();
             $searchResults->setItems($collection->getItems());
             $searchResults->setSearchCriteria($searchCriteria);

AdobeStockAsset/Model/AppendAttributes.php

@@ -8,15 +8,15 @@
 
 namespace Magento\AdobeStockAsset\Model;
 
-use Magento\AdobeStockAssetApi\Model\Category\Command\SaveInterface;
-use Magento\AdobeStockAssetApi\Model\Category\Command\LoadByIdInterface;
-use Magento\AdobeStockAssetApi\Model\Category\Command\DeleteByIdInterface;
 use Magento\AdobeStockAsset\Model\ResourceModel\Category\Collection as CategoryCollection;
 use Magento\AdobeStockAsset\Model\ResourceModel\Category\CollectionFactory as CategoryCollectionFactory;
 use Magento\AdobeStockAssetApi\Api\CategoryRepositoryInterface;
 use Magento\AdobeStockAssetApi\Api\Data\CategoryInterface;
 use Magento\AdobeStockAssetApi\Api\Data\CategorySearchResultsInterface;
 use Magento\AdobeStockAssetApi\Api\Data\CategorySearchResultsInterfaceFactory;
+use Magento\AdobeStockAssetApi\Model\Category\Command\DeleteByIdInterface;
+use Magento\AdobeStockAssetApi\Model\Category\Command\LoadByIdInterface;
+use Magento\AdobeStockAssetApi\Model\Category\Command\SaveInterface;
 use Magento\Framework\Api\ExtensionAttribute\JoinProcessorInterface;
 use Magento\Framework\Api\SearchCriteria\CollectionProcessorInterface;
 use Magento\Framework\Api\SearchCriteriaInterface;
@@ -116,7 +116,6 @@ public function delete(CategoryInterface $item): void
      */
     public function getList(SearchCriteriaInterface $searchCriteria) : CategorySearchResultsInterface
     {
-        /** @var CategoryCollection $collection */
         $collection = $this->collectionFactory->create();
         $this->joinProcessor->process(
             $collection,
@@ -125,7 +124,6 @@ public function getList(SearchCriteriaInterface $searchCriteria) : CategorySearc
 
         $this->collectionProcessor->process($searchCriteria, $collection);
 
-        /** @var CategorySearchResultsInterface $searchResults */
         $searchResults = $this->searchResultFactory->create();
         $searchResults->setItems($collection->getItems());
         $searchResults->setSearchCriteria($searchCriteria);

AdobeStockAsset/Model/AssetRepository.php

@@ -113,7 +113,6 @@ public function delete(CreatorInterface $item): void
      */
     public function getList(SearchCriteriaInterface $searchCriteria) : CreatorSearchResultsInterface
     {
-        /** @var CreatorCollection $collection */
         $collection = $this->collectionFactory->create();
         $this->joinProcessor->process(
             $collection,
@@ -122,7 +121,6 @@ public function getList(SearchCriteriaInterface $searchCriteria) : CreatorSearch
 
         $this->collectionProcessor->process($searchCriteria, $collection);
 
-        /** @var CreatorSearchResultsInterface $searchResults */
         $searchResults = $this->searchResultFactory->create();
         $searchResults->setItems($collection->getItems());
         $searchResults->setSearchCriteria($searchCriteria);

AdobeStockAsset/Model/CategoryRepository.php

@@ -7,13 +7,12 @@
 
 namespace Magento\AdobeStockAsset\Model;
 
+use Magento\AdobeStockAssetApi\Api\GetAssetByIdInterface;
 use Magento\AdobeStockAssetApi\Api\GetAssetListInterface;
 use Magento\Framework\Api\FilterBuilder;
 use Magento\Framework\Api\Search\Document;
 use Magento\Framework\Api\Search\SearchCriteriaBuilder;
-use Magento\AdobeStockAssetApi\Api\GetAssetByIdInterface;
 use Magento\Framework\Exception\NoSuchEntityException;
-use Magento\Framework\Exception\NotFoundException;
 
 /**
  * Service for getting asset by content id