Skip to content

Commit 121ffaf

Browse files
author
Ji Lu
committed
Merge remote-tracking branch 'internalupstream/develop' into MAGETWO-36002-Responsive-Email-Template-PR
2 parents 1667042 + 1ba4c4e commit 121ffaf

File tree

99 files changed

+3966
-326
lines changed

Some content is hidden

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

99 files changed

+3966
-326
lines changed

‎app/code/Magento/Backend/Block/Template/Context.php

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,8 @@ class Context extends \Magento\Framework\View\Element\Template\Context
6767
* @param \Magento\Framework\App\State $appState
6868
* @param \Magento\Store\Model\StoreManagerInterface $storeManager
6969
* @param \Magento\Framework\View\Page\Config $pageConfig
70+
* @param \Magento\Framework\View\Element\Template\File\Resolver $resolver
71+
* @param \Magento\Framework\View\Element\Template\File\Validator $validator
7072
* @param \Magento\Framework\AuthorizationInterface $authorization
7173
* @param \Magento\Backend\Model\Session $backendSession
7274
* @param \Magento\Framework\Math\Random $mathRandom
@@ -99,6 +101,8 @@ public function __construct(
99101
\Magento\Framework\App\State $appState,
100102
\Magento\Store\Model\StoreManagerInterface $storeManager,
101103
\Magento\Framework\View\Page\Config $pageConfig,
104+
\Magento\Framework\View\Element\Template\File\Resolver $resolver,
105+
\Magento\Framework\View\Element\Template\File\Validator $validator,
102106
\Magento\Framework\AuthorizationInterface $authorization,
103107
\Magento\Backend\Model\Session $backendSession,
104108
\Magento\Framework\Math\Random $mathRandom,
@@ -133,7 +137,9 @@ public function __construct(
133137
$enginePool,
134138
$appState,
135139
$storeManager,
136-
$pageConfig
140+
$pageConfig,
141+
$resolver,
142+
$validator
137143
);
138144
}
139145

‎app/code/Magento/Backend/Block/Widget/Context.php

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,14 +49,16 @@ class Context extends \Magento\Backend\Block\Template\Context
4949
* @param \Magento\Framework\View\TemplateEnginePool $enginePool
5050
* @param \Magento\Framework\App\State $appState
5151
* @param \Magento\Store\Model\StoreManagerInterface $storeManager
52+
* @param \Magento\Framework\View\Page\Config $pageConfig
53+
* @param \Magento\Framework\View\Element\Template\File\Resolver $resolver
54+
* @param \Magento\Framework\View\Element\Template\File\Validator $validator
5255
* @param \Magento\Framework\AuthorizationInterface $authorization
5356
* @param \Magento\Backend\Model\Session $backendSession
5457
* @param \Magento\Framework\Math\Random $mathRandom
5558
* @param \Magento\Framework\Data\Form\FormKey $formKey
5659
* @param \Magento\Framework\Code\NameBuilder $nameBuilder
5760
* @param \Magento\Backend\Block\Widget\Button\ButtonList $buttonList
5861
* @param Button\ToolbarInterface $toolbar
59-
* @param \Magento\Framework\View\Page\Config $pageConfig
6062
*
6163
* @SuppressWarnings(PHPMD.ExcessiveParameterList)
6264
*/
@@ -84,6 +86,8 @@ public function __construct(
8486
\Magento\Framework\App\State $appState,
8587
\Magento\Store\Model\StoreManagerInterface $storeManager,
8688
\Magento\Framework\View\Page\Config $pageConfig,
89+
\Magento\Framework\View\Element\Template\File\Resolver $resolver,
90+
\Magento\Framework\View\Element\Template\File\Validator $validator,
8791
\Magento\Framework\AuthorizationInterface $authorization,
8892
\Magento\Backend\Model\Session $backendSession,
8993
\Magento\Framework\Math\Random $mathRandom,
@@ -116,6 +120,8 @@ public function __construct(
116120
$appState,
117121
$storeManager,
118122
$pageConfig,
123+
$resolver,
124+
$validator,
119125
$authorization,
120126
$backendSession,
121127
$mathRandom,

‎app/code/Magento/Catalog/Block/Product/Context.php

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,9 @@ class Context extends \Magento\Framework\View\Element\Template\Context
9494
* @param \Magento\Framework\View\TemplateEnginePool $enginePool
9595
* @param \Magento\Framework\App\State $appState
9696
* @param \Magento\Store\Model\StoreManagerInterface $storeManager
97+
* @param \Magento\Framework\View\Page\Config $pageConfig
98+
* @param \Magento\Framework\View\Element\Template\File\Resolver $resolver
99+
* @param \Magento\Framework\View\Element\Template\File\Validator $validator
97100
* @param \Magento\Catalog\Model\Config $catalogConfig
98101
* @param \Magento\Framework\Registry $registry
99102
* @param \Magento\Tax\Helper\Data $taxHelper
@@ -105,7 +108,6 @@ class Context extends \Magento\Framework\View\Element\Template\Context
105108
* @param \Magento\Catalog\Helper\Image $imageHelper
106109
* @param ReviewRendererInterface $reviewRenderer
107110
* @param \Magento\CatalogInventory\Api\StockRegistryInterface $stockRegistry
108-
* @param \Magento\Framework\View\Page\Config $pageConfig
109111
*
110112
* @SuppressWarnings(PHPMD.ExcessiveParameterList)
111113
*/
@@ -133,6 +135,8 @@ public function __construct(
133135
\Magento\Framework\App\State $appState,
134136
\Magento\Store\Model\StoreManagerInterface $storeManager,
135137
\Magento\Framework\View\Page\Config $pageConfig,
138+
\Magento\Framework\View\Element\Template\File\Resolver $resolver,
139+
\Magento\Framework\View\Element\Template\File\Validator $validator,
136140
\Magento\Catalog\Model\Config $catalogConfig,
137141
\Magento\Framework\Registry $registry,
138142
\Magento\Tax\Helper\Data $taxHelper,
@@ -179,7 +183,9 @@ public function __construct(
179183
$enginePool,
180184
$appState,
181185
$storeManager,
182-
$pageConfig
186+
$pageConfig,
187+
$resolver,
188+
$validator
183189
);
184190
}
185191

‎app/code/Magento/CatalogRule/Block/Adminhtml/Promo/Catalog/Edit/Tab/Actions.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ class Actions extends Generic implements TabInterface
1515
* Prepare content for tab
1616
*
1717
* @return \Magento\Framework\Phrase
18+
* @codeCoverageIgnore
1819
*/
1920
public function getTabLabel()
2021
{
@@ -25,6 +26,7 @@ public function getTabLabel()
2526
* Prepare title for tab
2627
*
2728
* @return \Magento\Framework\Phrase
29+
* @codeCoverageIgnore
2830
*/
2931
public function getTabTitle()
3032
{
@@ -35,6 +37,7 @@ public function getTabTitle()
3537
* Returns status flag about this tab can be showen or not
3638
*
3739
* @return bool
40+
* @codeCoverageIgnore
3841
*/
3942
public function canShowTab()
4043
{
@@ -45,6 +48,7 @@ public function canShowTab()
4548
* Returns status flag about this tab hidden or not
4649
*
4750
* @return bool
51+
* @codeCoverageIgnore
4852
*/
4953
public function isHidden()
5054
{

‎app/code/Magento/CatalogRule/Block/Adminhtml/Promo/Catalog/Edit/Tab/Conditions.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ public function __construct(
4646
* Prepare content for tab
4747
*
4848
* @return \Magento\Framework\Phrase
49+
* @codeCoverageIgnore
4950
*/
5051
public function getTabLabel()
5152
{
@@ -56,6 +57,7 @@ public function getTabLabel()
5657
* Prepare title for tab
5758
*
5859
* @return \Magento\Framework\Phrase
60+
* @codeCoverageIgnore
5961
*/
6062
public function getTabTitle()
6163
{
@@ -66,6 +68,7 @@ public function getTabTitle()
6668
* Returns status flag about this tab can be showen or not
6769
*
6870
* @return bool
71+
* @codeCoverageIgnore
6972
*/
7073
public function canShowTab()
7174
{
@@ -76,6 +79,7 @@ public function canShowTab()
7679
* Returns status flag about this tab hidden or not
7780
*
7881
* @return bool
82+
* @codeCoverageIgnore
7983
*/
8084
public function isHidden()
8185
{

‎app/code/Magento/CatalogRule/Block/Adminhtml/Promo/Catalog/Edit/Tab/Main.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@ public function __construct(
6868
* Prepare content for tab
6969
*
7070
* @return \Magento\Framework\Phrase
71+
* @codeCoverageIgnore
7172
*/
7273
public function getTabLabel()
7374
{
@@ -78,6 +79,7 @@ public function getTabLabel()
7879
* Prepare title for tab
7980
*
8081
* @return \Magento\Framework\Phrase
82+
* @codeCoverageIgnore
8183
*/
8284
public function getTabTitle()
8385
{
@@ -88,6 +90,7 @@ public function getTabTitle()
8890
* Returns status flag about this tab can be showed or not
8991
*
9092
* @return bool
93+
* @codeCoverageIgnore
9194
*/
9295
public function canShowTab()
9396
{
@@ -98,6 +101,7 @@ public function canShowTab()
98101
* Returns status flag about this tab hidden or not
99102
*
100103
* @return bool
104+
* @codeCoverageIgnore
101105
*/
102106
public function isHidden()
103107
{

‎app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Catalog.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,7 @@ protected function _isAllowed()
8686
*
8787
* @param string $dirtyRulesNoticeMessage
8888
* @return void
89+
* @codeCoverageIgnore
8990
*/
9091
public function setDirtyRulesNoticeMessage($dirtyRulesNoticeMessage)
9192
{

‎app/code/Magento/CatalogRule/Model/Indexer/AbstractIndexer.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@ public function executeFull()
6060
* Get affected cache tags
6161
*
6262
* @return array
63+
* @codeCoverageIgnore
6364
*/
6465
public function getIdentities()
6566
{

‎app/code/Magento/CatalogRule/Model/Resource/Rule.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -135,6 +135,7 @@ public function __construct(
135135
* Initialize main table and table id field
136136
*
137137
* @return void
138+
* @codeCoverageIgnore
138139
*/
139140
protected function _construct()
140141
{

‎app/code/Magento/CatalogRule/Model/Resource/Rule/Collection.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ class Collection extends \Magento\Rule\Model\Resource\Rule\Collection\AbstractCo
2424
* Set resource model
2525
*
2626
* @return void
27+
* @codeCoverageIgnore
2728
*/
2829
protected function _construct()
2930
{

0 commit comments

Comments
 (0)