2.0.0.0-dev57

* Fixed bugs:
  * Fixed [MAP]: "Click for price" link is broken on the category page
  * Fixed tax rule search on the grid
  * Fixed redirect on dashboard if "Search", "Reset", "Export" buttons are clicked on several pages
  * Fixed switching user to alternate store-view when clicking on the Category (with Add Store Code to Urls="Yes" in the config)
  * Fixed printing Order/Shipping/Credit Memo from backend
  * Fixed 404 Error on attempt to print Shipping Label
  * Fixed duplication of JavaScript Resources in head on frontend
  * Fixed inconsistency with disabled states on Configurable product page in the Plushe theme
  * Fixed 3D Secure Information absence on Admin Order Info page
  * Fixed possibility to download or revert Backup
  * Fixed session fixation in user registration during checkout
  * Fixed fatal error during login to backend
  * Fixed inline translations in the Adminhtml area
  * Fixed partial refunds/invoices in Payflow Pro
  * Fixed the issue with ignoring area in design emulation
  * Fixed order placing with virtual product using Express Checkout
  * Fixed the error during order placement with Recurring profile payment
  * Fixed wrong redirect after customer registration during multishipping checkout
  * Fixed inability to crate shipping labels
  * Fixed inability to switch language, if the default language is English
  * Fixed an issue with incorrect XML appearing in cache after some actions on the frontend
  * Fixed product export
  * Fixed inability to configure memcache as session save handler
* GitHub requests:
  * [#406](#406) -- Remove cast to (int) for the varch increment_id
  * [#425](#425) -- Installation of dev53 fails
  * [#324](#324) -- ImportExport: Easier debugging
* Modularity improvements:
  * Removed \Magento\App\Helper\HelperFactory
  * Removed the "helper" method from the abstract block interface
  * Layout page type config moved to library
  * Design loader moved to library
  * Theme label moved to library
  * Remaining part from Adminhtml moved to the appropriate modules. Adminhtml module has been eliminated
  * Core Session and Cookie models decomposed and moved to library
    * \Magento\Stdlib\Cookie library created
    * Session Manager and Session Config interfaces provided
    * Session save handler interface created
    * Session storage interface created, session does not extend \Magento\Object anymore
    * Session validator interface created
    * Session generic wrapper moved to library
    * Messages functionality moved from the Session model as separate component, message manager interface created
    * Sid resolver interface created to handle session sid from request

.htaccess

@@ -32,7 +32,7 @@
 ## adjust memory limit
 
 # php_value memory_limit 64M
- php_value memory_limit 256M
+ php_value memory_limit 2048M
  php_value max_execution_time 18000
 
 ############################################
@@ -176,7 +176,6 @@
  order allow,deny
  deny from all
  </Files>
-
 ############################################
 ## If running in cluster environment, uncomment this
 ## http://developer.yahoo.com/performance/rules.html#etags

CHANGELOG.md

@@ -1,3 +1,50 @@
+2.0.0.0-dev57
+=============
+* Fixed bugs:
+ * Fixed [MAP]: "Click for price" link is broken on the category page
+ * Fixed tax rule search on the grid
+ * Fixed redirect on dashboard if "Search", "Reset", "Export" buttons are clicked on several pages
+ * Fixed switching user to alternate store-view when clicking on the Category (with Add Store Code to Urls="Yes" in the config)
+ * Fixed printing Order/Shipping/Credit Memo from backend
+ * Fixed 404 Error on attempt to print Shipping Label
+ * Fixed duplication of JavaScript Resources in head on frontend
+ * Fixed inconsistency with disabled states on Configurable product page in the Plushe theme
+ * Fixed 3D Secure Information absence on Admin Order Info page
+ * Fixed possibility to download or revert Backup
+ * Fixed session fixation in user registration during checkout
+ * Fixed fatal error during login to backend
+ * Fixed inline translations in the Adminhtml area
+ * Fixed partial refunds/invoices in Payflow Pro
+ * Fixed the issue with ignoring area in design emulation
+ * Fixed order placing with virtual product using Express Checkout
+ * Fixed the error during order placement with Recurring profile payment
+ * Fixed wrong redirect after customer registration during multishipping checkout
+ * Fixed inability to crate shipping labels
+ * Fixed inability to switch language, if the default language is English
+ * Fixed an issue with incorrect XML appearing in cache after some actions on the frontend
+ * Fixed product export
+ * Fixed inability to configure memcache as session save handler
+* GitHub requests:
+ * [#406](https://github.com/magento/magento2/pull/406) -- Remove cast to (int) for the varch increment_id
+ * [#425](https://github.com/magento/magento2/issues/425) -- Installation of dev53 fails
+ * [#324](https://github.com/magento/magento2/pull/324) -- ImportExport: Easier debugging
+* Modularity improvements:
+ * Removed \Magento\App\Helper\HelperFactory
+ * Removed the "helper" method from the abstract block interface
+ * Layout page type config moved to library
+ * Design loader moved to library
+ * Theme label moved to library
+ * Remaining part from Adminhtml moved to the appropriate modules. Adminhtml module has been eliminated
+ * Core Session and Cookie models decomposed and moved to library
+ * \Magento\Stdlib\Cookie library created
+ * Session Manager and Session Config interfaces provided
+ * Session save handler interface created
+ * Session storage interface created, session does not extend \Magento\Object anymore
+ * Session validator interface created
+ * Session generic wrapper moved to library
+ * Messages functionality moved from the Session model as separate component, message manager interface created
+ * Sid resolver interface created to handle session sid from request
+
 2.0.0.0-dev56
 =============
 * Fixed bugs:
@@ -23,7 +70,7 @@
  * Ability to delete API integrations that were not created using configuration files
 * Removed System REST menu item and all associated UX flows:
  * Users, Roles, and Webhook Subscriptions sub-menu items were removed
-* Removed the Webhook module
+* Removed the Webhook module until it can be refactored to use the new Authorization service
 
 2.0.0.0-dev55
 =============

app/bootstrap.php

@@ -54,7 +54,6 @@
 /**#@+
  * Shortcut constants
  */
-define('DS', DIRECTORY_SEPARATOR);
 define('BP', dirname(__DIR__));
 /**#@-*/
 
@@ -65,10 +64,10 @@
 
 require_once __DIR__ . '/autoload.php';
 \Magento\Autoload\IncludePath::addIncludePath(array(
- BP . DS . 'app' . DS . 'code',
- BP . DS . 'lib',
+ BP . '/app/code',
+ BP . '/lib',
 ));
-$classMapPath = BP . DS . 'var/classmap.ser';
+$classMapPath = BP . '/var/classmap.ser';
 if (file_exists($classMapPath)) {
  require_once BP . '/lib/Magento/Autoload/ClassMap.php';
  $classMap = new \Magento\Autoload\ClassMap(BP);

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

@@ -28,6 +28,25 @@
 class Actions
  extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\AbstractRenderer
 {
+ /**
+ * @var \Magento\Core\Helper\Url
+ */
+ protected $_urlHelper;
+
+ /**
+ * @param \Magento\Backend\Block\Context $context
+ * @param \Magento\Core\Helper\Url $urlHelper
+ * @param array $data
+ */
+ public function __construct(
+ \Magento\Backend\Block\Context $context,
+ \Magento\Core\Helper\Url $urlHelper,
+ array $data = array()
+ ) {
+ $this->_urlHelper = $urlHelper;
+ parent::__construct($context, $data);
+ }
+
  /**
  * Renders grid column
  *
@@ -46,7 +65,7 @@ public function render(\Magento\Object $row)
  __('Mark as Read') .'</a> | '
  : '';
 
- $encodedUrl = $this->helper('Magento\Core\Helper\Url')->getEncodedUrl();
+ $encodedUrl = $this->_urlHelper->getEncodedUrl();
  return sprintf('%s%s<a href="%s" onClick="deleteConfirm(\'%s\', this.href); return false;">%s</a>',
  $readDetailsHtml,
  $markAsReadHtml,

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

@@ -32,16 +32,24 @@ class Messages extends \Magento\Backend\Block\Template
  */
  protected $_messages;
 
+ /**
+ * @var \Magento\Core\Helper\Data
+ */
+ protected $_coreHelper;
+
  /**
  * @param \Magento\Backend\Block\Template\Context $context
  * @param \Magento\AdminNotification\Model\Resource\System\Message\Collection\Synchronized $messages
+ * @param \Magento\Core\Helper\Data $coreHelper
  * @param array $data
  */
  public function __construct(
  \Magento\Backend\Block\Template\Context $context,
  \Magento\AdminNotification\Model\Resource\System\Message\Collection\Synchronized $messages,
+ \Magento\Core\Helper\Data $coreHelper,
  array $data = array()
  ) {
+ $this->_coreHelper = $coreHelper;
  parent::__construct($context, $data);
  $this->_messages = $messages;
  }
@@ -124,7 +132,7 @@ protected function _getMessagesUrl()
  */
  public function getSystemMessageDialogJson()
  {
- return $this->helper('Magento\Core\Helper\Data')->jsonEncode(array(
+ return $this->_coreHelper->jsonEncode(array(
  'systemMessageDialog' => array(
  'autoOpen' => false,
  'width' => 600,

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

@@ -49,13 +49,12 @@ public function markAsReadAction()
  try {
  $this->_objectManager->create('Magento\AdminNotification\Model\NotificationService')
  ->markAsRead($notificationId);
- $this->_session->addSuccess(
- __('The message has been marked as Read.')
- );
+ $this->messageManager->addSuccess(__('The message has been marked as Read.'));
  } catch (\Magento\Core\Exception $e) {
- $this->_session->addError($e->getMessage());
+ $this->messageManager->addError($e->getMessage());
  } catch (\Exception $e) {
- $this->_session->addException($e,
+ $this->messageManager->addException(
+ $e,
  __("We couldn't mark the notification as Read because of an error.")
  );
  }
@@ -92,7 +91,7 @@ public function massMarkAsReadAction()
  {
  $ids = $this->getRequest()->getParam('notification');
  if (!is_array($ids)) {
- $this->_session->addError(__('Please select messages.'));
+ $this->messageManager->addError(__('Please select messages.'));
  } else {
  try {
  foreach ($ids as $id) {
@@ -103,13 +102,12 @@ public function massMarkAsReadAction()
  ->save();
  }
  }
- $this->_getSession()->addSuccess(
- __('A total of %1 record(s) have been marked as Read.', count($ids))
- );
+ $this->messageManager->addSuccess(__('A total of %1 record(s) have been marked as Read.', count($ids)));
  } catch (\Magento\Core\Exception $e) {
- $this->_session->addError($e->getMessage());
+ $this->messageManager->addError($e->getMessage());
  } catch (\Exception $e) {
- $this->_session->addException($e,
+ $this->messageManager->addException(
+ $e,
  __("We couldn't mark the notification as Read because of an error.")
  );
  }
@@ -131,13 +129,14 @@ public function removeAction()
  try {
  $model->setIsRemove(1)
  ->save();
- $this->_session->addSuccess(
+ $this->messageManager->addSuccess(
  __('The message has been removed.')
  );
  } catch (\Magento\Core\Exception $e) {
- $this->_session->addError($e->getMessage());
+ $this->messageManager->addError($e->getMessage());
  } catch (\Exception $e) {
- $this->_session->addException($e,
+ $this->messageManager->addException(
+ $e,
  __("We couldn't remove the messages because of an error.")
  );
  }
@@ -152,9 +151,7 @@ public function massRemoveAction()
  {
  $ids = $this->getRequest()->getParam('notification');
  if (!is_array($ids)) {
- $this->_session->addError(
- __('Please select messages.')
- );
+ $this->messageManager->addError(__('Please select messages.'));
  } else {
  try {
  foreach ($ids as $id) {
@@ -165,14 +162,11 @@ public function massRemoveAction()
  ->save();
  }
  }
- $this->_getSession()->addSuccess(
- __('Total of %1 record(s) have been removed.', count($ids))
- );
+ $this->messageManager->addSuccess(__('Total of %1 record(s) have been removed.', count($ids)));
  } catch (\Magento\Core\Exception $e) {
- $this->_session->addError($e->getMessage());
+ $this->messageManager->addError($e->getMessage());
  } catch (\Exception $e) {
- $this->_session->addException($e,
- __("We couldn't remove the messages because of an error."));
+ $this->messageManager->addException($e, __("We couldn't remove the messages because of an error."));
  }
  }
  $this->getResponse()->setRedirect($this->_redirect->getRedirectUrl($this->getUrl('*')));

app/code/Magento/AdminNotification/etc/adminhtml/menu.xml

@@ -27,6 +27,6 @@
 -->
 <config>
  <menu>
- <add id="Magento_AdminNotification::system_adminnotification" title="Notifications" module="Magento_AdminNotification" sortOrder="10" parent="Magento_Adminhtml::system_other_settings" action="adminhtml/notification" resource="Magento_AdminNotification::adminnotification"/>
+ <add id="Magento_AdminNotification::system_adminnotification" title="Notifications" module="Magento_AdminNotification" sortOrder="10" parent="Magento_Backend::system_other_settings" action="adminhtml/notification" resource="Magento_AdminNotification::adminnotification"/>
  </menu>
 </config>

app/code/Magento/AdminNotification/etc/adminhtml/routes.xml

@@ -26,7 +26,7 @@
 <config>
  <router id="admin">
  <route id="adminhtml">
- <module name="Magento_AdminNotification_Adminhtml" before="Magento_Adminhtml" />
+ <module name="Magento_AdminNotification" before="Magento_Adminhtml" />
  </route>
  </router>
-</config>
+</config>

app/code/Magento/AdminNotification/etc/module.xml

@@ -27,11 +27,9 @@
  <module name="Magento_AdminNotification" version="2.0.0.0" active="true">
  <sequence>
  <module name="Magento_Core"/>
- <module name="Magento_Adminhtml"/>
  </sequence>
  <depends>
  <module name="Magento_Core"/>
- <module name="Magento_Adminhtml"/>
  <module name="Magento_Backend"/>
  <module name="Magento_Theme"/>
  </depends>