Skip to content

Commit 013c82c

Browse files
authored
Merge pull request #7214 from magento-gl/BUG#AC-853
GL_Mainline_PR_02122021
2 parents 9f43821 + 8845587 commit 013c82c

File tree

85 files changed

+289
-582
lines changed

Some content is hidden

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

85 files changed

+289
-582
lines changed

app/code/Magento/AdminNotification/Model/InboxInterface.php

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,23 +18,20 @@ interface InboxInterface
1818
*
1919
* @param int|null $severity
2020
* @return array|string|null
21-
* @api
2221
*/
2322
public function getSeverities($severity = null);
2423

2524
/**
2625
* Retrieve Latest Notice
2726
*
2827
* @return $this
29-
* @api
3028
*/
3129
public function loadLatestNotice();
3230

3331
/**
3432
* Retrieve notice statuses
3533
*
3634
* @return array
37-
* @api
3835
*/
3936
public function getNoticeStatus();
4037
}

app/code/Magento/Authorization/Model/Role.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
/**
1313
* Admin Role Model
1414
*
15-
* @api
1615
* @method int getParentId()
1716
* @method Role setParentId(int $value)
1817
* @method int getTreeLevel()

app/code/Magento/Authorization/Model/UserContextInterface.php

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,25 +17,23 @@ interface UserContextInterface
1717
/**#@+
1818
* User type
1919
*/
20-
const USER_TYPE_INTEGRATION = 1;
21-
const USER_TYPE_ADMIN = 2;
22-
const USER_TYPE_CUSTOMER = 3;
23-
const USER_TYPE_GUEST = 4;
20+
public const USER_TYPE_INTEGRATION = 1;
21+
public const USER_TYPE_ADMIN = 2;
22+
public const USER_TYPE_CUSTOMER = 3;
23+
public const USER_TYPE_GUEST = 4;
2424
/**#@-*/
2525

2626
/**
2727
* Identify current user ID.
2828
*
2929
* @return int|null
30-
* @api
3130
*/
3231
public function getUserId();
3332

3433
/**
3534
* Retrieve current user type.
3635
*
3736
* @return int|null
38-
* @api
3937
*/
4038
public function getUserType();
4139
}

app/code/Magento/Backend/App/ConfigInterface.php

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
<?php
22
/**
3-
* Default application path for backend area
4-
*
53
* Copyright © Magento, Inc. All rights reserved.
64
* See COPYING.txt for license details.
75
*/
@@ -21,7 +19,6 @@ interface ConfigInterface
2119
*
2220
* @param string $path
2321
* @return mixed
24-
* @api
2522
*/
2623
public function getValue($path);
2724

@@ -32,7 +29,6 @@ public function getValue($path);
3229
* @param string $path
3330
* @param mixed $value
3431
* @return void
35-
* @api
3632
*/
3733
public function setValue($path, $value);
3834

@@ -43,7 +39,6 @@ public function setValue($path, $value);
4339
*
4440
* @param string $path
4541
* @return bool
46-
* @api
4742
*/
4843
public function isSetFlag($path);
4944
}

app/code/Magento/Backend/Block/System/Store/Store.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
*
1111
* @api
1212
* @author Magento Core Team <core@magentocommerce.com>
13-
* @api
1413
* @since 100.0.2
1514
*/
1615
class Store extends \Magento\Backend\Block\Widget\Grid\Container
@@ -21,6 +20,8 @@ class Store extends \Magento\Backend\Block\Widget\Grid\Container
2120
protected $_blockGroup = 'Magento_Backend';
2221

2322
/**
23+
* Class constructor
24+
*
2425
* @return void
2526
*/
2627
protected function _construct()

app/code/Magento/Backend/Block/Widget/Button.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
*
1616
* @api
1717
* @author Magento Core Team <core@magentocommerce.com>
18-
* @api
1918
* @since 100.0.2
2019
*/
2120
class Button extends \Magento\Backend\Block\Widget

app/code/Magento/Backend/Block/Widget/Button/ContextInterface.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
/**
1010
* Interface \Magento\Backend\Block\Widget\Button\ContextInterface
1111
*
12+
* @api
1213
*/
1314
interface ContextInterface
1415
{
@@ -17,7 +18,6 @@ interface ContextInterface
1718
*
1819
* @param \Magento\Backend\Block\Widget\Button\Item $item
1920
* @return bool
20-
* @api
2121
*/
2222
public function canRender(\Magento\Backend\Block\Widget\Button\Item $item);
2323
}

app/code/Magento/Backend/Block/Widget/Button/ToolbarInterface.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
/**
1010
* Interface \Magento\Backend\Block\Widget\Button\ToolbarInterface
1111
*
12+
* @api
1213
*/
1314
interface ToolbarInterface
1415
{
@@ -18,7 +19,6 @@ interface ToolbarInterface
1819
* @param \Magento\Framework\View\Element\AbstractBlock $context
1920
* @param \Magento\Backend\Block\Widget\Button\ButtonList $buttonList
2021
* @return void
21-
* @api
2222
*/
2323
public function pushButtons(
2424
\Magento\Framework\View\Element\AbstractBlock $context,

app/code/Magento/Backend/Block/Widget/Form/Renderer/Element.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@ class Element extends \Magento\Backend\Block\Template implements RendererInterfa
2929
protected $_template = 'Magento_Backend::widget/form/renderer/element.phtml';
3030

3131
/**
32+
* Get abstract element
33+
*
3234
* @return AbstractElement
3335
*/
3436
public function getElement()
@@ -37,6 +39,8 @@ public function getElement()
3739
}
3840

3941
/**
42+
* Render the element
43+
*
4044
* @param AbstractElement $element
4145
* @return string
4246
*/

app/code/Magento/Backend/Block/Widget/Form/Renderer/Fieldset.php

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
*
1515
* @api
1616
* @author Magento Core Team <core@magentocommerce.com>
17-
* @api
1817
* @since 100.0.2
1918
*/
2019
class Fieldset extends \Magento\Backend\Block\Template implements RendererInterface
@@ -30,6 +29,8 @@ class Fieldset extends \Magento\Backend\Block\Template implements RendererInterf
3029
protected $_template = 'Magento_Backend::widget/form/renderer/fieldset.phtml';
3130

3231
/**
32+
* Get element
33+
*
3334
* @return AbstractElement
3435
*/
3536
public function getElement()
@@ -38,6 +39,8 @@ public function getElement()
3839
}
3940

4041
/**
42+
* Render the element
43+
*
4144
* @param AbstractElement $element
4245
* @return string
4346
*/

0 commit comments

Comments
 (0)