Skip to content

Commit 8f130da

Browse files
eug123eug123
committed
Merge remote-tracking branch 'origin/develop' into MAGETWO-56915
2 parents 641658c + 70b8638 commit 8f130da

File tree

19 files changed

+240
-86
lines changed

19 files changed

+240
-86
lines changed

‎.htaccess

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232

3333
DirectoryIndex index.php
3434

35+
<IfModule mod_php5.c>
3536
############################################
3637
## adjust memory limit
3738

@@ -53,7 +54,30 @@
5354
## disable user agent verification to not break multiple image upload
5455

5556
php_flag suhosin.session.cryptua off
57+
</IfModule>
58+
<IfModule mod_php7.c>
59+
############################################
60+
## adjust memory limit
61+
62+
php_value memory_limit 768M
63+
php_value max_execution_time 18000
64+
65+
############################################
66+
## disable automatic session start
67+
## before autoload was initialized
68+
69+
php_flag session.auto_start off
70+
71+
############################################
72+
## enable resulting html compression
73+
74+
#php_flag zlib.output_compression on
5675

76+
###########################################
77+
## disable user agent verification to not break multiple image upload
78+
79+
php_flag suhosin.session.cryptua off
80+
</IfModule>
5781
<IfModule mod_security.c>
5882
###########################################
5983
## disable POST processing to not break multiple image upload

‎.user.ini

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
memory_limit = 768M
2+
max_execution_time = 18000
3+
session.auto_start = off
4+
suhosin.session.cryptua = off

‎app/code/Magento/Backend/Block/Store/Switcher.php

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@
88

99
/**
1010
* Store switcher block
11-
*
12-
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
1311
*/
1412
class Switcher extends \Magento\Backend\Block\Template
1513
{
@@ -152,11 +150,7 @@ public function getWebsites()
152150
{
153151
$websites = $this->_storeManager->getWebsites();
154152
if ($websiteIds = $this->getWebsiteIds()) {
155-
foreach (array_keys($websites) as $websiteId) {
156-
if (!in_array($websiteId, $websiteIds)) {
157-
unset($websites[$websiteId]);
158-
}
159-
}
153+
$websites = array_intersect_key($websites, array_flip($websiteIds));
160154
}
161155
return $websites;
162156
}

‎app/code/Magento/Backend/Test/Unit/Block/Store/SwitcherTest.php

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
<?php
2+
/**
3+
* Copyright © 2016 Magento. All rights reserved.
4+
* See COPYING.txt for license details.
5+
*/
6+
7+
namespace Magento\Backend\Test\Unit\Block\Store;
8+
9+
class SwitcherTest extends \PHPUnit_Framework_TestCase
10+
{
11+
/**
12+
* @var \Magento\Backend\Block\Store\Switcher
13+
*/
14+
private $switcherBlock;
15+
16+
private $storeManagerMock;
17+
18+
protected function setUp()
19+
{
20+
$this->storeManagerMock = $this->getMock(\Magento\Store\Model\StoreManagerInterface::class);
21+
$objectHelper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
22+
$context = $objectHelper->getObject(
23+
\Magento\Backend\Block\Template\Context::class,
24+
[
25+
'storeManager' => $this->storeManagerMock,
26+
]
27+
);
28+
29+
$this->switcherBlock = $objectHelper->getObject(
30+
\Magento\Backend\Block\Store\Switcher::class,
31+
['context' => $context]
32+
);
33+
}
34+
35+
public function testGetWebsites()
36+
{
37+
$websiteMock = $this->getMock(\Magento\Store\Model\Website::class, [], [], '', false);
38+
$websites = [0 => $websiteMock, 1 => $websiteMock];
39+
$this->storeManagerMock->expects($this->once())->method('getWebsites')->will($this->returnValue($websites));
40+
$this->assertEquals($websites, $this->switcherBlock->getWebsites());
41+
}
42+
43+
public function testGetWebsitesIfSetWebsiteIds()
44+
{
45+
$websiteMock = $this->getMock(\Magento\Store\Model\Website::class, [], [], '', false);
46+
$websites = [0 => $websiteMock, 1 => $websiteMock];
47+
$this->storeManagerMock->expects($this->once())->method('getWebsites')->will($this->returnValue($websites));
48+
49+
$this->switcherBlock->setWebsiteIds([1]);
50+
$expected = [1 => $websiteMock];
51+
$this->assertEquals($expected, $this->switcherBlock->getWebsites());
52+
}
53+
}

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

Lines changed: 2 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,6 @@ class Content extends \Magento\Backend\Block\Widget
4040
*/
4141
private $imageHelper;
4242

43-
/**
44-
* @var \Magento\Framework\View\Asset\Repository
45-
*/
46-
private $assetRepo;
47-
4843
/**
4944
* @param \Magento\Backend\Block\Template\Context $context
5045
* @param \Magento\Framework\Json\EncoderInterface $jsonEncoder
@@ -147,13 +142,8 @@ public function getImagesJson()
147142
$fileHandler = $mediaDir->stat($this->_mediaConfig->getMediaPath($image['file']));
148143
$image['size'] = $fileHandler['size'];
149144
} catch (FileSystemException $e) {
150-
$staticDir = $this->_filesystem->getDirectoryRead(DirectoryList::STATIC_VIEW);
151-
$image['url'] = $this->getImageHelper()->getDefaultPlaceholderUrl('thumbnail');
152-
$fileHandler = $staticDir->stat(
153-
$this->getAssetRepo()
154-
->createAsset($this->getImageHelper()->getPlaceholder('thumbnail'))->getPath()
155-
);
156-
$image['size'] = $fileHandler['size'];
145+
$image['url'] = $this->getImageHelper()->getDefaultPlaceholderUrl('small_image');
146+
$image['size'] = 0;
157147
$this->_logger->warning($e);
158148
}
159149
}
@@ -262,18 +252,4 @@ private function getImageHelper()
262252
}
263253
return $this->imageHelper;
264254
}
265-
266-
/**
267-
* @return \Magento\Framework\View\Asset\Repository
268-
* @deprecated
269-
*/
270-
private function getAssetRepo()
271-
{
272-
if ($this->assetRepo === null) {
273-
$this->assetRepo = \Magento\Framework\App\ObjectManager::getInstance()
274-
->get(\Magento\Framework\View\Asset\Repository::class);
275-
}
276-
277-
return $this->assetRepo;
278-
}
279255
}

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

Lines changed: 6 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -46,11 +46,6 @@ class ContentTest extends \PHPUnit_Framework_TestCase
4646
*/
4747
protected $imageHelper;
4848

49-
/**
50-
* @var \Magento\Framework\View\Asset\Repository|\PHPUnit_Framework_MockObject_MockObject
51-
*/
52-
protected $assetRepo;
53-
5449
/**
5550
* @var \Magento\Framework\TestFramework\Unit\Helper\ObjectManager
5651
*/
@@ -171,12 +166,7 @@ public function testGetImagesJsonWithException()
171166
{
172167
$this->imageHelper = $this->getMockBuilder(\Magento\Catalog\Helper\Image::class)
173168
->disableOriginalConstructor()
174-
->setMethods(['getDefaultPlaceholderUrl', 'getPlaceholder'])
175-
->getMock();
176-
177-
$this->assetRepo = $this->getMockBuilder(\Magento\Framework\View\Asset\Repository::class)
178-
->disableOriginalConstructor()
179-
->setMethods(['createAsset', 'getPath'])
169+
->setMethods(['getDefaultPlaceholderUrl'])
180170
->getMock();
181171

182172
$this->objectManager->setBackwardCompatibleProperty(
@@ -185,32 +175,24 @@ public function testGetImagesJsonWithException()
185175
$this->imageHelper
186176
);
187177

188-
$this->objectManager->setBackwardCompatibleProperty(
189-
$this->content,
190-
'assetRepo',
191-
$this->assetRepo
192-
);
193-
194178
$placeholderUrl = 'url_to_the_placeholder/placeholder.jpg';
195179

196-
$sizePlaceholder = ['size' => 399659];
197-
198180
$imagesResult = [
199181
[
200182
'value_id' => '2',
201183
'file' => 'file_2.jpg',
202184
'media_type' => 'image',
203185
'position' => '0',
204186
'url' => 'url_to_the_placeholder/placeholder.jpg',
205-
'size' => 399659
187+
'size' => 0
206188
],
207189
[
208190
'value_id' => '1',
209191
'file' => 'file_1.jpg',
210192
'media_type' => 'image',
211193
'position' => '1',
212194
'url' => 'url_to_the_placeholder/placeholder.jpg',
213-
'size' => 399659
195+
'size' => 0
214196
]
215197
];
216198

@@ -238,18 +220,13 @@ public function testGetImagesJsonWithException()
238220
$this->mediaConfigMock->expects($this->any())->method('getMediaPath');
239221
$this->readMock->expects($this->any())->method('stat')->willReturnOnConsecutiveCalls(
240222
$this->throwException(
241-
new \Magento\Framework\Exception\FileSystemException(new \Magento\Framework\Phrase('test'))
223+
new \Magento\Framework\Exception\FileSystemException(new Phrase('test'))
242224
),
243-
$sizePlaceholder,
244225
$this->throwException(
245-
new \Magento\Framework\Exception\FileSystemException(new \Magento\Framework\Phrase('test'))
246-
),
247-
$sizePlaceholder
226+
new \Magento\Framework\Exception\FileSystemException(new Phrase('test'))
227+
)
248228
);
249229
$this->imageHelper->expects($this->any())->method('getDefaultPlaceholderUrl')->willReturn($placeholderUrl);
250-
$this->imageHelper->expects($this->any())->method('getPlaceholder');
251-
$this->assetRepo->expects($this->any())->method('createAsset')->willReturnSelf();
252-
$this->assetRepo->expects($this->any())->method('getPath');
253230
$this->jsonEncoderMock->expects($this->once())->method('encode')->willReturnCallback('json_encode');
254231

255232
$this->assertSame(json_encode($imagesResult), $this->content->getImagesJson());

‎app/code/Magento/Catalog/view/frontend/templates/product/view/form.phtml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,9 @@
4242
'jquery',
4343
'priceBox'
4444
], function($){
45-
var priceBoxes = $('[data-role=priceBox]');
45+
var dataPriceBoxSelector = '[data-role=priceBox]',
46+
dataProductIdSelector = '[data-product-id=<?php echo $block->escapeHtml($_product->getId())?>]',
47+
priceBoxes = $(dataPriceBoxSelector + dataProductIdSelector);
4648

4749
priceBoxes = priceBoxes.filter(function(index, elem){
4850
return !$(elem).find('.price-from').length;

‎app/code/Magento/Catalog/view/frontend/templates/product/view/options.phtml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,15 @@
1010
?>
1111

1212
<?php $_options = $block->decorateArray($block->getOptions()) ?>
13+
<?php $_productId = $block->getProduct()->getId() ?>
1314
<?php if (count($_options)):?>
1415
<script type="text/x-magento-init">
1516
{
1617
"#product_addtocart_form": {
1718
"priceOptions": {
1819
"optionConfig": <?php /* @escapeNotVerified */ echo $block->getJsonConfig()?>,
1920
"controlContainer": ".field",
20-
"priceHolderSelector": "[data-role=priceBox]"
21+
"priceHolderSelector": "[data-product-id='<?php echo $block->escapeHtml($_productId)?>'][data-role=priceBox]"
2122
}
2223
}
2324
}

‎app/code/Magento/Sales/view/adminhtml/layout/sales_order_status_index.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<argument name="dataSource" xsi:type="object">Magento\Sales\Model\ResourceModel\Status\Collection</argument>
1616
<argument name="default_sort" xsi:type="string">state</argument>
1717
<argument name="default_dir" xsi:type="string">desc</argument>
18-
<argument name="pager_visibility" xsi:type="string">0</argument>
18+
<argument name="pager_visibility" xsi:type="string">1</argument>
1919
</arguments>
2020
<block class="Magento\Backend\Block\Widget\Grid\ColumnSet" as="grid.columnSet" name="sales_order_status.grid.columnSet">
2121
<arguments>

‎app/code/Magento/Sales/view/frontend/templates/order/history.phtml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,10 @@
4242
<span><?php /* @escapeNotVerified */ echo __('View Order') ?></span>
4343
</a>
4444
<?php if ($this->helper('Magento\Sales\Helper\Reorder')->canReorder($_order->getEntityId())) : ?>
45-
<a href="<?php /* @escapeNotVerified */ echo $block->getReorderUrl($_order) ?>" class="action order">
45+
<a href="#" data-post='<?php /* @escapeNotVerified */ echo
46+
$this->helper(\Magento\Framework\Data\Helper\PostHelper::class)
47+
->getPostData($block->getReorderUrl($_order))
48+
?>' class="action order">
4649
<span><?php /* @escapeNotVerified */ echo __('Reorder') ?></span>
4750
</a>
4851
<?php endif ?>

0 commit comments

Comments
 (0)