Skip to content

Commit 0704bab

Browse files
adifucanadifucan
committed
Merge remote-tracking branch 'origin/develop' into MAGETWO-60598
# Conflicts: # app/code/Magento/Backend/Block/AbstractBlock.php # app/code/Magento/Backend/Block/Widget/Accordion.php # app/code/Magento/Backend/Block/Widget/Form/Renderer/Element.php # app/code/Magento/Backend/Block/Widget/Form/Renderer/Fieldset/Element.php # app/code/Magento/Backend/Block/Widget/Grid/Column/Extended.php # app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/AbstractFilter.php # app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Select.php # app/code/Magento/Backend/Block/Widget/Grid/Column/Multistore.php # app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Action.php # app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Button.php # app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Checkbox.php # app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Country.php # app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Currency.php # app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Date.php # app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Datetime.php # app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/DraggableHandle.php # app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Input.php # app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Ip.php # app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Number.php # app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Price.php # app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/RendererInterface.php # app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Text.php # app/code/Magento/Backend/Block/Widget/Grid/Container.php # app/code/Magento/Backend/Block/Widget/Grid/Massaction.php # app/code/Magento/Backend/Block/Widget/Grid/Massaction/Additional.php # app/code/Magento/Backend/Model/Auth.php # app/code/Magento/Config/Model/Config/Source/Yesno.php # app/code/Magento/Reports/Model/ResourceModel/Report/Collection/AbstractCollection.php
2 parents b5b56b2 + 75d1e40 commit 0704bab

File tree

259 files changed

+1227
-471
lines changed

Some content is hidden

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

259 files changed

+1227
-471
lines changed

‎.travis.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
sudo: required
22
dist: trusty
3+
group: edge
34
addons:
45
apt:
56
packages:

‎app/code/Magento/Authorization/Model/ResourceModel/Rules.php

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
44
* See COPYING.txt for license details.
55
*/
66

7-
// @codingStandardsIgnoreFile
8-
97
namespace Magento\Authorization\Model\ResourceModel;
108

119
use Magento\Framework\App\ObjectManager;
@@ -101,7 +99,10 @@ public function saveRel(\Magento\Authorization\Model\Rules $rule)
10199

102100
// If all was selected save it only and nothing else.
103101
if ($postedResources === [$this->_rootResource->getId()]) {
104-
$insertData = $this->_prepareDataForTable(new \Magento\Framework\DataObject($row), $this->getMainTable());
102+
$insertData = $this->_prepareDataForTable(
103+
new \Magento\Framework\DataObject($row),
104+
$this->getMainTable()
105+
);
105106

106107
$connection->insert($this->getMainTable(), $insertData);
107108
} else {
@@ -113,7 +114,10 @@ public function saveRel(\Magento\Authorization\Model\Rules $rule)
113114
$row['permission'] = in_array($resourceId, $postedResources) ? 'allow' : 'deny';
114115
$row['resource_id'] = $resourceId;
115116

116-
$insertData = $this->_prepareDataForTable(new \Magento\Framework\DataObject($row), $this->getMainTable());
117+
$insertData = $this->_prepareDataForTable(
118+
new \Magento\Framework\DataObject($row),
119+
$this->getMainTable()
120+
);
117121
$connection->insert($this->getMainTable(), $insertData);
118122
}
119123
}

‎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
* @api

‎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
* @api
1516
*/

‎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
* @api
1424
*/

‎app/code/Magento/Backend/App/Config.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@
66
* See COPYING.txt for license details.
77
*/
88

9-
// @codingStandardsIgnoreFile
10-
119
namespace Magento\Backend\App;
1210

1311
use Magento\Config\App\Config\Type\System;

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,11 @@
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.
1014
* @api
1115
*/
1216
class AbstractBlock extends \Magento\Framework\View\Element\AbstractBlock

‎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.
1215
*
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
1320
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
1421
* @api
1522
*/

‎app/code/Magento/Backend/Block/Dashboard.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
44
* See COPYING.txt for license details.
55
*/
66

7-
// @codingStandardsIgnoreFile
8-
97
namespace Magento\Backend\Block;
108

119
/**

‎app/code/Magento/Backend/Block/Dashboard/AbstractDashboard.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
* See COPYING.txt for license details.
55
*/
66

7-
// @codingStandardsIgnoreFile
8-
97
namespace Magento\Backend\Block\Dashboard;
108

9+
use Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection;
10+
1111
/**
1212
* Adminhtml dashboard tab abstract
1313
*
@@ -40,7 +40,7 @@ public function __construct(
4040
}
4141

4242
/**
43-
* @return array|\Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection|\Magento\Eav\Model\Entity\Collection\Abstract
43+
* @return array|AbstractCollection|\Magento\Eav\Model\Entity\Collection\Abstract
4444
*/
4545
public function getCollection()
4646
{

0 commit comments

Comments
 (0)