Skip to content

Commit dfa1be1

Browse files
slopukhovslopukhov
committed
Merge branch 'develop' of github.corp.ebay.com:magento2/magento2ce into MAGETWO-39705
2 parents 2be6669 + 2cb2fa5 commit dfa1be1

File tree

6,801 files changed

+219411
-122243
lines changed

Some content is hidden

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

6,801 files changed

+219411
-122243
lines changed

‎.htaccess

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
############################################
2-
## uncomment the line below to enable developer mode
2+
## overrides deployment configuration mode value
3+
## use command bin/magento deploy:mode:set to switch modes
34

45
# SetEnv MAGE_MODE developer
56

‎.php_cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ $finder = Symfony\CS\Finder\DefaultFinder::create()
1919
->exclude('lib/internal/Credis')
2020
->exclude('lib/internal/Less')
2121
->exclude('lib/internal/LinLibertineFont')
22-
->exclude('lib/internal/phpseclib')
2322
->exclude('pub/media')
2423
->exclude('pub/static')
2524
->exclude('setup/vendor')

‎Gruntfile.js

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ module.exports = function (grunt) {
99

1010
var _ = require('underscore'),
1111
path = require('path'),
12+
themes = require('./dev/tools/grunt/configs/themes'),
1213
configDir = './dev/tools/grunt/configs',
1314
taskDir = './dev/tools/grunt/tasks';
1415

@@ -63,14 +64,18 @@ module.exports = function (grunt) {
6364
},
6465

6566
/**
66-
* Refresh magento frontend & backend.
67+
* Refresh themes.
6768
*/
68-
refresh: [
69-
'exec:all',
70-
'less:blank',
71-
'less:luma',
72-
'less:backend'
73-
],
69+
refresh: function () {
70+
var tasks = [
71+
'clean',
72+
'exec:all'
73+
];
74+
_.each(themes, function(theme, name) {
75+
tasks.push('less:' + name);
76+
});
77+
grunt.task.run(tasks);
78+
},
7479

7580
/**
7681
* Documentation

‎app/code/Magento/AdminNotification/Block/Grid/Renderer/Actions.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,10 @@ public function __construct(
3434
/**
3535
* Renders grid column
3636
*
37-
* @param \Magento\Framework\Object $row
37+
* @param \Magento\Framework\DataObject $row
3838
* @return string
3939
*/
40-
public function render(\Magento\Framework\Object $row)
40+
public function render(\Magento\Framework\DataObject $row)
4141
{
4242
$readDetailsHtml = $row->getUrl() ? '<a class="action-details" target="_blank" href="' . $row->getUrl() . '">' . __(
4343
'Read Details'
@@ -60,7 +60,7 @@ public function render(\Magento\Framework\Object $row)
6060
[
6161
'_current' => true,
6262
'id' => $row->getId(),
63-
\Magento\Framework\App\Action\Action::PARAM_NAME_URL_ENCODED => $encodedUrl
63+
\Magento\Framework\App\ActionInterface::PARAM_NAME_URL_ENCODED => $encodedUrl
6464
]
6565
),
6666
__('Are you sure?'),

‎app/code/Magento/AdminNotification/Block/Grid/Renderer/Notice.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ class Notice extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\Abstract
1212
/**
1313
* Renders grid column
1414
*
15-
* @param \Magento\Framework\Object $row
15+
* @param \Magento\Framework\DataObject $row
1616
* @return string
1717
*/
18-
public function render(\Magento\Framework\Object $row)
18+
public function render(\Magento\Framework\DataObject $row)
1919
{
2020
return '<span class="grid-row-title">' .
2121
$row->getTitle() .

‎app/code/Magento/AdminNotification/Block/Grid/Renderer/Severity.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,10 @@ public function __construct(
3333
/**
3434
* Renders grid column
3535
*
36-
* @param \Magento\Framework\Object $row
36+
* @param \Magento\Framework\DataObject $row
3737
* @return string
3838
*/
39-
public function render(\Magento\Framework\Object $row)
39+
public function render(\Magento\Framework\DataObject $row)
4040
{
4141
$class = '';
4242
$value = '';

‎app/code/Magento/AdminNotification/Model/Resource/Inbox.php

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ protected function _construct()
3030
*/
3131
public function loadLatestNotice(\Magento\AdminNotification\Model\Inbox $object)
3232
{
33-
$adapter = $this->_getReadAdapter();
34-
$select = $adapter->select()->from(
33+
$connection = $this->getConnection();
34+
$select = $connection->select()->from(
3535
$this->getMainTable()
3636
)->order(
3737
$this->getIdFieldName() . ' DESC'
@@ -42,7 +42,7 @@ public function loadLatestNotice(\Magento\AdminNotification\Model\Inbox $object)
4242
)->limit(
4343
1
4444
);
45-
$data = $adapter->fetchRow($select);
45+
$data = $connection->fetchRow($select);
4646

4747
if ($data) {
4848
$object->setData($data);
@@ -62,8 +62,8 @@ public function loadLatestNotice(\Magento\AdminNotification\Model\Inbox $object)
6262
*/
6363
public function getNoticeStatus(\Magento\AdminNotification\Model\Inbox $object)
6464
{
65-
$adapter = $this->_getReadAdapter();
66-
$select = $adapter->select()->from(
65+
$connection = $this->getConnection();
66+
$select = $connection->select()->from(
6767
$this->getMainTable(),
6868
[
6969
'severity' => 'severity',
@@ -78,7 +78,7 @@ public function getNoticeStatus(\Magento\AdminNotification\Model\Inbox $object)
7878
'is_read=?',
7979
0
8080
);
81-
$return = $adapter->fetchPairs($select);
81+
$return = $connection->fetchPairs($select);
8282
return $return;
8383
}
8484

@@ -92,9 +92,9 @@ public function getNoticeStatus(\Magento\AdminNotification\Model\Inbox $object)
9292
*/
9393
public function parse(\Magento\AdminNotification\Model\Inbox $object, array $data)
9494
{
95-
$adapter = $this->_getWriteAdapter();
95+
$connection = $this->getConnection();
9696
foreach ($data as $item) {
97-
$select = $adapter->select()->from($this->getMainTable())->where('title = ?', $item['title']);
97+
$select = $connection->select()->from($this->getMainTable())->where('title = ?', $item['title']);
9898

9999
if (empty($item['url'])) {
100100
$select->where('url IS NULL');
@@ -106,11 +106,11 @@ public function parse(\Magento\AdminNotification\Model\Inbox $object, array $dat
106106
$row = false;
107107
unset($item['internal']);
108108
} else {
109-
$row = $adapter->fetchRow($select);
109+
$row = $connection->fetchRow($select);
110110
}
111111

112112
if (!$row) {
113-
$adapter->insert($this->getMainTable(), $item);
113+
$connection->insert($this->getMainTable(), $item);
114114
}
115115
}
116116
}

‎app/code/Magento/AdminNotification/Model/Resource/System/Message/Collection.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ public function __construct(
3636
\Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy,
3737
\Magento\Framework\Event\ManagerInterface $eventManager,
3838
\Magento\Framework\Notification\MessageList $messageList,
39-
$connection = null,
39+
\Magento\Framework\DB\Adapter\AdapterInterface $connection = null,
4040
\Magento\Framework\Model\Resource\Db\AbstractDb $resource = null
4141
) {
4242
$this->_messageList = $messageList;

‎app/code/Magento/AdminNotification/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "magento/module-admin-notification",
33
"description": "N/A",
44
"require": {
5-
"php": "~5.5.0|~5.6.0",
5+
"php": "~5.5.0|~5.6.0|~7.0.0",
66
"magento/module-store": "1.0.0-beta",
77
"magento/module-backend": "1.0.0-beta",
88
"magento/module-media-storage": "1.0.0-beta",

‎app/code/Magento/AdminNotification/view/adminhtml/templates/notification/window.phtml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,19 +13,19 @@
1313
*/
1414
?>
1515
<div data-mage-init='{"modalPopup": {}}' class="fade critical-notification">
16-
<div class="popup popup-<?php echo preg_replace('#[^a-z0-9]+#', '-', strtolower($block->getSeverityText())) ?>">
16+
<div class="popup popup-<?php /* @escapeNotVerified */ echo preg_replace('#[^a-z0-9]+#', '-', strtolower($block->getSeverityText())) ?>">
1717
<div class="popup-inner">
1818
<div class="popup-header">
19-
<div class="popup-title"><?php echo $block->getHeaderText(); ?></div>
19+
<div class="popup-title"><?php /* @escapeNotVerified */ echo $block->getHeaderText(); ?></div>
2020
</div>
2121
<div class="popup-content">
22-
<span><?php echo $block->getSeverityText();?></span>
22+
<span><?php /* @escapeNotVerified */ echo $block->getSeverityText();?></span>
2323

24-
<p class="message-text"><?php echo $block->getNoticeMessageText(); ?></p>
24+
<p class="message-text"><?php /* @escapeNotVerified */ echo $block->getNoticeMessageText(); ?></p>
2525

26-
<a href="<?php echo $block->getNoticeMessageUrl(); ?>"><?php echo $block->getReadDetailsText(); ?></a>
26+
<a href="<?php /* @escapeNotVerified */ echo $block->getNoticeMessageUrl(); ?>"><?php /* @escapeNotVerified */ echo $block->getReadDetailsText(); ?></a>
2727
</div>
28-
<span class="action close" data-dismiss="popup" title="<?php echo $block->escapeHtml(__('Close popup'));?>"><?php echo __('Close'); ?></span>
28+
<span class="action close" data-dismiss="popup" title="<?php echo $block->escapeHtml(__('Close popup'));?>"><?php /* @escapeNotVerified */ echo __('Close'); ?></span>
2929
</div>
3030
</div>
3131
</div>

0 commit comments

Comments
 (0)