Merge pull request #2 from magento/2.0-develop

Merge changes from origin repo
magento · Jul 29, 2020 · 8da2d13 · 8da2d13
2 parents 2378b4d + 2a58311
commit 8da2d13
Show file tree

Hide file tree

Showing 147 changed files with 1,190 additions and 535 deletions.
diff --git a/AdobeStockAdminUi/Block/Adminhtml/System/Config/TestConnection.php b/AdobeStockAdminUi/Block/Adminhtml/System/Config/TestConnection.php
@@ -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;
 
 /**

diff --git a/AdobeStockAdminUi/Controller/Adminhtml/System/Config/TestConnection.php b/AdobeStockAdminUi/Controller/Adminhtml/System/Config/TestConnection.php
@@ -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;

diff --git a/AdobeStockAsset/Model/AssetRepository.php b/AdobeStockAsset/Model/AssetRepository.php
@@ -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;

diff --git a/AdobeStockAsset/Model/CategoryRepository.php b/AdobeStockAsset/Model/CategoryRepository.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;

diff --git a/AdobeStockAsset/Model/GetAssetById.php b/AdobeStockAsset/Model/GetAssetById.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

diff --git a/AdobeStockAsset/Model/GetAssetList.php b/AdobeStockAsset/Model/GetAssetList.php
@@ -10,8 +10,8 @@
 
 use Magento\AdobeStockAssetApi\Api\GetAssetListInterface;
 use Magento\AdobeStockClientApi\Api\ClientInterface;
-use Magento\Framework\Api\Search\SearchResultInterface;
 use Magento\Framework\Api\Search\SearchCriteriaInterface;
+use Magento\Framework\Api\Search\SearchResultInterface;
 use Magento\Framework\Exception\AuthenticationException;
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\UrlInterface;

diff --git a/AdobeStockAsset/Model/ResourceModel/Asset/Command/DeleteById.php b/AdobeStockAsset/Model/ResourceModel/Asset/Command/DeleteById.php
@@ -7,10 +7,10 @@
 
 namespace Magento\AdobeStockAsset\Model\ResourceModel\Asset\Command;
 
+use Magento\AdobeStockAssetApi\Model\Asset\Command\DeleteByIdInterface;
 use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\DB\Adapter\AdapterInterface;
 use Magento\Framework\Exception\CouldNotDeleteException;
-use Magento\AdobeStockAssetApi\Model\Asset\Command\DeleteByIdInterface;
 use Psr\Log\LoggerInterface;
 
 /**

diff --git a/AdobeStockAsset/Model/ResourceModel/Category/Command/DeleteById.php b/AdobeStockAsset/Model/ResourceModel/Category/Command/DeleteById.php
@@ -7,10 +7,10 @@
 
 namespace Magento\AdobeStockAsset\Model\ResourceModel\Category\Command;
 
+use Magento\AdobeStockAssetApi\Model\Category\Command\DeleteByIdInterface;
 use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\DB\Adapter\AdapterInterface;
 use Magento\Framework\Exception\CouldNotDeleteException;
-use Magento\AdobeStockAssetApi\Model\Category\Command\DeleteByIdInterface;
 use Psr\Log\LoggerInterface;
 
 /**

diff --git a/AdobeStockAsset/Model/ResourceModel/Category/Command/Save.php b/AdobeStockAsset/Model/ResourceModel/Category/Command/Save.php
@@ -7,9 +7,9 @@
 
 namespace Magento\AdobeStockAsset\Model\ResourceModel\Category\Command;
 
-use Magento\AdobeStockAssetApi\Model\Category\Command\SaveInterface;
-use Magento\AdobeStockAssetApi\Api\Data\CategoryInterface;
 use Magento\AdobeStockAsset\Model\ResourceModel\Command\InsertIgnore;
+use Magento\AdobeStockAssetApi\Api\Data\CategoryInterface;
+use Magento\AdobeStockAssetApi\Model\Category\Command\SaveInterface;
 use Magento\Framework\Reflection\DataObjectProcessor;
 
 /**

diff --git a/AdobeStockAsset/Model/ResourceModel/Creator/Command/DeleteById.php b/AdobeStockAsset/Model/ResourceModel/Creator/Command/DeleteById.php
@@ -7,10 +7,10 @@
 
 namespace Magento\AdobeStockAsset\Model\ResourceModel\Creator\Command;
 
+use Magento\AdobeStockAssetApi\Model\Creator\Command\DeleteByIdInterface;
 use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\DB\Adapter\AdapterInterface;
 use Magento\Framework\Exception\CouldNotDeleteException;
-use Magento\AdobeStockAssetApi\Model\Creator\Command\DeleteByIdInterface;
 use Psr\Log\LoggerInterface;
 
 /**

diff --git a/AdobeStockAsset/Model/ResourceModel/Creator/Command/Save.php b/AdobeStockAsset/Model/ResourceModel/Creator/Command/Save.php
@@ -7,9 +7,9 @@
 
 namespace Magento\AdobeStockAsset\Model\ResourceModel\Creator\Command;
 
-use Magento\AdobeStockAssetApi\Model\Creator\Command\SaveInterface;
-use Magento\AdobeStockAssetApi\Api\Data\CreatorInterface;
 use Magento\AdobeStockAsset\Model\ResourceModel\Command\InsertIgnore;
+use Magento\AdobeStockAssetApi\Api\Data\CreatorInterface;
+use Magento\AdobeStockAssetApi\Model\Creator\Command\SaveInterface;
 use Magento\Framework\Reflection\DataObjectProcessor;
 
 /**

diff --git a/AdobeStockAsset/Test/Integration/Model/CreatorRepositoryTest.php b/AdobeStockAsset/Test/Integration/Model/CreatorRepositoryTest.php
@@ -9,7 +9,6 @@
 namespace Magento\AdobeStockAsset\Test\Integration\Model;
 
 use Magento\AdobeStockAssetApi\Api\CreatorRepositoryInterface;
-use Magento\AdobeStockAssetApi\Api\Data\AssetInterface;
 use Magento\AdobeStockAssetApi\Api\Data\AssetSearchResultsInterface;
 use Magento\AdobeStockAssetApi\Api\Data\CreatorInterface;
 use Magento\AdobeStockAssetApi\Api\Data\CreatorInterfaceFactory;

diff --git a/AdobeStockAsset/Test/_files/category_rollback.php b/AdobeStockAsset/Test/_files/category_rollback.php
@@ -5,8 +5,8 @@
  */
 declare(strict_types=1);
 
-use Magento\TestFramework\Helper\Bootstrap;
 use Magento\AdobeStockAssetApi\Api\CategoryRepositoryInterface;
+use Magento\TestFramework\Helper\Bootstrap;
 
 $objectManager = Bootstrap::getObjectManager();
 

diff --git a/AdobeStockAsset/Test/_files/creator_rollback.php b/AdobeStockAsset/Test/_files/creator_rollback.php
@@ -5,8 +5,8 @@
  */
 declare(strict_types=1);
 
-use Magento\TestFramework\Helper\Bootstrap;
 use Magento\AdobeStockAssetApi\Api\CreatorRepositoryInterface;
+use Magento\TestFramework\Helper\Bootstrap;
 
 $objectManager = Bootstrap::getObjectManager();
 

diff --git a/AdobeStockAssetApi/Api/GetAssetListInterface.php b/AdobeStockAssetApi/Api/GetAssetListInterface.php
@@ -8,8 +8,8 @@
 
 namespace Magento\AdobeStockAssetApi\Api;
 
-use Magento\Framework\Api\Search\SearchResultInterface;
 use Magento\Framework\Api\Search\SearchCriteriaInterface;
+use Magento\Framework\Api\Search\SearchResultInterface;
 
 /**
  * Service for getting asset list filtered by search criteria

diff --git a/AdobeStockClient/Model/LicenseConfirmation.php b/AdobeStockClient/Model/LicenseConfirmation.php
@@ -8,8 +8,8 @@
 
 namespace Magento\AdobeStockClient\Model;
 
-use Magento\AdobeStockClientApi\Api\Data\LicenseConfirmationInterface;
 use Magento\AdobeStockClientApi\Api\Data\LicenseConfirmationExtensionInterface;
+use Magento\AdobeStockClientApi\Api\Data\LicenseConfirmationInterface;
 use Magento\Framework\Model\AbstractExtensibleModel;
 
 /**

diff --git a/AdobeStockClient/Model/SearchParametersProviderComposite.php b/AdobeStockClient/Model/SearchParametersProviderComposite.php
@@ -9,7 +9,6 @@
 namespace Magento\AdobeStockClient\Model;
 
 use AdobeStock\Api\Models\SearchParameters;
-use Magento\AdobeStockClient\Model\SearchParameterProviderInterface;
 use Magento\Framework\Api\SearchCriteriaInterface;
 
 /**

diff --git a/AdobeStockClient/Model/StockFileToDocument.php b/AdobeStockClient/Model/StockFileToDocument.php
@@ -11,10 +11,10 @@
 use AdobeStock\Api\Models\StockFile;
 use Exception;
 use Magento\Framework\Api\AttributeValue;
-use Magento\Framework\Api\Search\DocumentFactory;
+use Magento\Framework\Api\AttributeValueFactory;
 use Magento\Framework\Api\Search\Document;
+use Magento\Framework\Api\Search\DocumentFactory;
 use Magento\Framework\Exception\IntegrationException;
-use Magento\Framework\Api\AttributeValueFactory;
 use Magento\Framework\Phrase;
 use Psr\Log\LoggerInterface;
 

diff --git a/AdobeStockClient/Test/Unit/Model/ClientTest.php b/AdobeStockClient/Test/Unit/Model/ClientTest.php
@@ -8,12 +8,12 @@
 namespace Magento\AdobeStockClient\Test\Unit\Model;
 
 use AdobeStock\Api\Models\LicenseEntitlement;
-use AdobeStock\Api\Models\LicensePurchaseOptions;
 use AdobeStock\Api\Models\LicenseEntitlementQuota;
+use AdobeStock\Api\Models\LicensePurchaseOptions;
 use AdobeStock\Api\Models\StockFile;
 use AdobeStock\Api\Request\License;
-use AdobeStock\Api\Response\License as ResponseLicense;
 use AdobeStock\Api\Request\LicenseFactory as LicenseRequestFactory;
+use AdobeStock\Api\Response\License as ResponseLicense;
 use AdobeStock\Api\Response\SearchFiles as SearchFilesResponse;
 use Magento\AdobeStockClient\Model\Client;
 use Magento\AdobeStockClient\Model\ConnectionWrapper;

diff --git a/AdobeStockClient/Test/Unit/Model/ConnectionFactoryTest.php b/AdobeStockClient/Test/Unit/Model/ConnectionFactoryTest.php
@@ -7,10 +7,10 @@
 
 namespace Magento\AdobeStockClient\Test\Unit\Model;
 
-use PHPUnit\Framework\TestCase;
-use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
-use Magento\AdobeStockClient\Model\ConnectionFactory;
 use AdobeStock\Api\Client\AdobeStock;
+use Magento\AdobeStockClient\Model\ConnectionFactory;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use PHPUnit\Framework\TestCase;
 
 /**
  * Test for search  parameters provider.

diff --git a/AdobeStockClient/Test/Unit/Model/SearchParametersProviderCompositeTest.php b/AdobeStockClient/Test/Unit/Model/SearchParametersProviderCompositeTest.php
@@ -8,8 +8,8 @@
 namespace Magento\AdobeStockClient\Test\Unit\Model;
 
 use AdobeStock\Api\Models\SearchParameters;
-use Magento\AdobeStockClient\Model\SearchParametersProviderComposite;
 use Magento\AdobeStockClient\Model\SearchParameterProviderInterface;
+use Magento\AdobeStockClient\Model\SearchParametersProviderComposite;
 use Magento\Framework\Api\SearchCriteriaInterface;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use PHPUnit\Framework\MockObject\MockObject;

diff --git a/AdobeStockClientApi/Api/ClientInterface.php b/AdobeStockClientApi/Api/ClientInterface.php
@@ -10,8 +10,8 @@
 
 use Magento\AdobeStockClientApi\Api\Data\LicenseConfirmationInterface;
 use Magento\AdobeStockClientApi\Api\Data\UserQuotaInterface;
-use Magento\Framework\Api\Search\SearchResultInterface;
 use Magento\Framework\Api\Search\SearchCriteriaInterface;
+use Magento\Framework\Api\Search\SearchResultInterface;
 use Magento\Framework\Exception\AuthenticationException;
 use Magento\Framework\Exception\AuthorizationException;
 use Magento\Framework\Exception\IntegrationException;

diff --git a/AdobeStockImage/Model/Extract/Keywords.php b/AdobeStockImage/Model/Extract/Keywords.php
@@ -7,8 +7,8 @@
 
 namespace Magento\AdobeStockImage\Model\Extract;
 
-use Magento\MediaGalleryApi\Api\Data\KeywordInterface;
 use Magento\Framework\Api\Search\Document;
+use Magento\MediaGalleryApi\Api\Data\KeywordInterface;
 use Magento\MediaGalleryApi\Api\Data\KeywordInterfaceFactory;
 
 /**

diff --git a/AdobeStockImage/Model/Extract/MediaGalleryAsset.php b/AdobeStockImage/Model/Extract/MediaGalleryAsset.php
@@ -7,8 +7,8 @@
 
 namespace Magento\AdobeStockImage\Model\Extract;
 
-use Magento\MediaGalleryApi\Api\Data\AssetInterface;
 use Magento\Framework\Api\Search\Document;
+use Magento\MediaGalleryApi\Api\Data\AssetInterface;
 use Magento\MediaGalleryApi\Api\Data\AssetInterfaceFactory;
 
 /**
@@ -51,6 +51,7 @@ public function convert(Document $document, array $additionalData = []): AssetIn
         return $this->assetFactory->create([
             'path' => $assetData['path'],
             'title' => $assetData['title'],
+            'description' => $assetData['description'],
             'width' => $assetData['width'],
             'height' => $assetData['height'],
             'size' => $assetData['size'],

diff --git a/AdobeStockImage/Model/GetRelatedImages.php b/AdobeStockImage/Model/GetRelatedImages.php
@@ -10,9 +10,9 @@
 
 use Magento\AdobeStockImageApi\Api\GetImageListInterface;
 use Magento\AdobeStockImageApi\Api\GetRelatedImagesInterface;
+use Magento\Framework\Api\FilterBuilder;
 use Magento\Framework\Api\Search\Document;
 use Magento\Framework\Api\Search\SearchCriteriaBuilder;
-use Magento\Framework\Api\FilterBuilder;
 use Magento\Framework\Exception\LocalizedException;
 use Psr\Log\LoggerInterface;
 

diff --git a/AdobeStockImage/Model/SaveImage.php b/AdobeStockImage/Model/SaveImage.php
@@ -15,7 +15,6 @@
 use Magento\Framework\Exception\CouldNotSaveException;
 use Magento\Framework\Exception\LocalizedException;
 use Magento\MediaGalleryApi\Api\GetAssetsByPathsInterface;
-use Magento\MediaGalleryApi\Api\SaveAssetsKeywordsInterface;
 use Psr\Log\LoggerInterface;
 
 /**

diff --git a/AdobeStockImage/Model/SaveMediaGalleryAsset.php b/AdobeStockImage/Model/SaveMediaGalleryAsset.php
@@ -8,13 +8,15 @@
 namespace Magento\AdobeStockImage\Model;
 
 use Magento\AdobeStockImage\Model\Extract\MediaGalleryAsset as DocumentToMediaGalleryAsset;
+use Magento\Framework\Api\AttributeValueFactory;
 use Magento\Framework\Api\Search\Document;
 use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\Framework\Exception\CouldNotSaveException;
+use Magento\Framework\Exception\FileSystemException;
 use Magento\Framework\Filesystem;
 use Magento\MediaGalleryApi\Api\SaveAssetsInterface;
+use Magento\MediaGalleryMetadataApi\Api\ExtractMetadataInterface;
 use Magento\MediaGallerySynchronizationApi\Model\GetContentHashInterface;
-use Magento\Framework\Exception\FileSystemException;
 
 /**
  * Process save action of the media gallery asset.
@@ -31,6 +33,11 @@ class SaveMediaGalleryAsset
      */
     private $documentToMediaGalleryAsset;
 
+    /**
+     * @var AttributeValueFactory
+     */
+    private $attributeValueFactory;
+
     /**
      * @var GetContentHashInterface
      */
@@ -41,22 +48,33 @@ class SaveMediaGalleryAsset
      */
     private $fileSystem;
 
+    /**
+     * @var ExtractMetadataInterface
+     */
+    private $extractMetadata;
+
     /**
      * @param SaveAssetsInterface $saveMediaAsset
      * @param DocumentToMediaGalleryAsset $documentToMediaGalleryAsset
      * @param GetContentHashInterface $getContentHash
      * @param Filesystem $fileSystem
+     * @param ExtractMetadataInterface $extractMetadata
+     * @param AttributeValueFactory $attributeValueFactory
      */
     public function __construct(
         SaveAssetsInterface $saveMediaAsset,
         DocumentToMediaGalleryAsset $documentToMediaGalleryAsset,
         GetContentHashInterface $getContentHash,
-        Filesystem $fileSystem
+        Filesystem $fileSystem,
+        ExtractMetadataInterface $extractMetadata,
+        AttributeValueFactory $attributeValueFactory
     ) {
         $this->saveMediaAsset = $saveMediaAsset;
         $this->documentToMediaGalleryAsset = $documentToMediaGalleryAsset;
         $this->getContentHash = $getContentHash;
         $this->fileSystem = $fileSystem;
+        $this->extractMetadata = $extractMetadata;
+        $this->attributeValueFactory = $attributeValueFactory;
     }
 
     /**
@@ -79,13 +97,35 @@ public function execute(Document $document, string $destinationPath): void
                 'hash' => $this->hashImageContent($destinationPath)
             ];
 
+            $document = $this->setDescriptionField($document, $destinationPath);
             $mediaGalleryAsset = $this->documentToMediaGalleryAsset->convert($document, $additionalData);
             $this->saveMediaAsset->execute([$mediaGalleryAsset]);
         } catch (\Exception $exception) {
             throw new CouldNotSaveException(__('Could not save media gallery asset.'), $exception);
         }
     }
 
+    /**
+     * Set description from file metadata
+     *
+     * @param Document $document
+     * @param string $destinationPath
+     */
+    private function setDescriptionField(Document $document, string $destinationPath): Document
+    {
+        $customAttributes = $document->getCustomAttributes();
+        $mediaDirectory = $this->fileSystem->getDirectoryRead(DirectoryList::MEDIA);
+        $metadata = $this->extractMetadata->execute($mediaDirectory->getAbsolutePath($destinationPath));
+        $attribute = $this->attributeValueFactory->create();
+
+        $attribute->setAttributeCode('description');
+        $attribute->setValue($metadata->getDescription());
+        $customAttributes['description'] = $attribute;
+        $document->setCustomAttributes($customAttributes);
+
+        return $document;
+    }
+
     /**
      * Calculates saved image file size.
      *