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

CHANGELOG.md

@@ -1,3 +1,25 @@
+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](https://github.com/magento/magento2/pull/238) -- Improve escaping HTML entities in URL
+ * [#199](https://github.com/magento/magento2/pull/199) -- Replaced function calls to array_push with adding the elements directly
+ * [#182](https://github.com/magento/magento2/pull/182) -- By default use collection _idFieldName for toOption* methods.
+ * [#233](https://github.com/magento/magento2/pull/233) -- Google Rich Snippet Code
+ * [#339](https://github.com/magento/magento2/pull/339) -- Correcting 'cahce' typo in documentation.
+ * [#232](https://github.com/magento/magento2/pull/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
+
 2.0.0.0-dev52
 =============
 * Better Navigation menu rendering due to improved Caching of Categories
@@ -53,7 +75,7 @@
  * Moved the String Helper to the Magento\Filter, Magento\Stdlib\String, Magento\Stdlib\ArrayUtils libraries
  * Moved the Data Helper to the Magento\Math, Magento\Filter, Magento\Convert, Magento\Encryption, Magento\Filesystem libraries and to Magento\Customer\Helper\Data libraries
  * Moved the Http Magento Helper to the Magento\HTTP library
- * The Hint Magento Helper, Http Magento Helper helpers were removed from the Magento\Core module
+ *  The Hint Magento Helper, Http Magento Helper helpers were removed from the Magento\Core module
  * Implemented SOAP faults declaration in WSDL
  * Web API config reader was refactored to use Magento\Config\Reader\Filesystem
  * Created integrations module. Added 'Integrations Grid' and 'New/Edit' Integration pages in the admin

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

@@ -53,7 +53,7 @@ public function render(\Magento\Object $row)
  $this->getUrl('*/*/remove/', array(
  '_current'=>true,
  'id' => $row->getId(),
- \Magento\Core\Controller\Front\Action::PARAM_NAME_URL_ENCODED => $encodedUrl)
+ \Magento\App\Action\Action::PARAM_NAME_URL_ENCODED => $encodedUrl)
  ),
  __('Are you sure?'),
  __('Remove')

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

@@ -32,19 +32,19 @@ class Messages extends \Magento\Backend\Block\Template
  */
  protected $_messages;
 
- /**
- * @param \Magento\Core\Helper\Data $coreData
- * @param \Magento\Backend\Block\Template\Context $context
- * @param \Magento\AdminNotification\Model\Resource\System\Message\Collection\Synchronized $messages
- * @param array $data
+ /**
+ * @param \Magento\Backend\Block\Template\Context $context
+ * @param \Magento\Core\Helper\Data $coreData
+ * @param \Magento\AdminNotification\Model\Resource\System\Message\Collection\Synchronized $messages
+ * @param array $data
  */
- public function __construct(
- \Magento\Core\Helper\Data $coreData,
- \Magento\Backend\Block\Template\Context $context,
- \Magento\AdminNotification\Model\Resource\System\Message\Collection\Synchronized $messages,
- array $data = array()
- ) {
- parent::__construct($coreData, $context, $data);
+ public function __construct(
+ \Magento\Backend\Block\Template\Context $context,
+ \Magento\Core\Helper\Data $coreData,
+ \Magento\AdminNotification\Model\Resource\System\Message\Collection\Synchronized $messages,
+ array $data = array()
+ ) {
+ parent::__construct($context, $coreData, $data);
  $this->_messages = $messages;
  }
 

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

@@ -42,19 +42,19 @@ class UnreadMessagePopup extends \Magento\Backend\Block\Template
  */
  protected $_messages;
 
- /**
- * @param \Magento\Core\Helper\Data $coreData
- * @param \Magento\Backend\Block\Template\Context $context
- * @param \Magento\AdminNotification\Model\Resource\System\Message\Collection\Synchronized $messages
- * @param array $data
+ /**
+ * @param \Magento\Backend\Block\Template\Context $context
+ * @param \Magento\Core\Helper\Data $coreData
+ * @param \Magento\AdminNotification\Model\Resource\System\Message\Collection\Synchronized $messages
+ * @param array $data
  */
- public function __construct(
- \Magento\Core\Helper\Data $coreData,
- \Magento\Backend\Block\Template\Context $context,
- \Magento\AdminNotification\Model\Resource\System\Message\Collection\Synchronized $messages,
- array $data = array()
- ) {
- parent::__construct($coreData, $context, $data);
+ public function __construct(
+ \Magento\Backend\Block\Template\Context $context,
+ \Magento\Core\Helper\Data $coreData,
+ \Magento\AdminNotification\Model\Resource\System\Message\Collection\Synchronized $messages,
+ array $data = array()
+ ) {
+ parent::__construct($context, $coreData, $data);
  $this->_messages = $messages;
  }
 

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

@@ -42,19 +42,19 @@ class ToolbarEntry extends \Magento\Backend\Block\Template
  */
  protected $_notificationList;
 
- /**
- * @param \Magento\Core\Helper\Data $coreData
- * @param \Magento\Backend\Block\Template\Context $context
- * @param \Magento\AdminNotification\Model\Resource\Inbox\Collection\Unread $notificationList
- * @param array $data
+ /**
+ * @param \Magento\Backend\Block\Template\Context $context
+ * @param \Magento\Core\Helper\Data $coreData
+ * @param \Magento\AdminNotification\Model\Resource\Inbox\Collection\Unread $notificationList
+ * @param array $data
  */
- public function __construct(
- \Magento\Core\Helper\Data $coreData,
- \Magento\Backend\Block\Template\Context $context,
- \Magento\AdminNotification\Model\Resource\Inbox\Collection\Unread $notificationList,
- array $data = array()
- ) {
- parent::__construct($coreData, $context, $data);
+ public function __construct(
+ \Magento\Backend\Block\Template\Context $context,
+ \Magento\Core\Helper\Data $coreData,
+ \Magento\AdminNotification\Model\Resource\Inbox\Collection\Unread $notificationList,
+ array $data = array()
+ ) {
+ parent::__construct($context, $coreData, $data);
  $this->_notificationList = $notificationList;
  }
 

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

@@ -60,21 +60,21 @@ class Window extends \Magento\Backend\Block\Template
  */
  protected $_latestItem;
 
- /**
- * @param \Magento\Core\Helper\Data $coreData
- * @param \Magento\Backend\Block\Template\Context $context
- * @param \Magento\Backend\Model\Auth\Session $authSession
- * @param \Magento\AdminNotification\Model\Resource\Inbox\Collection\Critical $criticalCollection
- * @param array $data
+ /**
+ * @param \Magento\Backend\Block\Template\Context $context
+ * @param \Magento\Core\Helper\Data $coreData
+ * @param \Magento\Backend\Model\Auth\Session $authSession
+ * @param \Magento\AdminNotification\Model\Resource\Inbox\Collection\Critical $criticalCollection
+ * @param array $data
  */
- public function __construct(
- \Magento\Core\Helper\Data $coreData,
- \Magento\Backend\Block\Template\Context $context,
- \Magento\Backend\Model\Auth\Session $authSession,
- \Magento\AdminNotification\Model\Resource\Inbox\Collection\Critical $criticalCollection,
- array $data = array()
- ) {
- parent::__construct($coreData, $context, $data);
+ public function __construct(
+ \Magento\Backend\Block\Template\Context $context,
+ \Magento\Core\Helper\Data $coreData,
+ \Magento\Backend\Model\Auth\Session $authSession,
+ \Magento\AdminNotification\Model\Resource\Inbox\Collection\Critical $criticalCollection,
+ array $data = array()
+ ) {
+ parent::__construct($context, $coreData, $data);
  $this->_authSession = $authSession;
  $this->_criticalCollection = $criticalCollection;
  }

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

@@ -27,18 +27,19 @@
  */
 namespace Magento\AdminNotification\Controller\Adminhtml;
 
-class Notification extends \Magento\Backend\Controller\AbstractAction
+class Notification extends \Magento\Backend\App\AbstractAction
 {
  public function indexAction()
  {
- $this->_title(__('Notifications'));
+ $this->_title->add(__('Notifications'));
 
- $this->loadLayout()
-  ->_setActiveMenu('Magento_AdminNotification::system_adminnotification')
+ $this->_view->loadLayout();
+ $this->_setActiveMenu('Magento_AdminNotification::system_adminnotification')
  ->_addBreadcrumb(
  __('Messages Inbox'),
  __('Messages Inbox')
- )->renderLayout();
+ );
+ $this->_view->renderLayout();
  }
 
  public function markAsReadAction()
@@ -59,7 +60,7 @@ public function markAsReadAction()
  );
  }
 
- $this->_redirectReferer();
+ $this->getResponse()->setRedirect($this->_redirect->getRedirectUrl($this->getUrl('*')));
  return;
  }
  $this->_redirect('adminhtml/*/');
@@ -174,7 +175,7 @@ public function massRemoveAction()
  __("We couldn't remove the messages because of an error."));
  }
  }
- $this->_redirectReferer();
+ $this->getResponse()->setRedirect($this->_redirect->getRedirectUrl($this->getUrl('*')));
  }
 
  protected function _isAllowed()

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

@@ -34,7 +34,7 @@
  */
 namespace Magento\AdminNotification\Controller\Adminhtml;
 
-class Survey extends \Magento\Backend\Controller\Adminhtml\Action
+class Survey extends \Magento\Backend\App\Action
 {
  /**
  * Index Action

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

@@ -24,7 +24,7 @@
 
 namespace Magento\AdminNotification\Controller\Adminhtml\System;
 
-class Message extends \Magento\Backend\Controller\AbstractAction
+class Message extends \Magento\Backend\App\AbstractAction
 {
  public function listAction()
  {

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

@@ -34,7 +34,7 @@
  */
 namespace Magento\AdminNotification\Helper;
 
-class Data extends \Magento\Core\Helper\AbstractHelper
+class Data extends \Magento\App\Helper\AbstractHelper
 {
  const XML_PATH_POPUP_URL = 'system/adminnotification/popup_url';
 
@@ -77,7 +77,7 @@ class Data extends \Magento\Core\Helper\AbstractHelper
  protected $_inboxFactory;
 
  public function __construct(
- \Magento\Core\Helper\Context $context,
+ \Magento\App\Helper\Context $context,
  \Magento\Core\Model\Store\Config $coreStoreConfig,
  \Magento\AdminNotification\Model\InboxFactory $inboxFactory
  ) {

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

@@ -58,17 +58,11 @@ class Feed extends \Magento\Core\Model\AbstractModel
  */
  protected $_inboxFactory;
 
- /**
- * @var \Magento\App\CacheInterface
- */
- protected $_cache;
-
  /**
  * @param \Magento\Core\Model\Context $context
  * @param \Magento\Core\Model\Registry $registry
  * @param \Magento\Core\Model\Store\Config $coreStoreConfig
  * @param \Magento\AdminNotification\Model\InboxFactory $inboxFactory
- * @param \Magento\App\CacheInterface $cache
  * @param \Magento\Core\Model\Resource\AbstractResource $resource
  * @param \Magento\Data\Collection\Db $resourceCollection
  * @param array $data
@@ -78,23 +72,23 @@ public function __construct(
  \Magento\Core\Model\Registry $registry,
  \Magento\Core\Model\Store\Config $coreStoreConfig,
  \Magento\AdminNotification\Model\InboxFactory $inboxFactory,
- \Magento\App\CacheInterface $cache,
  \Magento\Core\Model\Resource\AbstractResource $resource = null,
  \Magento\Data\Collection\Db $resourceCollection = null,
  array $data = array()
  ) {
  parent::__construct($context, $registry, $resource, $resourceCollection, $data);
  $this->_coreStoreConfig = $coreStoreConfig;
  $this->_inboxFactory = $inboxFactory;
- $this->_cache = $cache;
  }
 
  /**
  * Init model
  *
  */
  protected function _construct()
- {}
+ {
+
+ }
 
  /**
  * Retrieve feed url
@@ -174,7 +168,7 @@ public function getFrequency()
  */
  public function getLastUpdate()
  {
- return $this->_cache->load('admin_notifications_lastcheck');
+ return $this->_cacheManager->load('admin_notifications_lastcheck');
  }
 
  /**
@@ -184,7 +178,7 @@ public function getLastUpdate()
  */
  public function setLastUpdate()
  {
- $this->_cache->save(time(), 'admin_notifications_lastcheck');
+ $this->_cacheManager->save(time(), 'admin_notifications_lastcheck');
  return $this;
  }
 

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

@@ -45,7 +45,7 @@ class Dialogs extends \Magento\Adminhtml\Block\Template
  /**
  * Include backup.js file in page before rendering
  *
- * @see \Magento\Core\Block\AbstractBlock::_prepareLayout()
+ * @see \Magento\View\Block\AbstractBlock::_prepareLayout()
  */
  protected function _prepareLayout()
  {

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

@@ -33,20 +33,20 @@ class Denied extends \Magento\Adminhtml\Block\Template
  */
  protected $_authSession;
 
- /**
- * @param \Magento\Backend\Model\Auth\Session $authSession
- * @param \Magento\Core\Helper\Data $coreData
- * @param \Magento\Backend\Block\Template\Context $context
- * @param array $data
+ /**
+ * @param \Magento\Backend\Block\Template\Context $context
+ * @param \Magento\Core\Helper\Data $coreData
+ * @param \Magento\Backend\Model\Auth\Session $authSession
+ * @param array $data
  */
- public function __construct(
- \Magento\Backend\Model\Auth\Session $authSession,
- \Magento\Core\Helper\Data $coreData,
- \Magento\Backend\Block\Template\Context $context,
- array $data = array()
- ) {
+ public function __construct(
+ \Magento\Backend\Block\Template\Context $context,
+ \Magento\Core\Helper\Data $coreData,
+ \Magento\Backend\Model\Auth\Session $authSession,
+ array $data = array()
+ ) {
  $this->_authSession = $authSession;
- parent::__construct($coreData, $context, $data);
+ parent::__construct($context, $coreData, $data);
  }
 
  public function hasAvailableResources()

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

@@ -33,6 +33,6 @@
  */
 namespace Magento\Adminhtml\Block\Html;
 
-class Date extends \Magento\Core\Block\Html\Date
+class Date extends \Magento\View\Block\Html\Date
 {
 }

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

@@ -33,6 +33,6 @@
  */
 namespace Magento\Adminhtml\Block\Html;
 
-class Select extends \Magento\Core\Block\Html\Select
+class Select extends \Magento\View\Block\Html\Select
 {
 }