Skip to content

Commit 7f068bc

Browse files
committed
B2B-2037: [AWS S3] [Integration Tests]: Investigate Test Failures in MediaGallerySynchronization & MediaGallerySynchronizationMetadata modules
1 parent 056b118 commit 7f068bc

File tree

12 files changed

+22
-9
lines changed

12 files changed

+22
-9
lines changed

app/code/Magento/MediaGalleryMetadata/Model/AddIptcMetadata.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,8 @@ class AddIptcMetadata
5252
* @param DriverInterface $driver
5353
* @param ReadFile $fileReader
5454
* @param Filesystem|null $filesystem
55+
* @param IptcEmbed|null $iptcEmbed
56+
* @SuppressWarnings(PHPMD.UnusedFormalParameter)
5557
*/
5658
public function __construct(
5759
FileInterfaceFactory $fileFactory,

app/code/Magento/MediaGalleryMetadata/Model/Gif/ReadFile.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -330,6 +330,8 @@ private function readBlock($resource): string
330330
}
331331

332332
/**
333+
* Returns current driver for media dircetory
334+
*
333335
* @return DriverInterface
334336
* @throws FileSystemException
335337
*/

app/code/Magento/MediaGalleryMetadata/Model/Gif/WriteFile.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,8 @@ private function writeSegments($resource, array $segments): void
8686
}
8787

8888
/**
89+
* Returns current driver for media dircetory
90+
*
8991
* @return DriverInterface
9092
* @throws FileSystemException
9193
*/

app/code/Magento/MediaGalleryMetadata/Model/IptcEmbed.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@ class IptcEmbed
1717
/**
1818
* Returns result of iptcembed function
1919
*
20+
* @param string $iptcData
21+
* @param string $filePath
2022
* @throws LocalizedException if iptcembed function is not enabled
2123
*/
2224
public function get(string $iptcData, string $filePath)

app/code/Magento/MediaGalleryMetadata/Model/Jpeg/ReadFile.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -219,6 +219,8 @@ private function read($resource, int $length): string
219219
}
220220

221221
/**
222+
* Returns current driver for media dircetory
223+
*
222224
* @return DriverInterface
223225
* @throws FileSystemException
224226
*/

app/code/Magento/MediaGalleryMetadata/Model/Jpeg/Segment/ReadExif.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ class ReadExif implements ReadMetadataInterface
3737

3838
/**
3939
* @param MetadataInterfaceFactory $metadataFactory
40+
* @param ExifReader|null $exifReader
4041
*/
4142
public function __construct(
4243
MetadataInterfaceFactory $metadataFactory,

app/code/Magento/MediaGalleryMetadata/Model/Jpeg/WriteFile.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ class WriteFile implements WriteFileInterface
5151
public function __construct(
5252
DriverInterface $driver,
5353
SegmentNames $segmentNames,
54-
Filesystem $filesystem
54+
Filesystem $filesystem = null
5555
) {
5656
$this->segmentNames = $segmentNames;
5757
$this->filesystem = $filesystem ?? ObjectManager::getInstance()->get(Filesystem::class);
@@ -102,6 +102,8 @@ private function writeSegments($resource, array $segments): void
102102
}
103103

104104
/**
105+
* Returns current driver for media dircetory
106+
*
105107
* @return DriverInterface
106108
* @throws FileSystemException
107109
*/

app/code/Magento/MediaGalleryMetadata/Model/Png/ReadFile.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,8 +136,9 @@ private function read($resource, int $length): string
136136
return $data;
137137
}
138138

139-
140139
/**
140+
* Returns current driver for media dircetory
141+
*
141142
* @return DriverInterface
142143
* @throws FileSystemException
143144
*/

app/code/Magento/MediaGalleryMetadata/Model/Png/WriteFile.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ class WriteFile implements WriteFileInterface
4949
public function __construct(
5050
DriverInterface $driver,
5151
SegmentNames $segmentNames,
52-
Filesystem $filesystem
52+
Filesystem $filesystem = null
5353
) {
5454
$this->segmentNames = $segmentNames;
5555
$this->filesystem = $filesystem ?? ObjectManager::getInstance()->get(Filesystem::class);
@@ -88,6 +88,8 @@ private function writeSegments($resource, array $segments): void
8888
}
8989

9090
/**
91+
* Returns current driver for media dircetory
92+
*
9193
* @return DriverInterface
9294
* @throws FileSystemException
9395
*/

app/code/Magento/MediaGalleryMetadata/Test/Integration/Model/Png/Segment/XmpTest.php

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,6 @@ class XmpTest extends TestCase
3434
*/
3535
private $xmpReader;
3636

37-
/**
38-
* @var DriverInterface
39-
*/
40-
private $driver;
41-
4237
/**
4338
* @var ReadFile
4439
*/

0 commit comments

Comments
 (0)