Skip to content

Commit aa4ae30

Browse files
author
Oleksii Korshenko
authored
Merge pull request #1276 from magento-engcom/develop-prs
#9588 #9904
2 parents 9c387e3 + f0cb267 commit aa4ae30

File tree

4 files changed

+85
-32
lines changed
  • app/code/Magento/Catalog
  • lib/internal/Magento/Framework/View

4 files changed

+85
-32
lines changed

‎app/code/Magento/Catalog/Model/Category/Attribute/Backend/Image.php

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,17 @@ private function getImageUploader()
118118
return $this->imageUploader;
119119
}
120120

121+
/**
122+
* Check if temporary file is available for new image upload.
123+
*
124+
* @param array $value
125+
* @return bool
126+
*/
127+
private function isTmpFileAvailable($value)
128+
{
129+
return is_array($value) && isset($value[0]['tmp_name']);
130+
}
131+
121132
/**
122133
* Save uploaded file and set its name to category
123134
*
@@ -128,14 +139,13 @@ public function afterSave($object)
128139
{
129140
$value = $object->getData($this->additionalData . $this->getAttribute()->getName());
130141

131-
if ($imageName = $this->getUploadedImageName($value)) {
142+
if ($this->isTmpFileAvailable($value) && $imageName = $this->getUploadedImageName($value)) {
132143
try {
133144
$this->getImageUploader()->moveFileFromTmp($imageName);
134145
} catch (\Exception $e) {
135146
$this->_logger->critical($e);
136147
}
137148
}
138-
139149
return $this;
140150
}
141151
}

‎app/code/Magento/Catalog/Test/Unit/Model/Category/Attribute/Backend/ImageTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -240,7 +240,7 @@ public function testAfterSaveWithAdditionalData($value)
240240
$object = new \Magento\Framework\DataObject(
241241
[
242242
'test_attribute' => $value,
243-
'_additional_data_test_attribute' => [['name' => 'test1234.jpg']]
243+
'_additional_data_test_attribute' => [['name' => 'test1234.jpg', 'tmp_name' => 'test-test-1234']]
244244
]
245245
);
246246

@@ -284,7 +284,7 @@ public function testAfterSaveWithExceptions()
284284

285285
$object = new \Magento\Framework\DataObject(
286286
[
287-
'_additional_data_test_attribute' => [['name' => 'test1234.jpg']]
287+
'_additional_data_test_attribute' => [['name' => 'test1234.jpg', 'tmp_name' => 'test-test-1234']]
288288
]
289289
);
290290

‎lib/internal/Magento/Framework/View/Page/Config/Generator/Head.php

Lines changed: 19 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77

88
use Magento\Framework\View\Layout;
99
use Magento\Framework\View\Page\Config\Structure;
10+
use Magento\Framework\App\ObjectManager;
1011

1112
class Head implements Layout\GeneratorInterface
1213
{
@@ -57,14 +58,23 @@ class Head implements Layout\GeneratorInterface
5758
*/
5859
protected $pageConfig;
5960

61+
/**
62+
* @var \Magento\Framework\UrlInterface
63+
*/
64+
private $url;
65+
6066
/**
6167
* Constructor
6268
*
6369
* @param \Magento\Framework\View\Page\Config $pageConfig
70+
* @param \Magento\Framework\UrlInterface|null $url
6471
*/
65-
public function __construct(\Magento\Framework\View\Page\Config $pageConfig)
66-
{
72+
public function __construct(
73+
\Magento\Framework\View\Page\Config $pageConfig,
74+
\Magento\Framework\UrlInterface $url = null
75+
) {
6776
$this->pageConfig = $pageConfig;
77+
$this->url = $url ?: ObjectManager::getInstance()->get(\Magento\Framework\UrlInterface::class);
6878
}
6979

7080
/**
@@ -107,10 +117,15 @@ protected function processAssets(Structure $pageStructure)
107117
{
108118
foreach ($pageStructure->getAssets() as $name => $data) {
109119
if (isset($data['src_type']) && in_array($data['src_type'], $this->remoteAssetTypes)) {
120+
if ($data['src_type'] === self::SRC_TYPE_CONTROLLER) {
121+
$data['src'] = $this->url->getUrl($data['src']);
122+
}
123+
110124
$this->pageConfig->addRemotePageAsset(
111-
$name,
125+
$data['src'],
112126
isset($data['content_type']) ? $data['content_type'] : self::VIRTUAL_CONTENT_TYPE_LINK,
113-
$this->getAssetProperties($data)
127+
$this->getAssetProperties($data),
128+
$name
114129
);
115130
} else {
116131
$this->pageConfig->addPageAsset($name, $this->getAssetProperties($data));

‎lib/internal/Magento/Framework/View/Test/Unit/Page/Config/Generator/HeadTest.php

Lines changed: 52 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,12 @@
66

77
namespace Magento\Framework\View\Test\Unit\Page\Config\Generator;
88

9-
use \Magento\Framework\View\Page\Config\Generator\Head;
10-
9+
use Magento\Framework\View\Page\Config\Generator\Head;
1110
use Magento\Framework\View\Page\Config as PageConfig;
1211
use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
12+
use Magento\Framework\View\Layout\Generator\Context;
13+
use Magento\Framework\View\Page\Config\Structure;
14+
use Magento\Framework\View\Layout\Reader\Context as ReaderContext;
1315

1416
/**
1517
* Test for page config generator model
@@ -26,6 +28,11 @@ class HeadTest extends \PHPUnit_Framework_TestCase
2628
*/
2729
protected $pageConfigMock;
2830

31+
/**
32+
* @var \Magento\Framework\UrlInterface|\PHPUnit_Framework_MockObject_MockObject
33+
*/
34+
protected $urlMock;
35+
2936
/**
3037
* @var \Magento\Framework\View\Page\Title|\PHPUnit_Framework_MockObject_MockObject
3138
*/
@@ -39,47 +46,70 @@ protected function setUp()
3946
$this->title = $this->getMockBuilder(\Magento\Framework\View\Page\Title::class)
4047
->disableOriginalConstructor()
4148
->getMock();
49+
$this->urlMock = $this->getMockBuilder(\Magento\Framework\UrlInterface::class)
50+
->disableOriginalConstructor()
51+
->getMock();
4252

4353
$objectManagerHelper = new ObjectManagerHelper($this);
4454
$this->headGenerator = $objectManagerHelper->getObject(
4555
\Magento\Framework\View\Page\Config\Generator\Head::class,
4656
[
4757
'pageConfig' => $this->pageConfigMock,
58+
'url' => $this->urlMock,
4859
]
4960
);
5061
}
5162

5263
public function testProcess()
5364
{
54-
$generatorContextMock = $this->getMockBuilder(\Magento\Framework\View\Layout\Generator\Context::class)
55-
->disableOriginalConstructor()
56-
->getMock();
65+
$generatorContextMock = $this->getMock(Context::class, [], [], '', false);
5766
$this->title->expects($this->any())->method('set')->with()->will($this->returnSelf());
58-
$structureMock = $this->getMockBuilder(\Magento\Framework\View\Page\Config\Structure::class)
59-
->disableOriginalConstructor()
60-
->getMock();
61-
62-
$readerContextMock = $this->getMockBuilder(\Magento\Framework\View\Layout\Reader\Context::class)
63-
->disableOriginalConstructor()
64-
->getMock();
65-
$readerContextMock->expects($this->any())
66-
->method('getPageConfigStructure')
67-
->willReturn($structureMock);
67+
$structureMock = $this->getMock(Structure::class, [], [], '', false);
68+
$readerContextMock = $this->getMock(ReaderContext::class, [], [], '', false);
69+
$readerContextMock->expects($this->any())->method('getPageConfigStructure')->willReturn($structureMock);
6870

6971
$structureMock->expects($this->once())->method('processRemoveAssets');
7072
$structureMock->expects($this->once())->method('processRemoveElementAttributes');
73+
$this->urlMock->expects($this->once())
74+
->method('getUrl')
75+
->with('customcss/render/css')
76+
->willReturn('http://magento.dev/customcss/render/css');
7177

7278
$assets = [
73-
'remoteCss' => ['src' => 'file-url', 'src_type' => 'url', 'media' => "all", 'content_type' => 'css'],
74-
'remoteLink' => ['src' => 'file-url', 'src_type' => 'url', 'media' => "all"],
75-
'name' => ['src' => 'file-path', 'ie_condition' => 'lt IE 7', 'media' => "print", 'content_type' => 'css'],
79+
'remoteCss' => [
80+
'src' => 'file-url-css',
81+
'src_type' => 'url',
82+
'content_type' => 'css',
83+
'media' => 'all',
84+
],
85+
'remoteLink' => [
86+
'src' => 'file-url-link',
87+
'src_type' => 'url',
88+
'media' => 'all',
89+
],
90+
'controllerCss' => [
91+
'src' => 'customcss/render/css',
92+
'src_type' => 'controller',
93+
'content_type' => 'css',
94+
'media' => 'all',
95+
],
96+
'name' => [
97+
'src' => 'file-path',
98+
'ie_condition' => 'lt IE 7',
99+
'content_type' => 'css',
100+
'media' => 'print',
101+
],
76102
];
103+
77104
$this->pageConfigMock->expects($this->at(0))
78105
->method('addRemotePageAsset')
79-
->with('remoteCss', 'css', ['attributes' => ['media' => 'all']]);
106+
->with('file-url-css', 'css', ['attributes' => ['media' => 'all']]);
80107
$this->pageConfigMock->expects($this->at(1))
81108
->method('addRemotePageAsset')
82-
->with('remoteLink', Head::VIRTUAL_CONTENT_TYPE_LINK, ['attributes' => ['media' => 'all']]);
109+
->with('file-url-link', Head::VIRTUAL_CONTENT_TYPE_LINK, ['attributes' => ['media' => 'all']]);
110+
$this->pageConfigMock->expects($this->at(2))
111+
->method('addRemotePageAsset')
112+
->with('http://magento.dev/customcss/render/css', 'css', ['attributes' => ['media' => 'all']]);
83113
$this->pageConfigMock->expects($this->once())
84114
->method('addPageAsset')
85115
->with('name', ['attributes' => ['media' => 'print'], 'ie_condition' => 'lt IE 7']);
@@ -121,9 +151,7 @@ public function testProcess()
121151
[PageConfig::ELEMENT_TYPE_HTML, 'html_attr_1', 'html_attr_1']
122152
);
123153

124-
$this->assertEquals(
125-
$this->headGenerator,
126-
$this->headGenerator->process($readerContextMock, $generatorContextMock)
127-
);
154+
$result = $this->headGenerator->process($readerContextMock, $generatorContextMock);
155+
$this->assertEquals($this->headGenerator, $result);
128156
}
129157
}

0 commit comments

Comments
 (0)