Skip to content

Commit e2a571f

Browse files
okolesnykokolesnyk
committed
Merge branch '2.3-develop' of github.com:magento/magento2ce into 2.3-tests-pr
2 parents b0c4df8 + b5b66fe commit e2a571f

File tree

43 files changed

+1084
-294
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+1084
-294
lines changed

‎app/code/Magento/Backend/Model/Url.php

Lines changed: 17 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
* Class \Magento\Backend\Model\UrlInterface
1414
*
1515
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
16+
* @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
1617
* @api
1718
* @since 100.0.2
1819
*/
@@ -366,6 +367,19 @@ protected function _getMenu()
366367
return $this->_menu;
367368
}
368369

370+
/**
371+
* Set scope entity
372+
*
373+
* @param mixed $scopeId
374+
* @return \Magento\Framework\UrlInterface
375+
*/
376+
public function setScope($scopeId)
377+
{
378+
parent::setScope($scopeId);
379+
$this->_scope = $this->_scopeResolver->getScope($scopeId);
380+
return $this;
381+
}
382+
369383
/**
370384
* Set custom auth session
371385
*
@@ -402,13 +416,13 @@ public function getAreaFrontName()
402416
}
403417

404418
/**
405-
* Retrieve action path.
406-
* Add backend area front name as a prefix to action path
419+
* Retrieve action path, add backend area front name as a prefix to action path
407420
*
408421
* @return string
409422
*/
410423
protected function _getActionPath()
411424
{
425+
412426
$path = parent::_getActionPath();
413427
if ($path) {
414428
if ($this->getAreaFrontName()) {
@@ -448,8 +462,7 @@ protected function _getConfigCacheId($path)
448462
}
449463

450464
/**
451-
* Get config data by path
452-
* Use only global config values for backend
465+
* Get config data by path, use only global config values for backend
453466
*
454467
* @param string $path
455468
* @return null|string

‎app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Gallery/Content.php

Lines changed: 24 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
use Magento\Framework\App\Filesystem\DirectoryList;
2020
use Magento\Framework\Exception\FileSystemException;
2121
use Magento\Backend\Block\DataProviders\ImageUploadConfig as ImageUploadConfigDataProvider;
22+
use Magento\MediaStorage\Helper\File\Storage\Database;
2223

2324
/**
2425
* Block for gallery content.
@@ -50,25 +51,34 @@ class Content extends \Magento\Backend\Block\Widget
5051
*/
5152
private $imageUploadConfigDataProvider;
5253

54+
/**
55+
* @var Database
56+
*/
57+
private $fileStorageDatabase;
58+
5359
/**
5460
* @param \Magento\Backend\Block\Template\Context $context
5561
* @param \Magento\Framework\Json\EncoderInterface $jsonEncoder
5662
* @param \Magento\Catalog\Model\Product\Media\Config $mediaConfig
5763
* @param array $data
5864
* @param ImageUploadConfigDataProvider $imageUploadConfigDataProvider
65+
* @param Database $fileStorageDatabase
5966
*/
6067
public function __construct(
6168
\Magento\Backend\Block\Template\Context $context,
6269
\Magento\Framework\Json\EncoderInterface $jsonEncoder,
6370
\Magento\Catalog\Model\Product\Media\Config $mediaConfig,
6471
array $data = [],
65-
ImageUploadConfigDataProvider $imageUploadConfigDataProvider = null
72+
ImageUploadConfigDataProvider $imageUploadConfigDataProvider = null,
73+
Database $fileStorageDatabase = null
6674
) {
6775
$this->_jsonEncoder = $jsonEncoder;
6876
$this->_mediaConfig = $mediaConfig;
6977
parent::__construct($context, $data);
7078
$this->imageUploadConfigDataProvider = $imageUploadConfigDataProvider
7179
?: ObjectManager::getInstance()->get(ImageUploadConfigDataProvider::class);
80+
$this->fileStorageDatabase = $fileStorageDatabase
81+
?: ObjectManager::getInstance()->get(Database::class);
7282
}
7383

7484
/**
@@ -164,6 +174,13 @@ public function getImagesJson()
164174
$images = $this->sortImagesByPosition($value['images']);
165175
foreach ($images as &$image) {
166176
$image['url'] = $this->_mediaConfig->getMediaUrl($image['file']);
177+
if ($this->fileStorageDatabase->checkDbUsage() &&
178+
!$mediaDir->isFile($this->_mediaConfig->getMediaPath($image['file']))
179+
) {
180+
$this->fileStorageDatabase->saveFileToFilesystem(
181+
$this->_mediaConfig->getMediaPath($image['file'])
182+
);
183+
}
167184
try {
168185
$fileHandler = $mediaDir->stat($this->_mediaConfig->getMediaPath($image['file']));
169186
$image['size'] = $fileHandler['size'];
@@ -187,9 +204,12 @@ public function getImagesJson()
187204
private function sortImagesByPosition($images)
188205
{
189206
if (is_array($images)) {
190-
usort($images, function ($imageA, $imageB) {
191-
return ($imageA['position'] < $imageB['position']) ? -1 : 1;
192-
});
207+
usort(
208+
$images,
209+
function ($imageA, $imageB) {
210+
return ($imageA['position'] < $imageB['position']) ? -1 : 1;
211+
}
212+
);
193213
}
194214
return $images;
195215
}

‎app/code/Magento/Catalog/Model/Category/FileInfo.php

Lines changed: 31 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,11 @@ class FileInfo
4343
*/
4444
private $baseDirectory;
4545

46+
/**
47+
* @var ReadInterface
48+
*/
49+
private $pubDirectory;
50+
4651
/**
4752
* @param Filesystem $filesystem
4853
* @param Mime $mime
@@ -82,6 +87,20 @@ private function getBaseDirectory()
8287
return $this->baseDirectory;
8388
}
8489

90+
/**
91+
* Get Pub Directory read instance
92+
*
93+
* @return ReadInterface
94+
*/
95+
private function getPubDirectory()
96+
{
97+
if (!isset($this->pubDirectory)) {
98+
$this->pubDirectory = $this->filesystem->getDirectoryRead(DirectoryList::PUB);
99+
}
100+
101+
return $this->pubDirectory;
102+
}
103+
85104
/**
86105
* Retrieve MIME type of requested file
87106
*
@@ -135,7 +154,7 @@ private function getFilePath($fileName)
135154
{
136155
$filePath = ltrim($fileName, '/');
137156

138-
$mediaDirectoryRelativeSubpath = $this->getMediaDirectoryPathRelativeToBaseDirectoryPath();
157+
$mediaDirectoryRelativeSubpath = $this->getMediaDirectoryPathRelativeToBaseDirectoryPath($filePath);
139158
$isFileNameBeginsWithMediaDirectoryPath = $this->isBeginsWithMediaDirectoryPath($fileName);
140159

141160
// if the file is not using a relative path, it resides in the catalog/category media directory
@@ -160,7 +179,7 @@ public function isBeginsWithMediaDirectoryPath($fileName)
160179
{
161180
$filePath = ltrim($fileName, '/');
162181

163-
$mediaDirectoryRelativeSubpath = $this->getMediaDirectoryPathRelativeToBaseDirectoryPath();
182+
$mediaDirectoryRelativeSubpath = $this->getMediaDirectoryPathRelativeToBaseDirectoryPath($filePath);
164183
$isFileNameBeginsWithMediaDirectoryPath = strpos($filePath, $mediaDirectoryRelativeSubpath) === 0;
165184

166185
return $isFileNameBeginsWithMediaDirectoryPath;
@@ -169,14 +188,22 @@ public function isBeginsWithMediaDirectoryPath($fileName)
169188
/**
170189
* Get media directory subpath relative to base directory path
171190
*
191+
* @param string $filePath
172192
* @return string
173193
*/
174-
private function getMediaDirectoryPathRelativeToBaseDirectoryPath()
194+
private function getMediaDirectoryPathRelativeToBaseDirectoryPath(string $filePath = '')
175195
{
176-
$baseDirectoryPath = $this->getBaseDirectory()->getAbsolutePath();
196+
$baseDirectory = $this->getBaseDirectory();
197+
$baseDirectoryPath = $baseDirectory->getAbsolutePath();
177198
$mediaDirectoryPath = $this->getMediaDirectory()->getAbsolutePath();
199+
$pubDirectoryPath = $this->getPubDirectory()->getAbsolutePath();
178200

179201
$mediaDirectoryRelativeSubpath = substr($mediaDirectoryPath, strlen($baseDirectoryPath));
202+
$pubDirectory = $baseDirectory->getRelativePath($pubDirectoryPath);
203+
204+
if (strpos($mediaDirectoryRelativeSubpath, $pubDirectory) === 0 && strpos($filePath, $pubDirectory) !== 0) {
205+
$mediaDirectoryRelativeSubpath = substr($mediaDirectoryRelativeSubpath, strlen($pubDirectory));
206+
}
180207

181208
return $mediaDirectoryRelativeSubpath;
182209
}

‎app/code/Magento/Catalog/Observer/SetSpecialPriceStartDate.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,9 @@ public function execute(\Magento\Framework\Event\Observer $observer)
3838
{
3939
/** @var $product \Magento\Catalog\Model\Product */
4040
$product = $observer->getEvent()->getProduct();
41-
if ($product->getSpecialPrice() && ! $product->getSpecialFromDate()) {
41+
if ($product->getSpecialPrice() && $product->getSpecialFromDate() === null) {
4242
$product->setData('special_from_date', $this->localeDate->date()->setTime(0, 0));
4343
}
44-
4544
return $this;
4645
}
4746
}

‎app/code/Magento/Catalog/Test/Mftf/Section/AdminCreateProductAttributeSection.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
<element name="DefaultLabel" type="input" selector="#attribute_label"/>
1414
<element name="InputType" type="select" selector="#frontend_input"/>
1515
<element name="ValueRequired" type="select" selector="#is_required"/>
16+
<element name="UpdateProductPreviewImage" type="select" selector="[name='update_product_preview_image']"/>
1617
<element name="AdvancedProperties" type="button" selector="#advanced_fieldset-wrapper"/>
1718
<element name="DefaultValue" type="input" selector="#default_value_text"/>
1819
<element name="Scope" type="select" selector="#is_global"/>

‎app/code/Magento/Catalog/Test/Unit/Block/Adminhtml/Product/Helper/Form/Gallery/ContentTest.php

Lines changed: 75 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
use Magento\Catalog\Model\Entity\Attribute;
1010
use Magento\Catalog\Model\Product;
1111
use Magento\Framework\Phrase;
12+
use Magento\MediaStorage\Helper\File\Storage\Database;
1213

1314
/**
1415
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
@@ -50,6 +51,11 @@ class ContentTest extends \PHPUnit\Framework\TestCase
5051
*/
5152
protected $imageHelper;
5253

54+
/**
55+
* @var \Magento\MediaStorage\Helper\File\Storage\Database|\PHPUnit_Framework_MockObject_MockObject
56+
*/
57+
protected $databaseMock;
58+
5359
/**
5460
* @var \Magento\Framework\TestFramework\Unit\Helper\ObjectManager
5561
*/
@@ -71,13 +77,18 @@ public function setUp()
7177
->disableOriginalConstructor()
7278
->getMock();
7379

80+
$this->databaseMock = $this->getMockBuilder(Database::class)
81+
->disableOriginalConstructor()
82+
->getMock();
83+
7484
$this->objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
7585
$this->content = $this->objectManager->getObject(
7686
\Magento\Catalog\Block\Adminhtml\Product\Helper\Form\Gallery\Content::class,
7787
[
7888
'mediaConfig' => $this->mediaConfigMock,
7989
'jsonEncoder' => $this->jsonEncoderMock,
80-
'filesystem' => $this->fileSystemMock
90+
'filesystem' => $this->fileSystemMock,
91+
'fileStorageDatabase' => $this->databaseMock
8192
]
8293
);
8394
}
@@ -143,6 +154,13 @@ public function testGetImagesJson()
143154
$this->readMock->expects($this->any())->method('stat')->willReturnMap($sizeMap);
144155
$this->jsonEncoderMock->expects($this->once())->method('encode')->willReturnCallback('json_encode');
145156

157+
$this->readMock->expects($this->any())
158+
->method('isFile')
159+
->will($this->returnValue(true));
160+
$this->databaseMock->expects($this->any())
161+
->method('checkDbUsage')
162+
->will($this->returnValue(false));
163+
146164
$this->assertSame(json_encode($imagesResult), $this->content->getImagesJson());
147165
}
148166

@@ -210,6 +228,14 @@ public function testGetImagesJsonWithException()
210228
$this->fileSystemMock->expects($this->any())->method('getDirectoryRead')->willReturn($this->readMock);
211229
$this->mediaConfigMock->expects($this->any())->method('getMediaUrl');
212230
$this->mediaConfigMock->expects($this->any())->method('getMediaPath');
231+
232+
$this->readMock->expects($this->any())
233+
->method('isFile')
234+
->will($this->returnValue(true));
235+
$this->databaseMock->expects($this->any())
236+
->method('checkDbUsage')
237+
->will($this->returnValue(false));
238+
213239
$this->readMock->expects($this->any())->method('stat')->willReturnOnConsecutiveCalls(
214240
$this->throwException(
215241
new \Magento\Framework\Exception\FileSystemException(new Phrase('test'))
@@ -365,4 +391,52 @@ private function getMediaAttribute(string $label, string $attributeCode)
365391

366392
return $mediaAttribute;
367393
}
394+
395+
/**
396+
* Test GetImagesJson() calls MediaStorage functions to obtain image from DB prior to stat call
397+
*
398+
* @return void
399+
*/
400+
public function testGetImagesJsonMediaStorageMode()
401+
{
402+
$images = [
403+
'images' => [
404+
[
405+
'value_id' => '0',
406+
'file' => 'file_1.jpg',
407+
'media_type' => 'image',
408+
'position' => '0'
409+
]
410+
]
411+
];
412+
413+
$mediaPath = [
414+
['file_1.jpg', 'catalog/product/image_1.jpg']
415+
];
416+
417+
$this->content->setElement($this->galleryMock);
418+
419+
$this->galleryMock->expects($this->once())
420+
->method('getImages')
421+
->willReturn($images);
422+
$this->fileSystemMock->expects($this->once())
423+
->method('getDirectoryRead')
424+
->willReturn($this->readMock);
425+
$this->mediaConfigMock->expects($this->any())
426+
->method('getMediaPath')
427+
->willReturnMap($mediaPath);
428+
429+
$this->readMock->expects($this->any())
430+
->method('isFile')
431+
->will($this->returnValue(false));
432+
$this->databaseMock->expects($this->any())
433+
->method('checkDbUsage')
434+
->will($this->returnValue(true));
435+
436+
$this->databaseMock->expects($this->once())
437+
->method('saveFileToFilesystem')
438+
->with('catalog/product/image_1.jpg');
439+
440+
$this->content->getImagesJson();
441+
}
368442
}

0 commit comments

Comments
 (0)