Adjustments according review

Author: coderimus

app/code/Magento/MediaGallery/Model/Asset/Command/DeleteByPath.php

@@ -7,10 +7,10 @@
 
 namespace Magento\MediaGallery\Model\Asset\Command;
 
-use Magento\MediaGalleryApi\Model\Asset\Command\DeleteByPathInterface;
 use Magento\Framework\App\ResourceConnection;
-use Magento\Framework\Exception\CouldNotDeleteException;
 use Magento\Framework\DB\Adapter\AdapterInterface;
+use Magento\Framework\Exception\CouldNotDeleteException;
+use Magento\MediaGalleryApi\Model\Asset\Command\DeleteByPathInterface;
 use Psr\Log\LoggerInterface;
 
 /**

app/code/Magento/MediaGallery/Test/Unit/Model/Keyword/Command/GetAssetKeywordsTest.php

@@ -41,18 +41,18 @@ class GetAssetKeywordsTest extends TestCase
     /**
      * @var LoggerInterface|MockObject
      */
-    private $logger;
+    private $loggerMock;
 
     protected function setUp(): void
     {
         $this->resourceConnectionStub = $this->createMock(ResourceConnection::class);
         $this->assetKeywordFactoryStub = $this->createMock(KeywordInterfaceFactory::class);
-        $this->logger = $this->createMock(LoggerInterface::class);
+        $this->loggerMock = $this->createMock(LoggerInterface::class);
 
         $this->sut = new GetAssetKeywords(
             $this->resourceConnectionStub,
             $this->assetKeywordFactoryStub,
-            $this->logger
+            $this->loggerMock
         );
     }
 
@@ -62,7 +62,6 @@ protected function setUp(): void
      * @dataProvider casesProvider()
      * @param array $databaseQueryResult
      * @param int $expectedNumberOfFoundKeywords
-     * @throws NotFoundException
      */
     public function testFind(array $databaseQueryResult, int $expectedNumberOfFoundKeywords): void
     {
@@ -104,7 +103,7 @@ public function testNotFoundBecauseOfError(): void
             ->willThrowException((new \Exception()));
 
         $this->expectException(IntegrationException::class);
-        $this->logger->expects($this->once())
+        $this->loggerMock->expects($this->once())
             ->method('critical')
             ->willReturnSelf();
 

app/code/Magento/MediaGallery/Test/Unit/Model/Keyword/Command/SaveAssetKeywordsTest.php

@@ -7,13 +7,13 @@
 
 namespace Magento\MediaGallery\Test\Unit\Model\Keyword\Command;
 
-use Magento\MediaGallery\Model\Keyword\Command\SaveAssetKeywords;
-use Magento\MediaGallery\Model\Keyword\Command\SaveAssetLinks;
 use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\DataObject;
 use Magento\Framework\DB\Adapter\Pdo\Mysql;
 use Magento\Framework\DB\Select;
 use Magento\Framework\Exception\CouldNotSaveException;
+use Magento\MediaGallery\Model\Keyword\Command\SaveAssetKeywords;
+use Magento\MediaGallery\Model\Keyword\Command\SaveAssetLinks;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 use Psr\Log\LoggerInterface;
@@ -51,7 +51,7 @@ class SaveAssetKeywordsTest extends TestCase
     /**
      * @var LoggerInterface|MockObject
      */
-    private $logger;
+    private $loggerMock;
 
     /**
      * SetUp
@@ -64,12 +64,12 @@ public function setUp(): void
             ->disableOriginalConstructor()
             ->getMock();
         $this->selectMock = $this->createMock(Select::class);
-        $this->logger = $this->createMock(LoggerInterface::class);
+        $this->loggerMock = $this->createMock(LoggerInterface::class);
 
         $this->sut = new SaveAssetKeywords(
             $this->resourceConnectionMock,
             $this->saveAssetLinksMock,
-            $this->logger
+            $this->loggerMock
         );
     }
 
@@ -114,7 +114,7 @@ public function testAssetNotSavingCausedByError(): void
             ->method('getConnection')
             ->willThrowException((new \Exception()));
         $this->expectException(CouldNotSaveException::class);
-        $this->logger->expects($this->once())
+        $this->loggerMock->expects($this->once())
             ->method('critical')
             ->willReturnSelf();
 

app/code/Magento/MediaGallery/Test/Unit/Model/Keyword/Command/SaveAssetLinksTest.php

@@ -38,7 +38,7 @@ class SaveAssetLinksTest extends TestCase
     /**
      * @var LoggerInterface|MockObject
      */
-    private $logger;
+    private $loggerMock;
 
     /**
      * Prepare test objects.
@@ -47,11 +47,11 @@ public function setUp(): void
     {
         $this->connectionMock = $this->createMock(AdapterInterface::class);
         $this->resourceConnectionMock = $this->createMock(ResourceConnection::class);
-        $this->logger = $this->createMock(LoggerInterface::class);
+        $this->loggerMock = $this->createMock(LoggerInterface::class);
 
         $this->sut = new SaveAssetLinks(
             $this->resourceConnectionMock,
-            $this->logger
+            $this->loggerMock
         );
     }
 
@@ -63,8 +63,6 @@ public function setUp(): void
      * @param int $assetId
      * @param array $keywordIds
      * @param array $values
-     *
-     * @throws CouldNotSaveException
      */
     public function testAssetKeywordsSave(int $assetId, array $keywordIds, array $values): void
     {
@@ -105,7 +103,7 @@ public function testAssetNotSavingCausedByError(): void
             ->method('insertArray')
             ->willThrowException((new \Exception()));
         $this->expectException(CouldNotSaveException::class);
-        $this->logger->expects($this->once())
+        $this->loggerMock->expects($this->once())
             ->method('critical')
             ->willReturnSelf();