Skip to content

Commit dce1e43

Browse files
author
Alexander Akimov
authored
Merge pull request #3680 from magento-tsg/2.1.17-develop-pr62
[TSG] Backporting for 2.1 (pr62) (2.1.17)
2 parents 6978cf2 + 9192aed commit dce1e43

File tree

27 files changed

+707
-137
lines changed

27 files changed

+707
-137
lines changed

‎.htaccess

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
# All explanations you could find in .htaccess.sample file
2+
## Specifies option, to use methods arguments in backtrace or not
3+
SetEnv MAGE_DEBUG_SHOW_ARGS 1
24
DirectoryIndex index.php
35
<IfModule mod_php5.c>
46
php_value memory_limit 756M

‎app/code/Magento/Config/Test/Unit/Block/System/Config/Form/Field/FileTest.php

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,11 @@
1111

1212
class FileTest extends \PHPUnit_Framework_TestCase
1313
{
14+
/**
15+
* @var \Magento\Framework\Escaper|\PHPUnit_Framework_MockObject_MockObject
16+
*/
17+
private $escaperMock;
18+
1419
/**
1520
* @var \Magento\Config\Block\System\Config\Form\Field\File
1621
*/
@@ -24,6 +29,10 @@ class FileTest extends \PHPUnit_Framework_TestCase
2429
protected function setUp()
2530
{
2631
$objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
32+
$this->escaperMock = $this->getMockBuilder(\Magento\Framework\Escaper::class)
33+
->disableOriginalConstructor()
34+
->getMock();
35+
$this->escaperMock->method('escapeHtml')->willReturnArgument(0);
2736

2837
$this->testData = [
2938
'before_element_html' => 'test_before_element_html',
@@ -39,8 +48,11 @@ protected function setUp()
3948
];
4049

4150
$this->file = $objectManager->getObject(
42-
'Magento\Config\Block\System\Config\Form\Field\File',
43-
['data' => $this->testData]
51+
\Magento\Config\Block\System\Config\Form\Field\File::class,
52+
[
53+
'escaper' => $this->escaperMock,
54+
'data' => $this->testData,
55+
]
4456
);
4557

4658
$formMock = new \Magento\Framework\DataObject();

‎app/code/Magento/Config/Test/Unit/Block/System/Config/Form/Field/ImageTest.php

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,11 @@
1313

1414
class ImageTest extends \PHPUnit_Framework_TestCase
1515
{
16+
/**
17+
* @var \Magento\Framework\Escaper|\PHPUnit_Framework_MockObject_MockObject
18+
*/
19+
private $escaperMock;
20+
1621
/**
1722
* @var \Magento\Framework\Url|\PHPUnit_Framework_MockObject_MockObject
1823
*/
@@ -31,10 +36,15 @@ class ImageTest extends \PHPUnit_Framework_TestCase
3136
protected function setUp()
3237
{
3338
$objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
34-
$this->urlBuilderMock = $this->getMock('Magento\Framework\Url', [], [], '', false);
39+
$this->escaperMock = $this->getMockBuilder(\Magento\Framework\Escaper::class)
40+
->disableOriginalConstructor()
41+
->getMock();
42+
$this->escaperMock->method('escapeHtml')->willReturnArgument(0);
43+
$this->urlBuilderMock = $this->getMock(\Magento\Framework\Url::class, [], [], '', false);
3544
$this->image = $objectManager->getObject(
36-
'Magento\Config\Block\System\Config\Form\Field\Image',
45+
\Magento\Config\Block\System\Config\Form\Field\Image::class,
3746
[
47+
'escaper' => $this->escaperMock,
3848
'urlBuilder' => $this->urlBuilderMock,
3949
]
4050
);
@@ -74,7 +84,7 @@ public function testGetElementHtmlWithValue()
7484
'showInWebsite' => '1',
7585
'showInStore' => '1',
7686
'label' => null,
77-
'backend_model' => 'Magento\\Backend\\Model\\Config\\Backend\\Image',
87+
'backend_model' => \Magento\Config\Model\Config\Backend\Image::class,
7888
'upload_dir' => [
7989
'config' => 'system/filesystem/media',
8090
'scope_info' => '1',

‎app/code/Magento/Config/Test/Unit/Block/System/Config/Form/Field/Select/AllowspecificTest.php

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,11 @@
77

88
class AllowspecificTest extends \PHPUnit_Framework_TestCase
99
{
10+
/**
11+
* @var \Magento\Framework\Escaper|\PHPUnit_Framework_MockObject_MockObject
12+
*/
13+
private $escaperMock;
14+
1015
/**
1116
* @var \Magento\Config\Block\System\Config\Form\Field\Select\Allowspecific
1217
*/
@@ -20,10 +25,17 @@ class AllowspecificTest extends \PHPUnit_Framework_TestCase
2025
protected function setUp()
2126
{
2227
$testHelper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
23-
$this->_object = $testHelper->getObject('Magento\Config\Block\System\Config\Form\Field\Select\Allowspecific');
28+
$this->escaperMock = $this->getMockBuilder(\Magento\Framework\Escaper::class)
29+
->disableOriginalConstructor()
30+
->getMock();
31+
$this->escaperMock->method('escapeHtml')->willReturnArgument(0);
32+
$this->_object = $testHelper->getObject(
33+
\Magento\Config\Block\System\Config\Form\Field\Select\Allowspecific::class,
34+
['escaper' => $this->escaperMock]
35+
);
2436
$this->_object->setData('html_id', 'spec_element');
2537
$this->_formMock = $this->getMock(
26-
'Magento\Framework\Data\Form',
38+
\Magento\Framework\Data\Form::class,
2739
['getHtmlIdPrefix', 'getHtmlIdSuffix', 'getElement'],
2840
[],
2941
'',
@@ -69,7 +81,7 @@ public function testGetHtmlWhenValueIsEmpty($value)
6981
$this->_object->setForm($this->_formMock);
7082

7183
$elementMock = $this->getMock(
72-
'Magento\Framework\Data\Form\Element\Select',
84+
\Magento\Framework\Data\Form\Element\Select::class,
7385
['setDisabled'],
7486
[],
7587
'',

‎app/code/Magento/ConfigurableProduct/view/adminhtml/web/js/components/dynamic-rows-configurable.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -218,8 +218,8 @@ define([
218218

219219
_.each(tmpData, function (row, index) {
220220
path = this.dataScope + '.' + this.index + '.' + (this.startIndex + index);
221-
row.attributes = $('<i></i>').text(row.attributes).text();
222-
row.sku = $('<i></i>').text(row.sku).text();
221+
row.attributes = $('<i></i>').text(row.attributes).html();
222+
row.sku = $('<i></i>').text(row.sku).html();
223223
this.source.set(path, row);
224224
}, this);
225225

@@ -379,8 +379,8 @@ define([
379379
product = {
380380
'id': row.productId,
381381
'product_link': row.productUrl,
382-
'name': $('<i></i>').text(row.name).text(),
383-
'sku': $('<i></i>').text(row.sku).text(),
382+
'name': $('<i></i>').text(row.name).html(),
383+
'sku': $('<i></i>').text(row.sku).html(),
384384
'status': row.status,
385385
'price': row.price,
386386
'price_currency': row.priceCurrency,

‎app/code/Magento/Customer/Test/Unit/Model/Renderer/RegionTest.php

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -21,42 +21,42 @@ public function testRender($regionCollection)
2121
false
2222
);
2323
$directoryHelperMock = $this->getMock(
24-
'Magento\Directory\Helper\Data',
24+
\Magento\Directory\Helper\Data::class,
2525
['isRegionRequired'],
2626
[],
2727
'',
2828
false
2929
);
30-
$escaperMock = $this->getMock('Magento\Framework\Escaper', [], [], '', false);
30+
$escaperMock = $this->getMock(\Magento\Framework\Escaper::class, [], [], '', false);
3131
$elementMock = $this->getMock(
32-
'Magento\Framework\Data\Form\Element\AbstractElement',
33-
['getForm', 'getHtmlAttributes'],
32+
\Magento\Framework\Data\Form\Element\AbstractElement::class,
33+
['getForm', 'getHtmlAttributes', 'getHtmlId', 'getName'],
3434
[],
3535
'',
3636
false
3737
);
3838
$countryMock = $this->getMock(
39-
'Magento\Framework\Data\Form\Element\AbstractElement',
39+
\Magento\Framework\Data\Form\Element\AbstractElement::class,
4040
['getValue'],
4141
[],
4242
'',
4343
false
4444
);
4545
$regionMock = $this->getMock(
46-
'Magento\Framework\Data\Form\Element\AbstractElement',
46+
\Magento\Framework\Data\Form\Element\AbstractElement::class,
4747
[],
4848
[],
4949
'',
5050
false
5151
);
5252
$countryModelMock = $this->getMock(
53-
'Magento\Directory\Model\Country',
53+
\Magento\Directory\Model\Country::class,
5454
['setId', 'getLoadedRegionCollection', 'toOptionArray', '__wakeup'],
5555
[],
5656
'',
5757
false
5858
);
59-
$formMock = $this->getMock('Magento\Framework\Data\Form', ['getElement'], [], '', false);
59+
$formMock = $this->getMock(\Magento\Framework\Data\Form::class, ['getElement'], [], '', false);
6060

6161
$elementMock->expects($this->any())->method('getForm')->will($this->returnValue($formMock));
6262
$elementMock->expects(
@@ -100,7 +100,7 @@ public function testRender($regionCollection)
100100

101101
$model = new \Magento\Customer\Model\Renderer\Region($countryFactoryMock, $directoryHelperMock, $escaperMock);
102102

103-
$static = new \ReflectionProperty('Magento\Customer\Model\Renderer\Region', '_regionCollections');
103+
$static = new \ReflectionProperty(\Magento\Customer\Model\Renderer\Region::class, '_regionCollections');
104104
$static->setAccessible(true);
105105
$static->setValue([]);
106106

‎app/code/Magento/OfflineShipping/Test/Unit/Block/Adminhtml/Form/Field/ImportTest.php

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,11 @@
1313

1414
class ImportTest extends \PHPUnit_Framework_TestCase
1515
{
16+
/**
17+
* @var \Magento\Framework\Escaper|\PHPUnit_Framework_MockObject_MockObject
18+
*/
19+
private $escaperMock;
20+
1621
/**
1722
* @var \Magento\OfflineShipping\Block\Adminhtml\Form\Field\Import
1823
*/
@@ -26,18 +31,25 @@ class ImportTest extends \PHPUnit_Framework_TestCase
2631
protected function setUp()
2732
{
2833
$this->_formMock = $this->getMock(
29-
'Magento\Framework\Data\Form',
34+
\Magento\Framework\Data\Form::class,
3035
['getFieldNameSuffix', 'addSuffixToName'],
3136
[],
3237
'',
3338
false,
3439
false
3540
);
41+
$this->escaperMock = $this->getMockBuilder(\Magento\Framework\Escaper::class)
42+
->disableOriginalConstructor()
43+
->getMock();
44+
$this->escaperMock->method('escapeHtml')->willReturnArgument(0);
3645
$testData = ['name' => 'test_name', 'html_id' => 'test_html_id'];
3746
$testHelper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
3847
$this->_object = $testHelper->getObject(
39-
'Magento\OfflineShipping\Block\Adminhtml\Form\Field\Import',
40-
['data' => $testData]
48+
\Magento\OfflineShipping\Block\Adminhtml\Form\Field\Import::class,
49+
[
50+
'escaper' => $this->escaperMock,
51+
'data' => $testData,
52+
]
4153
);
4254
$this->_object->setForm($this->_formMock);
4355
}

‎app/code/Magento/Paypal/Test/Unit/Block/Adminhtml/System/Config/Field/Enable/AbstractEnableTest.php

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,18 +33,19 @@ protected function setUp()
3333
{
3434
$objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
3535

36-
$this->elementMock = $this->getMockBuilder('Magento\Framework\Data\Form\Element\AbstractElement')
36+
$this->elementMock = $this->getMockBuilder(\Magento\Framework\Data\Form\Element\AbstractElement::class)
3737
->setMethods(
3838
[
3939
'getHtmlId',
40+
'getName',
4041
'getTooltip',
4142
'getForm',
4243
]
4344
)->disableOriginalConstructor()
4445
->getMockForAbstractClass();
4546

4647
$this->abstractEnable = $objectManager->getObject(
47-
'Magento\Paypal\Test\Unit\Block\Adminhtml\System\Config\Field\Enable\AbstractEnable\Stub'
48+
\Magento\Paypal\Test\Unit\Block\Adminhtml\System\Config\Field\Enable\AbstractEnable\Stub::class
4849
);
4950
}
5051

@@ -65,7 +66,7 @@ public function testGetUiId()
6566
*/
6667
public function testRender()
6768
{
68-
$formMock = $this->getMockBuilder('Magento\Framework\Data\Form')
69+
$formMock = $this->getMockBuilder(\Magento\Framework\Data\Form::class)
6970
->setMethods(['getFieldNameSuffix'])
7071
->disableOriginalConstructor()
7172
->getMock();

‎app/code/Magento/Quote/Model/Quote/Address/BillingAddressPersister.php

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@
1212
use Magento\Quote\Model\QuoteAddressValidator;
1313
use Magento\Customer\Api\AddressRepositoryInterface;
1414

15+
/**
16+
* Saves billing address for quotes.
17+
*/
1518
class BillingAddressPersister
1619
{
1720
/**
@@ -37,17 +40,17 @@ public function __construct(
3740
}
3841

3942
/**
43+
* Save address for billing.
44+
*
4045
* @param CartInterface $quote
4146
* @param AddressInterface $address
4247
* @param bool $useForShipping
4348
* @return void
44-
* @throws NoSuchEntityException
45-
* @throws InputException
4649
*/
4750
public function save(CartInterface $quote, AddressInterface $address, $useForShipping = false)
4851
{
4952
/** @var \Magento\Quote\Model\Quote $quote */
50-
$this->addressValidator->validate($address);
53+
$this->addressValidator->validateForCart($quote, $address);
5154
$customerAddressId = $address->getCustomerAddressId();
5255
$shippingAddress = null;
5356
$addressData = [];

0 commit comments

Comments
 (0)