Skip to content

Commit b3d6949

Browse files
magento-teammagento-team
committed
2.0.0.0-dev53
* Moved general action-related functionality to \Magento\App\Action\Action in the library. Removed Magento\Core\Controller\Varien\Action and related logic from the Magento_Core module * Moved view-related methods from action interface to \Magento\App\ViewInterface with corresponding implementation * Moved redirect creation logic from the action interface to \Magento\App\Response\RedirectInterface * Moved Magento\Core common blocks to the library * Added reading of etc/integration/config.xml and etc/integration/api.xml files for API Integrations * Various improvements: * Email-related logic from the Core and Adminhtml modules consolidated in the new Email module * GitHub requests: * [#238](#238) -- Improve escaping HTML entities in URL * [#199](#199) -- Replaced function calls to array_push with adding the elements directly * [#182](#182) -- By default use collection _idFieldName for toOption* methods. * [#233](#233) -- Google Rich Snippet Code * [#339](#339) -- Correcting 'cahce' typo in documentation. * [#232](#232) -- Update app/code/core/Mage/Checkout/controllers/CartController.php (fix issue #27632) * Fixed bugs: * Fixed JavaScript error when printing orders from the frontend * Fixed Captcha problems on various forms when Captcha is enabled on the frontend * Fixed "Page not found" on category page if setting "Add Store Code to Urls" to "Yes" in the backend config * Fixed Fatal error when creating shipping label for returns
1 parent b7189dd commit b3d6949

File tree

2,141 files changed

+46145
-28396
lines changed

Some content is hidden

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

2,141 files changed

+46145
-28396
lines changed

‎CHANGELOG.md

+23-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,25 @@
1+
2.0.0.0-dev53
2+
=============
3+
* Moved general action-related functionality to \Magento\App\Action\Action in the library. Removed Magento\Core\Controller\Varien\Action and related logic from the Magento_Core module
4+
* Moved view-related methods from action interface to \Magento\App\ViewInterface with corresponding implementation
5+
* Moved redirect creation logic from the action interface to \Magento\App\Response\RedirectInterface
6+
* Moved Magento\Core common blocks to the library
7+
* Added reading of etc/integration/config.xml and etc/integration/api.xml files for API Integrations
8+
* Various improvements:
9+
* Email-related logic from the Core and Adminhtml modules consolidated in the new Email module
10+
* GitHub requests:
11+
* [#238](https://github.com/magento/magento2/pull/238) -- Improve escaping HTML entities in URL
12+
* [#199](https://github.com/magento/magento2/pull/199) -- Replaced function calls to array_push with adding the elements directly
13+
* [#182](https://github.com/magento/magento2/pull/182) -- By default use collection _idFieldName for toOption* methods.
14+
* [#233](https://github.com/magento/magento2/pull/233) -- Google Rich Snippet Code
15+
* [#339](https://github.com/magento/magento2/pull/339) -- Correcting 'cahce' typo in documentation.
16+
* [#232](https://github.com/magento/magento2/pull/232) -- Update app/code/core/Mage/Checkout/controllers/CartController.php (fix issue #27632)
17+
* Fixed bugs:
18+
* Fixed JavaScript error when printing orders from the frontend
19+
* Fixed Captcha problems on various forms when Captcha is enabled on the frontend
20+
* Fixed "Page not found" on category page if setting "Add Store Code to Urls" to "Yes" in the backend config
21+
* Fixed Fatal error when creating shipping label for returns
22+
123
2.0.0.0-dev52
224
=============
325
* Better Navigation menu rendering due to improved Caching of Categories
@@ -53,7 +75,7 @@
5375
* Moved the String Helper to the Magento\Filter, Magento\Stdlib\String, Magento\Stdlib\ArrayUtils libraries
5476
* Moved the Data Helper to the Magento\Math, Magento\Filter, Magento\Convert, Magento\Encryption, Magento\Filesystem libraries and to Magento\Customer\Helper\Data libraries
5577
* Moved the Http Magento Helper to the Magento\HTTP library
56-
* The Hint Magento Helper, Http Magento Helper helpers were removed from the Magento\Core module
78+
* The Hint Magento Helper, Http Magento Helper helpers were removed from the Magento\Core module
5779
* Implemented SOAP faults declaration in WSDL
5880
* Web API config reader was refactored to use Magento\Config\Reader\Filesystem
5981
* Created integrations module. Added 'Integrations Grid' and 'New/Edit' Integration pages in the admin

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ public function render(\Magento\Object $row)
5353
$this->getUrl('*/*/remove/', array(
5454
'_current'=>true,
5555
'id' => $row->getId(),
56-
\Magento\Core\Controller\Front\Action::PARAM_NAME_URL_ENCODED => $encodedUrl)
56+
\Magento\App\Action\Action::PARAM_NAME_URL_ENCODED => $encodedUrl)
5757
),
5858
__('Are you sure?'),
5959
__('Remove')

‎app/code/Magento/AdminNotification/Block/System/Messages.php

+12-12
Original file line numberDiff line numberDiff line change
@@ -32,19 +32,19 @@ class Messages extends \Magento\Backend\Block\Template
3232
*/
3333
protected $_messages;
3434

35-
/**
36-
* @param \Magento\Core\Helper\Data $coreData
37-
* @param \Magento\Backend\Block\Template\Context $context
38-
* @param \Magento\AdminNotification\Model\Resource\System\Message\Collection\Synchronized $messages
39-
* @param array $data
35+
/**
36+
* @param \Magento\Backend\Block\Template\Context $context
37+
* @param \Magento\Core\Helper\Data $coreData
38+
* @param \Magento\AdminNotification\Model\Resource\System\Message\Collection\Synchronized $messages
39+
* @param array $data
4040
*/
41-
public function __construct(
42-
\Magento\Core\Helper\Data $coreData,
43-
\Magento\Backend\Block\Template\Context $context,
44-
\Magento\AdminNotification\Model\Resource\System\Message\Collection\Synchronized $messages,
45-
array $data = array()
46-
) {
47-
parent::__construct($coreData, $context, $data);
41+
public function __construct(
42+
\Magento\Backend\Block\Template\Context $context,
43+
\Magento\Core\Helper\Data $coreData,
44+
\Magento\AdminNotification\Model\Resource\System\Message\Collection\Synchronized $messages,
45+
array $data = array()
46+
) {
47+
parent::__construct($context, $coreData, $data);
4848
$this->_messages = $messages;
4949
}
5050

‎app/code/Magento/AdminNotification/Block/System/Messages/UnreadMessagePopup.php

+12-12
Original file line numberDiff line numberDiff line change
@@ -42,19 +42,19 @@ class UnreadMessagePopup extends \Magento\Backend\Block\Template
4242
*/
4343
protected $_messages;
4444

45-
/**
46-
* @param \Magento\Core\Helper\Data $coreData
47-
* @param \Magento\Backend\Block\Template\Context $context
48-
* @param \Magento\AdminNotification\Model\Resource\System\Message\Collection\Synchronized $messages
49-
* @param array $data
45+
/**
46+
* @param \Magento\Backend\Block\Template\Context $context
47+
* @param \Magento\Core\Helper\Data $coreData
48+
* @param \Magento\AdminNotification\Model\Resource\System\Message\Collection\Synchronized $messages
49+
* @param array $data
5050
*/
51-
public function __construct(
52-
\Magento\Core\Helper\Data $coreData,
53-
\Magento\Backend\Block\Template\Context $context,
54-
\Magento\AdminNotification\Model\Resource\System\Message\Collection\Synchronized $messages,
55-
array $data = array()
56-
) {
57-
parent::__construct($coreData, $context, $data);
51+
public function __construct(
52+
\Magento\Backend\Block\Template\Context $context,
53+
\Magento\Core\Helper\Data $coreData,
54+
\Magento\AdminNotification\Model\Resource\System\Message\Collection\Synchronized $messages,
55+
array $data = array()
56+
) {
57+
parent::__construct($context, $coreData, $data);
5858
$this->_messages = $messages;
5959
}
6060

‎app/code/Magento/AdminNotification/Block/ToolbarEntry.php

+12-12
Original file line numberDiff line numberDiff line change
@@ -42,19 +42,19 @@ class ToolbarEntry extends \Magento\Backend\Block\Template
4242
*/
4343
protected $_notificationList;
4444

45-
/**
46-
* @param \Magento\Core\Helper\Data $coreData
47-
* @param \Magento\Backend\Block\Template\Context $context
48-
* @param \Magento\AdminNotification\Model\Resource\Inbox\Collection\Unread $notificationList
49-
* @param array $data
45+
/**
46+
* @param \Magento\Backend\Block\Template\Context $context
47+
* @param \Magento\Core\Helper\Data $coreData
48+
* @param \Magento\AdminNotification\Model\Resource\Inbox\Collection\Unread $notificationList
49+
* @param array $data
5050
*/
51-
public function __construct(
52-
\Magento\Core\Helper\Data $coreData,
53-
\Magento\Backend\Block\Template\Context $context,
54-
\Magento\AdminNotification\Model\Resource\Inbox\Collection\Unread $notificationList,
55-
array $data = array()
56-
) {
57-
parent::__construct($coreData, $context, $data);
51+
public function __construct(
52+
\Magento\Backend\Block\Template\Context $context,
53+
\Magento\Core\Helper\Data $coreData,
54+
\Magento\AdminNotification\Model\Resource\Inbox\Collection\Unread $notificationList,
55+
array $data = array()
56+
) {
57+
parent::__construct($context, $coreData, $data);
5858
$this->_notificationList = $notificationList;
5959
}
6060

‎app/code/Magento/AdminNotification/Block/Window.php

+14-14
Original file line numberDiff line numberDiff line change
@@ -60,21 +60,21 @@ class Window extends \Magento\Backend\Block\Template
6060
*/
6161
protected $_latestItem;
6262

63-
/**
64-
* @param \Magento\Core\Helper\Data $coreData
65-
* @param \Magento\Backend\Block\Template\Context $context
66-
* @param \Magento\Backend\Model\Auth\Session $authSession
67-
* @param \Magento\AdminNotification\Model\Resource\Inbox\Collection\Critical $criticalCollection
68-
* @param array $data
63+
/**
64+
* @param \Magento\Backend\Block\Template\Context $context
65+
* @param \Magento\Core\Helper\Data $coreData
66+
* @param \Magento\Backend\Model\Auth\Session $authSession
67+
* @param \Magento\AdminNotification\Model\Resource\Inbox\Collection\Critical $criticalCollection
68+
* @param array $data
6969
*/
70-
public function __construct(
71-
\Magento\Core\Helper\Data $coreData,
72-
\Magento\Backend\Block\Template\Context $context,
73-
\Magento\Backend\Model\Auth\Session $authSession,
74-
\Magento\AdminNotification\Model\Resource\Inbox\Collection\Critical $criticalCollection,
75-
array $data = array()
76-
) {
77-
parent::__construct($coreData, $context, $data);
70+
public function __construct(
71+
\Magento\Backend\Block\Template\Context $context,
72+
\Magento\Core\Helper\Data $coreData,
73+
\Magento\Backend\Model\Auth\Session $authSession,
74+
\Magento\AdminNotification\Model\Resource\Inbox\Collection\Critical $criticalCollection,
75+
array $data = array()
76+
) {
77+
parent::__construct($context, $coreData, $data);
7878
$this->_authSession = $authSession;
7979
$this->_criticalCollection = $criticalCollection;
8080
}

‎app/code/Magento/AdminNotification/Controller/Adminhtml/Notification.php

+8-7
Original file line numberDiff line numberDiff line change
@@ -27,18 +27,19 @@
2727
*/
2828
namespace Magento\AdminNotification\Controller\Adminhtml;
2929

30-
class Notification extends \Magento\Backend\Controller\AbstractAction
30+
class Notification extends \Magento\Backend\App\AbstractAction
3131
{
3232
public function indexAction()
3333
{
34-
$this->_title(__('Notifications'));
34+
$this->_title->add(__('Notifications'));
3535

36-
$this->loadLayout()
37-
->_setActiveMenu('Magento_AdminNotification::system_adminnotification')
36+
$this->_view->loadLayout();
37+
$this->_setActiveMenu('Magento_AdminNotification::system_adminnotification')
3838
->_addBreadcrumb(
3939
__('Messages Inbox'),
4040
__('Messages Inbox')
41-
)->renderLayout();
41+
);
42+
$this->_view->renderLayout();
4243
}
4344

4445
public function markAsReadAction()
@@ -59,7 +60,7 @@ public function markAsReadAction()
5960
);
6061
}
6162

62-
$this->_redirectReferer();
63+
$this->getResponse()->setRedirect($this->_redirect->getRedirectUrl($this->getUrl('*')));
6364
return;
6465
}
6566
$this->_redirect('adminhtml/*/');
@@ -174,7 +175,7 @@ public function massRemoveAction()
174175
__("We couldn't remove the messages because of an error."));
175176
}
176177
}
177-
$this->_redirectReferer();
178+
$this->getResponse()->setRedirect($this->_redirect->getRedirectUrl($this->getUrl('*')));
178179
}
179180

180181
protected function _isAllowed()

‎app/code/Magento/AdminNotification/Controller/Adminhtml/Survey.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
*/
3535
namespace Magento\AdminNotification\Controller\Adminhtml;
3636

37-
class Survey extends \Magento\Backend\Controller\Adminhtml\Action
37+
class Survey extends \Magento\Backend\App\Action
3838
{
3939
/**
4040
* Index Action

‎app/code/Magento/AdminNotification/Controller/Adminhtml/System/Message.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424

2525
namespace Magento\AdminNotification\Controller\Adminhtml\System;
2626

27-
class Message extends \Magento\Backend\Controller\AbstractAction
27+
class Message extends \Magento\Backend\App\AbstractAction
2828
{
2929
public function listAction()
3030
{

‎app/code/Magento/AdminNotification/Helper/Data.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
*/
3535
namespace Magento\AdminNotification\Helper;
3636

37-
class Data extends \Magento\Core\Helper\AbstractHelper
37+
class Data extends \Magento\App\Helper\AbstractHelper
3838
{
3939
const XML_PATH_POPUP_URL = 'system/adminnotification/popup_url';
4040

@@ -77,7 +77,7 @@ class Data extends \Magento\Core\Helper\AbstractHelper
7777
protected $_inboxFactory;
7878

7979
public function __construct(
80-
\Magento\Core\Helper\Context $context,
80+
\Magento\App\Helper\Context $context,
8181
\Magento\Core\Model\Store\Config $coreStoreConfig,
8282
\Magento\AdminNotification\Model\InboxFactory $inboxFactory
8383
) {

‎app/code/Magento/AdminNotification/Model/Feed.php

+5-11
Original file line numberDiff line numberDiff line change
@@ -58,17 +58,11 @@ class Feed extends \Magento\Core\Model\AbstractModel
5858
*/
5959
protected $_inboxFactory;
6060

61-
/**
62-
* @var \Magento\App\CacheInterface
63-
*/
64-
protected $_cache;
65-
6661
/**
6762
* @param \Magento\Core\Model\Context $context
6863
* @param \Magento\Core\Model\Registry $registry
6964
* @param \Magento\Core\Model\Store\Config $coreStoreConfig
7065
* @param \Magento\AdminNotification\Model\InboxFactory $inboxFactory
71-
* @param \Magento\App\CacheInterface $cache
7266
* @param \Magento\Core\Model\Resource\AbstractResource $resource
7367
* @param \Magento\Data\Collection\Db $resourceCollection
7468
* @param array $data
@@ -78,23 +72,23 @@ public function __construct(
7872
\Magento\Core\Model\Registry $registry,
7973
\Magento\Core\Model\Store\Config $coreStoreConfig,
8074
\Magento\AdminNotification\Model\InboxFactory $inboxFactory,
81-
\Magento\App\CacheInterface $cache,
8275
\Magento\Core\Model\Resource\AbstractResource $resource = null,
8376
\Magento\Data\Collection\Db $resourceCollection = null,
8477
array $data = array()
8578
) {
8679
parent::__construct($context, $registry, $resource, $resourceCollection, $data);
8780
$this->_coreStoreConfig = $coreStoreConfig;
8881
$this->_inboxFactory = $inboxFactory;
89-
$this->_cache = $cache;
9082
}
9183

9284
/**
9385
* Init model
9486
*
9587
*/
9688
protected function _construct()
97-
{}
89+
{
90+
91+
}
9892

9993
/**
10094
* Retrieve feed url
@@ -174,7 +168,7 @@ public function getFrequency()
174168
*/
175169
public function getLastUpdate()
176170
{
177-
return $this->_cache->load('admin_notifications_lastcheck');
171+
return $this->_cacheManager->load('admin_notifications_lastcheck');
178172
}
179173

180174
/**
@@ -184,7 +178,7 @@ public function getLastUpdate()
184178
*/
185179
public function setLastUpdate()
186180
{
187-
$this->_cache->save(time(), 'admin_notifications_lastcheck');
181+
$this->_cacheManager->save(time(), 'admin_notifications_lastcheck');
188182
return $this;
189183
}
190184

‎app/code/Magento/Adminhtml/Block/Backup/Dialogs.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ class Dialogs extends \Magento\Adminhtml\Block\Template
4545
/**
4646
* Include backup.js file in page before rendering
4747
*
48-
* @see \Magento\Core\Block\AbstractBlock::_prepareLayout()
48+
* @see \Magento\View\Block\AbstractBlock::_prepareLayout()
4949
*/
5050
protected function _prepareLayout()
5151
{

‎app/code/Magento/Adminhtml/Block/Denied.php

+12-12
Original file line numberDiff line numberDiff line change
@@ -33,20 +33,20 @@ class Denied extends \Magento\Adminhtml\Block\Template
3333
*/
3434
protected $_authSession;
3535

36-
/**
37-
* @param \Magento\Backend\Model\Auth\Session $authSession
38-
* @param \Magento\Core\Helper\Data $coreData
39-
* @param \Magento\Backend\Block\Template\Context $context
40-
* @param array $data
36+
/**
37+
* @param \Magento\Backend\Block\Template\Context $context
38+
* @param \Magento\Core\Helper\Data $coreData
39+
* @param \Magento\Backend\Model\Auth\Session $authSession
40+
* @param array $data
4141
*/
42-
public function __construct(
43-
\Magento\Backend\Model\Auth\Session $authSession,
44-
\Magento\Core\Helper\Data $coreData,
45-
\Magento\Backend\Block\Template\Context $context,
46-
array $data = array()
47-
) {
42+
public function __construct(
43+
\Magento\Backend\Block\Template\Context $context,
44+
\Magento\Core\Helper\Data $coreData,
45+
\Magento\Backend\Model\Auth\Session $authSession,
46+
array $data = array()
47+
) {
4848
$this->_authSession = $authSession;
49-
parent::__construct($coreData, $context, $data);
49+
parent::__construct($context, $coreData, $data);
5050
}
5151

5252
public function hasAvailableResources()

‎app/code/Magento/Adminhtml/Block/Html/Date.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,6 @@
3333
*/
3434
namespace Magento\Adminhtml\Block\Html;
3535

36-
class Date extends \Magento\Core\Block\Html\Date
36+
class Date extends \Magento\View\Block\Html\Date
3737
{
3838
}

‎app/code/Magento/Adminhtml/Block/Html/Select.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,6 @@
3333
*/
3434
namespace Magento\Adminhtml\Block\Html;
3535

36-
class Select extends \Magento\Core\Block\Html\Select
36+
class Select extends \Magento\View\Block\Html\Select
3737
{
3838
}

0 commit comments

Comments
 (0)