Skip to content

Commit d5d8091

Browse files
committed
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
1 parent 4ca7da2 commit d5d8091

File tree

1,457 files changed

+37288
-21230
lines changed

Some content is hidden

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

1,457 files changed

+37288
-21230
lines changed

CHANGELOG.md

Lines changed: 26 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,28 @@
1+
2.0.0.0-dev66
2+
=============
3+
* GitHub requests:
4+
* [#134] (https://github.com/magento/magento2/pull/134) Fixed a typo in "Vorarlberg" region of Austria (was Voralberg)
5+
* Fixed bugs:
6+
* Fixed an issue with the "Add to Cart" button on the MAP popup of compound products
7+
* Fixed an issue where the "Add Address" button for Customer in Admin was broken
8+
* Fixed an issue where predefined data are not loaded for a newsletter when it is added to a queue
9+
* Indexer implementation:
10+
* Implemented a new optimized Catalog Category Product Indexer
11+
* Implemented a new optimized Catalog Category Flat Indexer
12+
* Implemented a new optimized Catalog Product Flat Indexer
13+
* Modularity improvements:
14+
* Moved all Configurable Product functionality to a newly created ConfigurableProduct module
15+
* Moved the Shortcut Buttons abstraction from PayPal to Catalog
16+
* Moved the Recurring profile functionality to a separate module
17+
* Moved the Billing Agreements functionality to the PayPal module
18+
* Finalized the work on resolving dependencies between the Multishipping module, and all other modules. Module can be removed without any impact on the system
19+
* Customer Service usage:
20+
* Updated Customer Group Grid to use Customer Service for data retrieving and filtering
21+
* Updated CustomerMetadataService::getAttributeMetadata to throw an exception if invalid code is provided
22+
* Unified the format of specifying arguments for class constructors in DI and in Layout configuration:
23+
* A common xsd schema is being used for defining simple types. Layout and DI customize common types with their specific ones
24+
* Argument processing is unified, and moved to library
25+
126
2.0.0.0-dev65
227
=============
328
* Fixed bugs:
@@ -21,7 +46,7 @@
2146
* Improvements in code coverage calculation:
2247
* Added code coverage calculation in the clover xml format for unit tests
2348
* GitHub requests:
24-
* [#377] (https://github.com/magento/magento2/issues/377) Remove and avoid javascript eval() calls
49+
* [#377] (https://github.com/magento/magento2/issues/377) Remove and avoid javascript eval() calls
2550
* [#319] (https://github.com/magento/magento2/issues/319) No message was displayed when product added to shopping cart.
2651
* [#367] (https://github.com/magento/magento2/issues/367) Improve the error message from the contact form
2752
* [#469] (https://github.com/magento/magento2/issues/469) Can't change prices on different websites for custom options

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,9 @@
2929

3030
class Inbox extends \Magento\Backend\Block\Widget\Grid\Container
3131
{
32+
/**
33+
* @return void
34+
*/
3235
protected function _construct()
3336
{
3437
$this->_controller = 'adminhtml';
@@ -37,6 +40,9 @@ protected function _construct()
3740
parent::_construct();
3841
}
3942

43+
/**
44+
* @return $this
45+
*/
4046
protected function _prepareLayout()
4147
{
4248
parent::_prepareLayout();

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,8 @@ public function __construct(
5555
}
5656

5757
/**
58+
* Prepare html output
59+
*
5860
* @return string
5961
*/
6062
protected function _toHtml()

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

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@
2323
*/
2424
namespace Magento\AdminNotification\Block\System\Messages;
2525

26+
use Magento\AdminNotification\Model\System\MessageInterface;
27+
2628
class UnreadMessagePopup extends \Magento\Backend\Block\Template
2729
{
2830
/**
@@ -31,8 +33,8 @@ class UnreadMessagePopup extends \Magento\Backend\Block\Template
3133
* @var array
3234
*/
3335
protected $_itemClasses = array(
34-
\Magento\AdminNotification\Model\System\MessageInterface::SEVERITY_CRITICAL => 'error',
35-
\Magento\AdminNotification\Model\System\MessageInterface::SEVERITY_MAJOR => 'warning'
36+
MessageInterface::SEVERITY_CRITICAL => 'error',
37+
MessageInterface::SEVERITY_MAJOR => 'warning'
3638
);
3739

3840
/**
@@ -72,7 +74,7 @@ protected function _toHtml()
7274
/**
7375
* Retrieve list of unread messages
7476
*
75-
* @return mixed
77+
* @return MessageInterface[]
7678
*/
7779
public function getUnreadMessages()
7880
{
@@ -97,10 +99,10 @@ public function getPopupTitle()
9799
/**
98100
* Retrieve item class by severity
99101
*
100-
* @param \Magento\AdminNotification\Model\System\MessageInterface $message
101-
* @return mixed
102+
* @param MessageInterface $message
103+
* @return string
102104
*/
103-
public function getItemClass(\Magento\AdminNotification\Model\System\MessageInterface $message)
105+
public function getItemClass(MessageInterface $message)
104106
{
105107
return $this->_itemClasses[$message->getSeverity()];
106108
}

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
2424
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
2525
*/
26+
namespace Magento\AdminNotification\Block;
2627

2728
/**
2829
* Toolbar entry that shows latest notifications
@@ -31,8 +32,6 @@
3132
* @package Magento_AdminNotification
3233
* @author Magento Core Team <[email protected]>
3334
*/
34-
namespace Magento\AdminNotification\Block;
35-
3635
class ToolbarEntry extends \Magento\Backend\Block\Template
3736
{
3837
/**

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

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,9 @@
2929

3030
class Notification extends \Magento\Backend\App\AbstractAction
3131
{
32+
/**
33+
* @return void
34+
*/
3235
public function indexAction()
3336
{
3437
$this->_title->add(__('Notifications'));
@@ -42,6 +45,9 @@ public function indexAction()
4245
$this->_view->renderLayout();
4346
}
4447

48+
/**
49+
* @return void
50+
*/
4551
public function markAsReadAction()
4652
{
4753
$notificationId = (int)$this->getRequest()->getParam('id');
@@ -67,6 +73,8 @@ public function markAsReadAction()
6773

6874
/**
6975
* Mark notification as read (AJAX action)
76+
*
77+
* @return void
7078
*/
7179
public function ajaxMarkAsReadAction()
7280
{
@@ -87,6 +95,9 @@ public function ajaxMarkAsReadAction()
8795
);
8896
}
8997

98+
/**
99+
* @return void
100+
*/
90101
public function massMarkAsReadAction()
91102
{
92103
$ids = $this->getRequest()->getParam('notification');
@@ -115,6 +126,9 @@ public function massMarkAsReadAction()
115126
$this->_redirect('adminhtml/*/');
116127
}
117128

129+
/**
130+
* @return void
131+
*/
118132
public function removeAction()
119133
{
120134
if ($id = $this->getRequest()->getParam('id')) {
@@ -123,7 +137,7 @@ public function removeAction()
123137

124138
if (!$model->getId()) {
125139
$this->_redirect('adminhtml/*/');
126-
return ;
140+
return;
127141
}
128142

129143
try {
@@ -147,6 +161,9 @@ public function removeAction()
147161
$this->_redirect('adminhtml/*/');
148162
}
149163

164+
/**
165+
* @return void
166+
*/
150167
public function massRemoveAction()
151168
{
152169
$ids = $this->getRequest()->getParam('notification');
@@ -172,6 +189,9 @@ public function massRemoveAction()
172189
$this->getResponse()->setRedirect($this->_redirect->getRedirectUrl($this->getUrl('*')));
173190
}
174191

192+
/**
193+
* @return bool
194+
*/
175195
protected function _isAllowed()
176196
{
177197
switch ($this->getRequest()->getActionName()) {

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

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
2424
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
2525
*/
26-
26+
namespace Magento\AdminNotification\Controller\Adminhtml;
2727

2828
/**
2929
* Adminhtml Survey Action
@@ -32,13 +32,12 @@
3232
* @package Magento_Adminhtml
3333
* @author Magento Core Team <[email protected]>
3434
*/
35-
namespace Magento\AdminNotification\Controller\Adminhtml;
36-
3735
class Survey extends \Magento\Backend\App\Action
3836
{
3937
/**
4038
* Index Action
4139
*
40+
* @return void
4241
*/
4342
public function indexAction()
4443
{
@@ -51,7 +50,7 @@ public function indexAction()
5150
/**
5251
* Check if user has enough privileges
5352
*
54-
* @return boolean
53+
* @return bool
5554
*/
5655
protected function _isAllowed()
5756
{

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,13 @@
2121
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
2222
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
2323
*/
24-
2524
namespace Magento\AdminNotification\Controller\Adminhtml\System;
2625

2726
class Message extends \Magento\Backend\App\AbstractAction
2827
{
28+
/**
29+
* @return void
30+
*/
2931
public function listAction()
3032
{
3133
$severity = $this->getRequest()->getParam('severity');

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

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
2424
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
2525
*/
26-
26+
namespace Magento\AdminNotification\Helper;
2727

2828
/**
2929
* AdminNotification Data helper
@@ -32,8 +32,6 @@
3232
* @package Magento_AdminNotification
3333
* @author Magento Core Team <[email protected]>
3434
*/
35-
namespace Magento\AdminNotification\Helper;
36-
3735
class Data extends \Magento\App\Helper\AbstractHelper
3836
{
3937
const XML_PATH_POPUP_URL = 'system/adminnotification/popup_url';
@@ -60,7 +58,7 @@ class Data extends \Magento\App\Helper\AbstractHelper
6058
protected $_latestNotice;
6159

6260
/**
63-
* count of unread notes by type
61+
* Count of unread notes by type
6462
*
6563
* @var array
6664
*/
@@ -76,6 +74,11 @@ class Data extends \Magento\App\Helper\AbstractHelper
7674
*/
7775
protected $_inboxFactory;
7876

77+
/**
78+
* @param \Magento\App\Helper\Context $context
79+
* @param \Magento\Core\Model\Store\Config $coreStoreConfig
80+
* @param \Magento\AdminNotification\Model\InboxFactory $inboxFactory
81+
*/
7982
public function __construct(
8083
\Magento\App\Helper\Context $context,
8184
\Magento\Core\Model\Store\Config $coreStoreConfig,

app/code/Magento/AdminNotification/Model/Config/Source/Frequency.php

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
2424
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
2525
*/
26-
26+
namespace Magento\AdminNotification\Model\Config\Source;
2727

2828
/**
2929
* AdminNotification update frequency source
@@ -32,10 +32,11 @@
3232
* @package Magento_AdminNotification
3333
* @author Magento Core Team <[email protected]>
3434
*/
35-
namespace Magento\AdminNotification\Model\Config\Source;
36-
3735
class Frequency implements \Magento\Core\Model\Option\ArrayInterface
3836
{
37+
/**
38+
* @return array
39+
*/
3940
public function toOptionArray()
4041
{
4142
return array(

0 commit comments

Comments
 (0)