Skip to content

Commit e9830bf

Browse files
Indrani SonawaneIndrani Sonawane
authored andcommitted
Merge remote-tracking branch '37003-v1/no-author/email-fedex-groupedproduct-integration' into compr248beta1
2 parents 7167ab9 + 51a33b4 commit e9830bf

File tree

17 files changed

+14
-41
lines changed

17 files changed

+14
-41
lines changed

app/code/Magento/Email/Block/Adminhtml/Template.php

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@
66

77
/**
88
* Adminhtml system templates page content block
9-
*
10-
* @author Magento Core Team <core@magentocommerce.com>
119
*/
1210
namespace Magento\Email\Block\Adminhtml;
1311

@@ -52,7 +50,7 @@ public function __construct(
5250
}
5351

5452
/**
55-
* {@inheritdoc}
53+
* @inheritdoc
5654
*/
5755
public function updateButton($buttonId, $key, $data)
5856
{
@@ -90,7 +88,7 @@ public function getCreateUrl()
9088
}
9189

9290
/**
93-
* {@inheritdoc}
91+
* @inheritdoc
9492
*/
9593
public function addButton($buttonId, $data, $level = 0, $sortOrder = 0, $region = 'toolbar')
9694
{
@@ -109,7 +107,7 @@ public function getHeaderText()
109107
}
110108

111109
/**
112-
* {@inheritdoc}
110+
* @inheritdoc
113111
*/
114112
public function removeButton($buttonId)
115113
{
@@ -135,7 +133,7 @@ protected function getAddButtonHtml()
135133
}
136134

137135
/**
138-
* {@inheritdoc}
136+
* @inheritdoc
139137
*/
140138
public function canRender(\Magento\Backend\Block\Widget\Button\Item $item)
141139
{

app/code/Magento/Email/Block/Adminhtml/Template/Edit.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
/**
1313
* Adminhtml system template edit block
1414
*
15-
* @author Magento Core Team <core@magentocommerce.com>
1615
* @method array getTemplateOptions()
1716
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
1817
*/
@@ -21,6 +20,7 @@ class Edit extends Widget implements ContainerInterface
2120
/**
2221
* @var \Magento\Framework\Registry
2322
* @deprecated 101.0.0 since 2.3.0 in favor of stateful global objects elimination.
23+
* @see Nothing
2424
*/
2525
protected $_registryManager;
2626

app/code/Magento/Email/Block/Adminhtml/Template/Grid/Filter/Type.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@
77

88
/**
99
* Adminhtml system template grid type filter
10-
*
11-
* @author Magento Core Team <core@magentocommerce.com>
1210
*/
1311
class Type extends \Magento\Backend\Block\Widget\Grid\Column\Filter\Select
1412
{

app/code/Magento/Email/Block/Adminhtml/Template/Grid/Renderer/Action.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@
77

88
/**
99
* Email templates grid block action item renderer
10-
*
11-
* @author Magento Core Team <core@magentocommerce.com>
1210
*/
1311
class Action extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\Action
1412
{

app/code/Magento/Email/Block/Adminhtml/Template/Grid/Renderer/Sender.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@
77

88
/**
99
* Adminhtml system templates grid block sender item renderer
10-
*
11-
* @author Magento Core Team <core@magentocommerce.com>
1210
*/
1311
class Sender extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\AbstractRenderer
1412
{

app/code/Magento/Email/Block/Adminhtml/Template/Grid/Renderer/Type.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@
77

88
/**
99
* Adminhtml system templates grid block type item renderer
10-
*
11-
* @author Magento Core Team <core@magentocommerce.com>
1210
*/
1311
class Type extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\AbstractRenderer
1412
{

app/code/Magento/Email/Controller/Adminhtml/Email/Template.php

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

88
/**
99
* System Template admin controller
10-
*
11-
* @author Magento Core Team <core@magentocommerce.com>
1210
*/
1311
abstract class Template extends \Magento\Backend\App\Action
1412
{
@@ -17,13 +15,14 @@ abstract class Template extends \Magento\Backend\App\Action
1715
*
1816
* @see _isAllowed()
1917
*/
20-
const ADMIN_RESOURCE = 'Magento_Email::template';
18+
public const ADMIN_RESOURCE = 'Magento_Email::template';
2119

2220
/**
23-
* Core registry
21+
* Core registry variable
2422
*
2523
* @var \Magento\Framework\Registry
2624
* @deprecated 101.0.0 since 2.3.0 in favor of stateful global objects elimination.
25+
* @see Nothing
2726
*/
2827
protected $_coreRegistry = null;
2928

app/code/Magento/Email/Model/AbstractTemplate.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
* Template model class.
2121
*
2222
* phpcs:disable Magento2.Classes.AbstractApi
23-
* @author Magento Core Team <core@magentocommerce.com>
2423
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
2524
* @SuppressWarnings(PHPMD.TooManyFields)
2625
* @api

app/code/Magento/Fedex/Model/Source/Freemethod.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,11 @@
77

88
/**
99
* Fedex freemethod source implementation
10-
*
11-
* @author Magento Core Team <core@magentocommerce.com>
1210
*/
1311
class Freemethod extends \Magento\Fedex\Model\Source\Method
1412
{
1513
/**
16-
* {@inheritdoc}
14+
* @inheritdoc
1715
*/
1816
public function toOptionArray()
1917
{

app/code/Magento/Fedex/Model/Source/Method.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@
66

77
/**
88
* Fedex method source implementation
9-
*
10-
* @author Magento Core Team <core@magentocommerce.com>
119
*/
1210
namespace Magento\Fedex\Model\Source;
1311

0 commit comments

Comments
 (0)