Skip to content

Commit fa197b8

Browse files
RomaKisRomaKis
committed
Merge branch 'develop' into MAGETWO-67048
2 parents 474f09b + 119eedf commit fa197b8

File tree

45 files changed

+622
-132
lines changed

Some content is hidden

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

45 files changed

+622
-132
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/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/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
{

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

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -148,11 +148,13 @@ protected function _renderMouseEvent($menuItem)
148148
protected function _renderItemCssClass($menuItem, $level)
149149
{
150150
$isLast = 0 == $level && (bool)$this->getMenuModel()->isLast($menuItem) ? 'last' : '';
151-
$output = ($this->menuItemChecker->isItemActive(
151+
$isItemActive = $this->menuItemChecker->isItemActive(
152152
$this->getActiveItemModel(),
153-
$menuItem,
154-
$level
155-
) ? '_current _active' : '') .
153+
$menuItem,
154+
$level
155+
) ? '_current _active' : '';
156+
157+
$output = $isItemActive .
156158
' ' .
157159
($menuItem->hasChildren() ? 'parent' : '') .
158160
' ' .
@@ -411,7 +413,7 @@ public function renderNavigation($menu, $level = 0, $limit = 0, $colBrakes = [])
411413
*/
412414
public function getActiveItemModel()
413415
{
414-
if (is_null($this->_activeItemModel)) {
416+
if ($this->_activeItemModel === null) {
415417
$this->_activeItemModel = $this->getMenuModel()->get($this->getActive());
416418
if (false == $this->_activeItemModel instanceof \Magento\Backend\Model\Menu\Item) {
417419
$this->_activeItemModel = false;

‎app/code/Magento/Backend/Block/Page/Header.php

Lines changed: 4 additions & 3 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\Page;
108

119
/**
@@ -81,6 +79,9 @@ public function getLogoutLink()
8179
*/
8280
public function displayNoscriptNotice()
8381
{
84-
return $this->_scopeConfig->getValue('web/browser_capabilities/javascript', \Magento\Store\Model\ScopeInterface::SCOPE_STORE);
82+
return $this->_scopeConfig->getValue(
83+
'web/browser_capabilities/javascript',
84+
\Magento\Store\Model\ScopeInterface::SCOPE_STORE
85+
);
8586
}
8687
}

‎app/code/Magento/Backend/Block/Page/Notices.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
/**
108
* Adminhtml header notices block
119
*
@@ -25,7 +23,10 @@ class Notices extends \Magento\Backend\Block\Template
2523
*/
2624
public function displayNoscriptNotice()
2725
{
28-
return $this->_scopeConfig->getValue('web/browser_capabilities/javascript', \Magento\Store\Model\ScopeInterface::SCOPE_STORE);
26+
return $this->_scopeConfig->getValue(
27+
'web/browser_capabilities/javascript',
28+
\Magento\Store\Model\ScopeInterface::SCOPE_STORE
29+
);
2930
}
3031

3132
/**
@@ -35,6 +36,9 @@ public function displayNoscriptNotice()
3536
*/
3637
public function displayDemoNotice()
3738
{
38-
return $this->_scopeConfig->getValue('design/head/demonotice', \Magento\Store\Model\ScopeInterface::SCOPE_STORE);
39+
return $this->_scopeConfig->getValue(
40+
'design/head/demonotice',
41+
\Magento\Store\Model\ScopeInterface::SCOPE_STORE
42+
);
3943
}
4044
}

‎app/code/Magento/Backend/Block/Page/System/Config/Robots/Reset.php

Lines changed: 2 additions & 3 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\Page\System\Config\Robots;
108

119
use Magento\Framework\App\Config\ScopeConfigInterface;
@@ -53,7 +51,8 @@ protected function _construct()
5351
public function getRobotsDefaultCustomInstructions()
5452
{
5553
return trim((string)$this->_scopeConfig->getValue(
56-
self::XML_PATH_ROBOTS_DEFAULT_CUSTOM_INSTRUCTIONS, ScopeConfigInterface::SCOPE_TYPE_DEFAULT
54+
self::XML_PATH_ROBOTS_DEFAULT_CUSTOM_INSTRUCTIONS,
55+
ScopeConfigInterface::SCOPE_TYPE_DEFAULT
5756
));
5857
}
5958

‎app/code/Magento/Backend/Block/Store/Switcher/Form/Renderer/Fieldset.php

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

7-
// @codingStandardsIgnoreFile
8-
97
namespace Magento\Backend\Block\Store\Switcher\Form\Renderer;
108

9+
use \Magento\Framework\Data\Form\Element\Renderer\RendererInterface;
10+
1111
/**
1212
* Form fieldset renderer
1313
*/
14-
class Fieldset extends \Magento\Backend\Block\Template implements \Magento\Framework\Data\Form\Element\Renderer\RendererInterface
14+
class Fieldset extends \Magento\Backend\Block\Template implements RendererInterface
1515
{
1616
/**
1717
* Form element which re-rendering

0 commit comments

Comments
 (0)