Skip to content

Commit 3a45e91

Browse files
committed
Replace Serializer with Json serializer
Add new mock for Json Serializer
1 parent f82e5a5 commit 3a45e91

File tree

2 files changed

+18
-5
lines changed

2 files changed

+18
-5
lines changed

app/code/Magento/ConfigurableProduct/Plugin/Product/Initialization/CleanConfigurationTmpImages.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ class CleanConfigurationTmpImages
3939
private $request;
4040

4141
/**
42-
* @var \Magento\Framework\Serialize\Serializer\Serialize
42+
* @var \Magento\Framework\Serialize\Serializer\Json
4343
*/
4444
private $serialize;
4545

@@ -48,7 +48,7 @@ class CleanConfigurationTmpImages
4848
* @param \Magento\MediaStorage\Helper\File\Storage\Database $fileStorageDb
4949
* @param \Magento\Catalog\Model\Product\Media\Config $mediaConfig
5050
* @param \Magento\Framework\Filesystem $filesystem
51-
* @param \Magento\Framework\Serialize\Serializer\Serialize $serialize
51+
* @param \Magento\Framework\Serialize\Serializer\Json $serialize
5252
*
5353
* @throws \Magento\Framework\Exception\FileSystemException
5454
*/
@@ -57,7 +57,7 @@ public function __construct(
5757
\Magento\MediaStorage\Helper\File\Storage\Database $fileStorageDb,
5858
\Magento\Catalog\Model\Product\Media\Config $mediaConfig,
5959
\Magento\Framework\Filesystem $filesystem,
60-
\Magento\Framework\Serialize\Serializer\Serialize $serialize
60+
\Magento\Framework\Serialize\Serializer\Json $serialize
6161
) {
6262
$this->request = $request;
6363
$this->fileStorageDb = $fileStorageDb;

app/code/Magento/ConfigurableProduct/Test/Unit/Plugin/Product/Initialization/CleanConfigurationTmpImagesTest.php

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
use Magento\Framework\App\RequestInterface;
1313
use Magento\Framework\Filesystem;
1414
use Magento\Framework\Filesystem\Directory\Write;
15+
use Magento\Framework\Serialize\Serializer\Json;
1516
use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
1617
use Magento\MediaStorage\Helper\File\Storage\Database as FileStorage;
1718

@@ -58,6 +59,11 @@ class CleanConfigurationTmpImagesTest extends \PHPUnit\Framework\TestCase
5859
*/
5960
private $writeFolder;
6061

62+
/**
63+
* @var Json|\PHPUnit_Framework_MockObject_MockObject
64+
*/
65+
private $seralizer;
66+
6167
/**
6268
* @var ProductInitializationHelper|\PHPUnit_Framework_MockObject_MockObject
6369
*/
@@ -79,6 +85,9 @@ protected function setUp()
7985
$this->writeFolder = $this->getMockBuilder(Write::class)
8086
->disableOriginalConstructor()
8187
->getMock();
88+
$this->seralizer = $this->getMockBuilder(Json::class)
89+
->disableOriginalConstructor()
90+
->getMock();
8291
$this->subjectMock = $this->getMockBuilder(ProductInitializationHelper::class)
8392
->disableOriginalConstructor()
8493
->getMock();
@@ -94,7 +103,8 @@ protected function setUp()
94103
'request' => $this->requestMock,
95104
'fileStorageDb' => $this->fileStorageDb,
96105
'mediaConfig' => $this->mediaConfig,
97-
'filesystem' => $this->filesystem
106+
'filesystem' => $this->filesystem,
107+
'seralizer' => $this->seralizer
98108
]
99109
);
100110
}
@@ -163,7 +173,10 @@ public function testAfterInitialize()
163173
]
164174
);
165175

166-
$this->assertSame($productMock, $this->cleanConfigurationTmpImages->afterInitialize($this->subjectMock, $productMock));
176+
$this->assertSame(
177+
$productMock,
178+
$this->cleanConfigurationTmpImages->afterInitialize($this->subjectMock, $productMock)
179+
);
167180
}
168181

169182
/**

0 commit comments

Comments
 (0)