Skip to content

Commit 3b770b2

Browse files
author
Oleksii Korshenko
committed
Merge remote-tracking branch 'mainline/develop' into payment-interface-refactoring
2 parents aa04eca + f8a4c72 commit 3b770b2

File tree

221 files changed

+3202
-1446
lines changed

Some content is hidden

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

221 files changed

+3202
-1446
lines changed

‎app/code/Magento/AdminNotification/etc/adminhtml/events.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@
77
-->
88
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Event/etc/events.xsd">
99
<event name="controller_action_predispatch">
10-
<observer name="adminnotification" instance="Magento\AdminNotification\Observer\PredispathAdminActionControllerObserver" method="execute" />
10+
<observer name="adminnotification" instance="Magento\AdminNotification\Observer\PredispathAdminActionControllerObserver" />
1111
</event>
1212
</config>

‎app/code/Magento/Authorizenet/etc/adminhtml/events.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@
77
-->
88
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Event/etc/events.xsd">
99
<event name="checkout_submit_all_after">
10-
<observer name="directpost_update_all_edit_increments" instance="Magento\Authorizenet\Observer\UpdateAllEditIncrementsObserver" method="execute" />
10+
<observer name="directpost_update_all_edit_increments" instance="Magento\Authorizenet\Observer\UpdateAllEditIncrementsObserver" />
1111
</event>
1212
</config>

‎app/code/Magento/Authorizenet/etc/frontend/events.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
-->
88
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Event/etc/events.xsd">
99
<event name="checkout_submit_all_after">
10-
<observer name="directpost_save_order_after_submit" instance="Magento\Authorizenet\Observer\SaveOrderAfterSubmitObserver" method="execute" />
10+
<observer name="directpost_save_order_after_submit" instance="Magento\Authorizenet\Observer\SaveOrderAfterSubmitObserver" />
1111
</event>
1212
<event name="checkout_directpost_placeOrder">
13-
<observer name="directpost_save_order_onepage" instance="Magento\Authorizenet\Observer\AddFieldsToResponseObserver" method="execute" />
13+
<observer name="directpost_save_order_onepage" instance="Magento\Authorizenet\Observer\AddFieldsToResponseObserver" />
1414
</event>
1515
</config>

‎app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Store.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ public function getHtml()
4848

4949
$allShow = $this->getColumn()->getStoreAll();
5050

51-
$html = '<select name="' . $this->escapeHtml(
51+
$html = '<select class="admin__control-select" name="' . $this->escapeHtml(
5252
$this->_getHtmlName()
5353
) . '" ' . $this->getColumn()->getValidateClass() . $this->getUiId(
5454
'filter',

‎app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/AbstractRenderer.php

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,10 +51,11 @@ public function getColumn()
5151
public function render(DataObject $row)
5252
{
5353
if ($this->getColumn()->getEditable()) {
54-
$value = $this->_getValue($row);
55-
return '<div class="admin__grid-control">' .
56-
'<span class="admin__grid-control-value">' . $value . '</span>' .
57-
$this->_getInputValueElement($row) . '</div>' ;
54+
$result = '<div class="admin__grid-control">';
55+
$result .= $this->getColumn()->getEditOnly() ? ''
56+
: '<span class="admin__grid-control-value">' . $this->_getValue($row) . '</span>';
57+
58+
return $result . $this->_getInputValueElement($row) . '</div>' ;
5859
}
5960
return $this->_getValue($row);
6061
}

‎app/code/Magento/Backend/Test/Unit/Block/Widget/Grid/Column/Renderer/AbstractRendererTest.php

Lines changed: 107 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,107 @@
1+
<?php
2+
/**
3+
* Copyright © 2015 Magento. All rights reserved.
4+
* See COPYING.txt for license details.
5+
*/
6+
namespace Magento\Backend\Test\Unit\Block\Widget\Grid\Column\Renderer;
7+
8+
class AbstractRendererTest extends \PHPUnit_Framework_TestCase
9+
{
10+
/**
11+
* @var \Magento\Backend\Block\Widget\Grid\Column|\PHPUnit_Framework_MockObject_MockObject
12+
*/
13+
protected $columnMock;
14+
15+
/**
16+
* @var \Magento\Framework\DataObject|\PHPUnit_Framework_MockObject_MockObject
17+
*/
18+
protected $dataObjectMock;
19+
20+
/**
21+
* @var \Magento\Backend\Block\Widget\Grid\Column\Renderer\AbstractRenderer
22+
*/
23+
protected $renderer;
24+
25+
/**
26+
* @return void
27+
*/
28+
protected function setUp()
29+
{
30+
$this->dataObjectMock = $this->getMock('Magento\Framework\DataObject', ['getData'], [], '', false);
31+
$this->columnMock = $this->getMockBuilder('Magento\Backend\Block\Widget\Grid\Column')
32+
->disableOriginalConstructor()
33+
->setMethods(['getEditable', 'getIndex', 'getEditOnly', 'getId'])
34+
->getMock();
35+
$this->renderer = $this->getMockBuilder('Magento\Backend\Block\Widget\Grid\Column\Renderer\AbstractRenderer')
36+
->disableOriginalConstructor()
37+
->setMethods(null)
38+
->getMock();
39+
}
40+
41+
/**
42+
* @param bool $editable
43+
* @param bool $onlyEdit
44+
* @param string $expectedResult
45+
* @return void
46+
* @dataProvider renderDataProvider
47+
*/
48+
public function testRender($editable, $onlyEdit, $expectedResult)
49+
{
50+
$value = 'some value';
51+
$keyValue = 'key';
52+
53+
$this->columnMock->expects($this->once())
54+
->method('getEditable')
55+
->willReturn($editable);
56+
$this->columnMock->expects($this->any())
57+
->method('getEditOnly')
58+
->willReturn($onlyEdit);
59+
$this->columnMock->expects($this->any())
60+
->method('getIndex')
61+
->willReturn($keyValue);
62+
$this->columnMock->expects($this->any())
63+
->method('getId')
64+
->willReturn('test');
65+
$this->dataObjectMock->expects($this->any())
66+
->method('getData')
67+
->with($keyValue)
68+
->willReturn($value);
69+
$this->renderer->setColumn($this->columnMock);
70+
71+
$this->assertEquals($expectedResult, $this->renderer->render($this->dataObjectMock));
72+
}
73+
74+
/**
75+
* @return array
76+
*/
77+
public function renderDataProvider()
78+
{
79+
return [
80+
[
81+
'editable' => false,
82+
'onlyEdit' => false,
83+
'expectedResult' => 'some value'
84+
],
85+
[
86+
'editable' => false,
87+
'onlyEdit' => true,
88+
'expectedResult' => 'some value'
89+
],
90+
[
91+
'editable' => true,
92+
'onlyEdit' => false,
93+
'expectedResult' => '<div class="admin__grid-control">'
94+
. '<span class="admin__grid-control-value">some value</span>'
95+
. '<input type="text" class="input-text " name="test" value="some value"/>'
96+
. '</div>'
97+
],
98+
[
99+
'editable' => true,
100+
'onlyEdit' => true,
101+
'expectedResult' => '<div class="admin__grid-control">'
102+
. '<input type="text" class="input-text " name="test" value="some value"/>'
103+
. '</div>'
104+
],
105+
];
106+
}
107+
}

‎app/code/Magento/Braintree/etc/events.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@
77
-->
88
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Event/etc/events.xsd">
99
<event name="sales_order_shipment_save_after">
10-
<observer name="braintree" instance="Magento\Braintree\Observer\ProcessBraintreePayment" method="execute" />
10+
<observer name="braintree" instance="Magento\Braintree\Observer\ProcessBraintreePayment" />
1111
</event>
1212
<event name="customer_delete_commit_after">
13-
<observer name="braintree" instance="Magento\Braintree\Observer\DeleteBraintreeCustomer" method="execute" />
13+
<observer name="braintree" instance="Magento\Braintree\Observer\DeleteBraintreeCustomer" />
1414
</event>
1515
<event name="checkout_submit_before">
16-
<observer name="braintree" instance="Magento\Braintree\Observer\ProcessBraintreeAddress" method="execute" />
16+
<observer name="braintree" instance="Magento\Braintree\Observer\ProcessBraintreeAddress" />
1717
</event>
1818
</config>

‎app/code/Magento/Braintree/etc/frontend/events.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@
77
-->
88
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Event/etc/events.xsd">
99
<event name="shortcut_buttons_container">
10-
<observer name="braintree_paypal_shortcuts" instance="Magento\Braintree\Observer\AddPaypalShortcuts" method="execute" />
10+
<observer name="braintree_paypal_shortcuts" instance="Magento\Braintree\Observer\AddPaypalShortcuts" />
1111
</event>
1212
</config>

‎app/code/Magento/Bundle/etc/adminhtml/events.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
-->
88
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Event/etc/events.xsd">
99
<event name="catalog_product_edit_action">
10-
<observer name="bundle_observer" instance="Magento\Bundle\Observer\SetAttributeTabBlockObserver" method="execute" />
10+
<observer name="bundle_observer" instance="Magento\Bundle\Observer\SetAttributeTabBlockObserver" />
1111
</event>
1212
<event name="catalog_product_new_action">
13-
<observer name="bundle_observer" instance="Magento\Bundle\Observer\SetAttributeTabBlockObserver" method="execute" />
13+
<observer name="bundle_observer" instance="Magento\Bundle\Observer\SetAttributeTabBlockObserver" />
1414
</event>
1515
</config>

‎app/code/Magento/Bundle/etc/frontend/events.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@
77
-->
88
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Event/etc/events.xsd">
99
<event name="catalog_product_upsell">
10-
<observer name="bundle_observer" instance="Magento\Bundle\Observer\AppendUpsellProductsObserver" method="execute"/>
10+
<observer name="bundle_observer" instance="Magento\Bundle\Observer\AppendUpsellProductsObserver"/>
1111
</event>
1212
<event name="catalog_product_collection_load_after">
13-
<observer name="bundle_observer" instance="Magento\Bundle\Observer\LoadProductOptionsObserver" method="execute"/>
13+
<observer name="bundle_observer" instance="Magento\Bundle\Observer\LoadProductOptionsObserver"/>
1414
</event>
1515
<event name="product_option_renderer_init">
16-
<observer name="bundle_observer" instance="Magento\Bundle\Observer\InitOptionRendererObserver" method="execute"/>
16+
<observer name="bundle_observer" instance="Magento\Bundle\Observer\InitOptionRendererObserver"/>
1717
</event>
1818
</config>

0 commit comments

Comments
 (0)