Skip to content

Commit 921460a

Browse files
committed
Fix Semantic version checker
1 parent 7eff25c commit 921460a

File tree

3 files changed

+4
-8
lines changed

3 files changed

+4
-8
lines changed

app/code/Magento/Catalog/Model/Product/Gallery/ReadHandler.php

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ public function execute($entity, $arguments = [])
6464

6565
$this->addMediaDataToProduct(
6666
$entity,
67-
$this->sortMediaEntriesByPosition($mediaEntries)
67+
$mediaEntries
6868
);
6969

7070
return $entity;
@@ -80,6 +80,7 @@ public function execute($entity, $arguments = [])
8080
*/
8181
public function addMediaDataToProduct(Product $product, array $mediaEntries)
8282
{
83+
$mediaEntries = $this->sortMediaEntriesByPosition($mediaEntries);
8384
$product->setData(
8485
$this->getAttribute()->getAttributeCode(),
8586
[
@@ -128,7 +129,7 @@ protected function findDefaultValue($key, &$image)
128129
* @param array $mediaEntries
129130
* @return array
130131
*/
131-
public function sortMediaEntriesByPosition(array $mediaEntries): array
132+
private function sortMediaEntriesByPosition(array $mediaEntries): array
132133
{
133134
$mediaEntriesWithNullPositions = [];
134135
foreach ($mediaEntries as $index => $mediaEntry) {

app/code/Magento/Catalog/Model/ResourceModel/Product/Collection.php

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2395,10 +2395,7 @@ function ($item) use ($linkField) {
23952395
$this->productGalleryReadHandler
23962396
->addMediaDataToProduct(
23972397
$item,
2398-
$this->productGalleryReadHandler->sortMediaEntriesByPosition(
2399-
$mediaGalleries[$item->getOrigData($linkField)] ?? []
2400-
)
2401-
2398+
$mediaGalleries[$item->getOrigData($linkField)] ?? []
24022399
);
24032400
}
24042401

app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/Product/CollectionTest.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -309,8 +309,6 @@ public function testAddMediaGalleryData()
309309
$this->connectionMock->expects($this->once())->method('fetchAll')->with($selectMock)->willReturn(
310310
[['row_id' => $rowId]]
311311
);
312-
$this->galleryReadHandlerMock->expects($this->once())->method('sortMediaEntriesByPosition')
313-
->willReturn($mediaGalleriesMock);
314312
$this->galleryReadHandlerMock->expects($this->once())->method('addMediaDataToProduct')
315313
->with($itemMock, $mediaGalleriesMock);
316314

0 commit comments

Comments
 (0)