Skip to content

Commit c2eb6ac

Browse files
committed
Merge branch 'develop' of github.com:magento/magento2ce into PR_Troll
2 parents 5a731ac + 09a4858 commit c2eb6ac

File tree

223 files changed

+636
-324
lines changed

Some content is hidden

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

223 files changed

+636
-324
lines changed

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
/**
99
* Generic backend controller
1010
*
11+
* @api
1112
* @SuppressWarnings(PHPMD.NumberOfChildren)
1213
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
1314
*/

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
namespace Magento\Backend\App;
1111

1212
/**
13+
* @api
1314
* @SuppressWarnings(PHPMD.NumberOfChildren)
1415
*/
1516
abstract class Action extends \Magento\Backend\App\AbstractAction

app/code/Magento/Backend/App/Action/Context.php

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,17 @@
88
use Magento\Framework\Controller\ResultFactory;
99

1010
/**
11-
* Backend Controller context
11+
* Constructor modification point for Magento\Backend\App\Action.
12+
*
13+
* All context classes were introduced to allow for backwards compatible constructor modifications
14+
* of classes that were supposed to be extended by extension developers.
15+
*
16+
* Do not call methods of this class directly.
17+
*
18+
* As Magento moves from inheritance-based APIs all such classes will be deprecated together with
19+
* the classes they were introduced for.
20+
*
21+
* @api
1222
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
1323
*/
1424
class Context extends \Magento\Framework\App\Action\Context

app/code/Magento/Backend/Block/AbstractBlock.php

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,12 @@
66
namespace Magento\Backend\Block;
77

88
/**
9-
* Backend abstract block
9+
* Base for all admin blocks.
10+
*
11+
* Avoid using this class. Will be deprecated
12+
*
13+
* Marked as public API because it is actively used now.
14+
* @api
1015
*/
1116
class AbstractBlock extends \Magento\Framework\View\Element\AbstractBlock
1217
{

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

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,22 @@
11
<?php
22
/**
3-
* Backend block context
4-
*
53
* Copyright © Magento, Inc. All rights reserved.
64
* See COPYING.txt for license details.
75
*/
86
namespace Magento\Backend\Block;
97

108
/**
11-
* Backend block context
9+
* Constructor modification point for Magento\Backend\Block\AbstractBlock.
10+
*
11+
* All context classes were introduced to allow for backwards compatible constructor modifications
12+
* of classes that were supposed to be extended by extension developers.
13+
*
14+
* Do not call methods of this class directly.
15+
*
16+
* As Magento moves from inheritance-based APIs all such classes will be deprecated together with
17+
* the classes they were introduced for.
1218
*
19+
* @api
1320
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
1421
*/
1522
class Context extends \Magento\Framework\View\Element\Context

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

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,20 @@
66
namespace Magento\Backend\Block;
77

88
/**
9-
* Backend abstract block
9+
* Standard admin block. Adds admin-specific behavior and event.
10+
* Should be used when you declare a block in admin layout handle.
11+
*
12+
* Avoid extending this class if possible.
13+
*
14+
* If you need custom presentation logic in your blocks, use this class as block, and declare
15+
* custom view models in block arguments in layout handle file.
16+
*
17+
* Example:
18+
* <block name="my.block" class="Magento\Backend\Block\Template" template="My_Module::template.phtml" >
19+
* <arguments>
20+
* <argument name="viewModel" xsi:type="object">My\Module\ViewModel\Custom</argument>
21+
* </arguments>
22+
* </block>
1023
*
1124
* @api
1225
* @SuppressWarnings(PHPMD.NumberOfChildren)

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

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,22 @@
11
<?php
22
/**
3-
* Backend block template context
4-
*
53
* Copyright © Magento, Inc. All rights reserved.
64
* See COPYING.txt for license details.
75
*/
8-
96
namespace Magento\Backend\Block\Template;
107

118
/**
9+
* Constructor modification point for Magento\Backend\Block\Template.
10+
*
11+
* All context classes were introduced to allow for backwards compatible constructor modifications
12+
* of classes that were supposed to be extended by extension developers.
13+
*
14+
* Do not call methods of this class directly.
15+
*
16+
* As Magento moves from inheritance-based APIs all such classes will be deprecated together with
17+
* the classes they were introduced for.
18+
*
19+
* @api
1220
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
1321
*/
1422
class Context extends \Magento\Framework\View\Element\Template\Context

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,7 @@
88
/**
99
* Base widget class
1010
*
11-
* @author Magento Core Team <core@magentocommerce.com>
12-
*
11+
* @api
1312
* @SuppressWarnings(PHPMD.NumberOfChildren)
1413
*/
1514
class Widget extends \Magento\Backend\Block\Template

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
/**
99
* Magento_Backend accordion widget
1010
*
11-
* @author Magento Core Team <core@magentocommerce.com>
11+
* @api
1212
*/
1313
class Accordion extends \Magento\Backend\Block\Widget
1414
{

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

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,20 @@
33
* Copyright © Magento, Inc. All rights reserved.
44
* See COPYING.txt for license details.
55
*/
6-
76
namespace Magento\Backend\Block\Widget;
87

98
/**
9+
* Constructor modification point for Magento\Backend\Block\Widget.
10+
*
11+
* All context classes were introduced to allow for backwards compatible constructor modifications
12+
* of classes that were supposed to be extended by extension developers.
13+
*
14+
* Do not call methods of this class directly.
15+
*
16+
* As Magento moves from inheritance-based APIs all such classes will be deprecated together with
17+
* the classes they were introduced for.
18+
*
19+
* @api
1020
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
1121
*/
1222
class Context extends \Magento\Backend\Block\Template\Context

0 commit comments

Comments
 (0)