Permalink
Browse files

2.0.0.0-dev66

* GitHub requests:
  * [#134] (#134) Fixed a typo in "Vorarlberg" region of Austria (was Voralberg)
* Fixed bugs:
  * Fixed an issue with the "Add to Cart" button on the MAP popup of compound products
  * Fixed an issue where the "Add Address" button for Customer in Admin was broken
  * Fixed an issue where predefined data are not loaded for a newsletter when it is added to a queue
* Indexer implementation:
  * Implemented a new optimized Catalog Category Product Indexer
  * Implemented a new optimized Catalog Category Flat Indexer
  * Implemented a new optimized Catalog Product Flat Indexer
* Modularity improvements:
  * Moved all Configurable Product functionality to a newly created ConfigurableProduct module
  * Moved the Shortcut Buttons abstraction from PayPal to Catalog
  * Moved the Recurring profile functionality to a separate module
  * Moved the Billing Agreements functionality to the PayPal module
  * Finalized the work on resolving dependencies between the Multishipping module, and all other modules. Module can be removed without any impact on the system
* Customer Service usage:
 * Updated Customer Group Grid to use Customer Service for data retrieving and filtering
 * Updated CustomerMetadataService::getAttributeMetadata to throw an exception if invalid code is provided
* Unified the format of specifying arguments for class constructors in DI and in Layout configuration:
  * A common xsd schema is being used for defining simple types. Layout and DI customize common types with their specific ones
  * Argument processing is unified, and moved to library
  • Loading branch information...
magento-team committed Feb 21, 2014
1 parent 4ca7da2 commit d5d8091f8d744418f8723fd7c59f60909556b9f2
Showing 1,457 changed files with 37,288 additions and 21,230 deletions.
View
@@ -1,3 +1,28 @@
+2.0.0.0-dev66
+=============
+* GitHub requests:
+ * [#134] (https://github.com/magento/magento2/pull/134) Fixed a typo in "Vorarlberg" region of Austria (was Voralberg)
+* Fixed bugs:
+ * Fixed an issue with the "Add to Cart" button on the MAP popup of compound products
+ * Fixed an issue where the "Add Address" button for Customer in Admin was broken
+ * Fixed an issue where predefined data are not loaded for a newsletter when it is added to a queue
+* Indexer implementation:
+ * Implemented a new optimized Catalog Category Product Indexer
+ * Implemented a new optimized Catalog Category Flat Indexer
+ * Implemented a new optimized Catalog Product Flat Indexer
+* Modularity improvements:
+ * Moved all Configurable Product functionality to a newly created ConfigurableProduct module
+ * Moved the Shortcut Buttons abstraction from PayPal to Catalog
+ * Moved the Recurring profile functionality to a separate module
+ * Moved the Billing Agreements functionality to the PayPal module
+ * Finalized the work on resolving dependencies between the Multishipping module, and all other modules. Module can be removed without any impact on the system
+* Customer Service usage:
+ * Updated Customer Group Grid to use Customer Service for data retrieving and filtering
+ * Updated CustomerMetadataService::getAttributeMetadata to throw an exception if invalid code is provided
+* Unified the format of specifying arguments for class constructors in DI and in Layout configuration:
+ * A common xsd schema is being used for defining simple types. Layout and DI customize common types with their specific ones
+ * Argument processing is unified, and moved to library
+
2.0.0.0-dev65
=============
* Fixed bugs:
@@ -21,7 +46,7 @@
* Improvements in code coverage calculation:
* Added code coverage calculation in the clover xml format for unit tests
* GitHub requests:
- * [#377] (https://github.com/magento/magento2/issues/377) Remove and avoid javascript eval() calls
+ * [#377] (https://github.com/magento/magento2/issues/377) Remove and avoid javascript eval() calls
* [#319] (https://github.com/magento/magento2/issues/319) No message was displayed when product added to shopping cart.
* [#367] (https://github.com/magento/magento2/issues/367) Improve the error message from the contact form
* [#469] (https://github.com/magento/magento2/issues/469) Can't change prices on different websites for custom options
@@ -29,6 +29,9 @@
class Inbox extends \Magento\Backend\Block\Widget\Grid\Container
{
+ /**
+ * @return void
+ */
protected function _construct()
{
$this->_controller = 'adminhtml';
@@ -37,6 +40,9 @@ protected function _construct()
parent::_construct();
}
+ /**
+ * @return $this
+ */
protected function _prepareLayout()
{
parent::_prepareLayout();
@@ -55,6 +55,8 @@ public function __construct(
}
/**
+ * Prepare html output
+ *
* @return string
*/
protected function _toHtml()
@@ -23,6 +23,8 @@
*/
namespace Magento\AdminNotification\Block\System\Messages;
+use Magento\AdminNotification\Model\System\MessageInterface;
+
class UnreadMessagePopup extends \Magento\Backend\Block\Template
{
/**
@@ -31,8 +33,8 @@ class UnreadMessagePopup extends \Magento\Backend\Block\Template
* @var array
*/
protected $_itemClasses = array(
- \Magento\AdminNotification\Model\System\MessageInterface::SEVERITY_CRITICAL => 'error',
- \Magento\AdminNotification\Model\System\MessageInterface::SEVERITY_MAJOR => 'warning'
+ MessageInterface::SEVERITY_CRITICAL => 'error',
+ MessageInterface::SEVERITY_MAJOR => 'warning'
);
/**
@@ -72,7 +74,7 @@ protected function _toHtml()
/**
* Retrieve list of unread messages
*
- * @return mixed
+ * @return MessageInterface[]
*/
public function getUnreadMessages()
{
@@ -97,10 +99,10 @@ public function getPopupTitle()
/**
* Retrieve item class by severity
*
- * @param \Magento\AdminNotification\Model\System\MessageInterface $message
- * @return mixed
+ * @param MessageInterface $message
+ * @return string
*/
- public function getItemClass(\Magento\AdminNotification\Model\System\MessageInterface $message)
+ public function getItemClass(MessageInterface $message)
{
return $this->_itemClasses[$message->getSeverity()];
}
@@ -23,6 +23,7 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
+namespace Magento\AdminNotification\Block;
/**
* Toolbar entry that shows latest notifications
@@ -31,8 +32,6 @@
* @package Magento_AdminNotification
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\AdminNotification\Block;
-
class ToolbarEntry extends \Magento\Backend\Block\Template
{
/**
@@ -29,6 +29,9 @@
class Notification extends \Magento\Backend\App\AbstractAction
{
+ /**
+ * @return void
+ */
public function indexAction()
{
$this->_title->add(__('Notifications'));
@@ -42,6 +45,9 @@ public function indexAction()
$this->_view->renderLayout();
}
+ /**
+ * @return void
+ */
public function markAsReadAction()
{
$notificationId = (int)$this->getRequest()->getParam('id');
@@ -67,6 +73,8 @@ public function markAsReadAction()
/**
* Mark notification as read (AJAX action)
+ *
+ * @return void
*/
public function ajaxMarkAsReadAction()
{
@@ -87,6 +95,9 @@ public function ajaxMarkAsReadAction()
);
}
+ /**
+ * @return void
+ */
public function massMarkAsReadAction()
{
$ids = $this->getRequest()->getParam('notification');
@@ -115,6 +126,9 @@ public function massMarkAsReadAction()
$this->_redirect('adminhtml/*/');
}
+ /**
+ * @return void
+ */
public function removeAction()
{
if ($id = $this->getRequest()->getParam('id')) {
@@ -123,7 +137,7 @@ public function removeAction()
if (!$model->getId()) {
$this->_redirect('adminhtml/*/');
- return ;
+ return;
}
try {
@@ -147,6 +161,9 @@ public function removeAction()
$this->_redirect('adminhtml/*/');
}
+ /**
+ * @return void
+ */
public function massRemoveAction()
{
$ids = $this->getRequest()->getParam('notification');
@@ -172,6 +189,9 @@ public function massRemoveAction()
$this->getResponse()->setRedirect($this->_redirect->getRedirectUrl($this->getUrl('*')));
}
+ /**
+ * @return bool
+ */
protected function _isAllowed()
{
switch ($this->getRequest()->getActionName()) {
@@ -23,7 +23,7 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
-
+namespace Magento\AdminNotification\Controller\Adminhtml;
/**
* Adminhtml Survey Action
@@ -32,13 +32,12 @@
* @package Magento_Adminhtml
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\AdminNotification\Controller\Adminhtml;
-
class Survey extends \Magento\Backend\App\Action
{
/**
* Index Action
*
+ * @return void
*/
public function indexAction()
{
@@ -51,7 +50,7 @@ public function indexAction()
/**
* Check if user has enough privileges
*
- * @return boolean
+ * @return bool
*/
protected function _isAllowed()
{
@@ -21,11 +21,13 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
-
namespace Magento\AdminNotification\Controller\Adminhtml\System;
class Message extends \Magento\Backend\App\AbstractAction
{
+ /**
+ * @return void
+ */
public function listAction()
{
$severity = $this->getRequest()->getParam('severity');
@@ -23,7 +23,7 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
-
+namespace Magento\AdminNotification\Helper;
/**
* AdminNotification Data helper
@@ -32,8 +32,6 @@
* @package Magento_AdminNotification
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\AdminNotification\Helper;
-
class Data extends \Magento\App\Helper\AbstractHelper
{
const XML_PATH_POPUP_URL = 'system/adminnotification/popup_url';
@@ -60,7 +58,7 @@ class Data extends \Magento\App\Helper\AbstractHelper
protected $_latestNotice;
/**
- * count of unread notes by type
+ * Count of unread notes by type
*
* @var array
*/
@@ -76,6 +74,11 @@ class Data extends \Magento\App\Helper\AbstractHelper
*/
protected $_inboxFactory;
+ /**
+ * @param \Magento\App\Helper\Context $context
+ * @param \Magento\Core\Model\Store\Config $coreStoreConfig
+ * @param \Magento\AdminNotification\Model\InboxFactory $inboxFactory
+ */
public function __construct(
\Magento\App\Helper\Context $context,
\Magento\Core\Model\Store\Config $coreStoreConfig,
@@ -23,7 +23,7 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
-
+namespace Magento\AdminNotification\Model\Config\Source;
/**
* AdminNotification update frequency source
@@ -32,10 +32,11 @@
* @package Magento_AdminNotification
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\AdminNotification\Model\Config\Source;
-
class Frequency implements \Magento\Core\Model\Option\ArrayInterface
{
+ /**
+ * @return array
+ */
public function toOptionArray()
{
return array(
@@ -23,7 +23,7 @@
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
-
+namespace Magento\AdminNotification\Model;
/**
* AdminNotification Feed model
@@ -32,8 +32,6 @@
* @package Magento_AdminNotification
* @author Magento Core Team <core@magentocommerce.com>
*/
-namespace Magento\AdminNotification\Model;
-
class Feed extends \Magento\Core\Model\AbstractModel
{
const XML_USE_HTTPS_PATH = 'system/adminnotification/use_https';
@@ -84,6 +82,7 @@ public function __construct(
/**
* Init model
*
+ * @return void
*/
protected function _construct()
{
@@ -107,7 +106,7 @@ public function getFeedUrl()
/**
* Check feed for modification
*
- * @return \Magento\AdminNotification\Model\Feed
+ * @return $this
*/
public function checkUpdate()
{
@@ -174,7 +173,7 @@ public function getLastUpdate()
/**
* Set last update time (now)
*
- * @return \Magento\AdminNotification\Model\Feed
+ * @return $this
*/
public function setLastUpdate()
{
@@ -212,6 +211,9 @@ public function getFeedData()
return $xml;
}
+ /**
+ * @return \SimpleXMLElement
+ */
public function getFeedXml()
{
try {
Oops, something went wrong.

0 comments on commit d5d8091

Please sign in to comment.