Skip to content

Commit 1e3c166

Browse files
committed
2.0.0.0-dev71
* Fixed bugs: * Fixed an issue with displaying product on the frontend when the product flat indexer is enabled * Fixed an issue with applying catalog price rules on the category level * Fixed an issue where the essential cookies like CUSTOMER, CART, and so on were not created in Google Chrome * Fixed an issue with placing orders by customers assigned to a VAT group * Fixed an issue with incorrect error message during registration, and inability for a shopper to ask for resending a confirmation email * Fixed an issue where the Catalog module resource Setup Upgrade logic was broken * Modularity improvements: * Moved abstract Core models and related logic to the Magento/Model library * Moved the abstract DB logic and Core resource helpers to the Magento/DB library * Eliminated the Core\Model\App class * Moved the Magento Flag functionality to the library * Resolved dependency of the Catalog and related modules on the Review module * Moved indexers related logic from the Core module to the Indexer module * Moved the Inline translation and user intended translate functionality from the Core module to a separate Translation module * Framework Improvements: * Covered Magento library components with unit tests: * Magento\Config * Magento\Convert * Magento\Controller * Magento\Data\Collection\Db * Magento\Mview * Magento\Url and Magento/Url.php * Covered Magento application components with unit tests: * Magento\Checkout\Model\Config * Magento\Checkout\Model\Observer * Magento\Checkout\Model\Type * Magento\Sales\Model\Config * Renamed LauncherInterface to AppInterface * Improvements in code coverage calculation: * Updated the whitelist filter with library code for integration tests code coverage calculation * GitHub requests: * [magento#512] (magento#512) -- Theme Thumbnails not showing * [magento#520] (magento#502) -- Corrected Search Engine Optimization i18n * [magento#519] (magento#519) -- New Theme Activation * Customer Service usage: * Refactored the Log module to use Customer Service * Refactored the RSS module to use Customer Service * Refactored the Review module to use Customer Service * Refactored the Catalog module to use Customer service layer * Refactored the Downloadable module to use Customer service layer
1 parent 9c2b633 commit 1e3c166

File tree

1,532 files changed

+14644
-13611
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,532 files changed

+14644
-13611
lines changed

CHANGELOG.md

+44
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,47 @@
1+
2.0.0.0-dev71
2+
=============
3+
* Fixed bugs:
4+
* Fixed an issue with displaying product on the frontend when the product flat indexer is enabled
5+
* Fixed an issue with applying catalog price rules on the category level
6+
* Fixed an issue where the essential cookies like CUSTOMER, CART, and so on were not created in Google Chrome
7+
* Fixed an issue with placing orders by customers assigned to a VAT group
8+
* Fixed an issue with incorrect error message during registration, and inability for a shopper to ask for resending a confirmation email
9+
* Fixed an issue where the Catalog module resource Setup Upgrade logic was broken
10+
* Modularity improvements:
11+
* Moved abstract Core models and related logic to the Magento/Model library
12+
* Moved the abstract DB logic and Core resource helpers to the Magento/DB library
13+
* Eliminated the Core\Model\App class
14+
* Moved the Magento Flag functionality to the library
15+
* Resolved dependency of the Catalog and related modules on the Review module
16+
* Moved indexers related logic from the Core module to the Indexer module
17+
* Moved the Inline translation and user intended translate functionality from the Core module to a separate Translation module
18+
* Framework Improvements:
19+
* Covered Magento library components with unit tests:
20+
* Magento\Config
21+
* Magento\Convert
22+
* Magento\Controller
23+
* Magento\Data\Collection\Db
24+
* Magento\Mview
25+
* Magento\Url and Magento/Url.php
26+
* Covered Magento application components with unit tests:
27+
* Magento\Checkout\Model\Config
28+
* Magento\Checkout\Model\Observer
29+
* Magento\Checkout\Model\Type
30+
* Magento\Sales\Model\Config
31+
* Renamed LauncherInterface to AppInterface
32+
* Improvements in code coverage calculation:
33+
* Updated the whitelist filter with library code for integration tests code coverage calculation
34+
* GitHub requests:
35+
* [#512] (https://github.com/magento/magento2/issues/512) -- Theme Thumbnails not showing
36+
* [#520] (https://github.com/magento/magento2/pull/502) -- Corrected Search Engine Optimization i18n
37+
* [#519] (https://github.com/magento/magento2/issues/519) -- New Theme Activation
38+
* Customer Service usage:
39+
* Refactored the Log module to use Customer Service
40+
* Refactored the RSS module to use Customer Service
41+
* Refactored the Review module to use Customer Service
42+
* Refactored the Catalog module to use Customer service layer
43+
* Refactored the Downloadable module to use Customer service layer
44+
145
2.0.0.0-dev70
246
=============
347
* Fixed bugs:

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

+4-4
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ public function markAsReadAction()
6060
$notificationId
6161
);
6262
$this->messageManager->addSuccess(__('The message has been marked as Read.'));
63-
} catch (\Magento\Core\Exception $e) {
63+
} catch (\Magento\Model\Exception $e) {
6464
$this->messageManager->addError($e->getMessage());
6565
} catch (\Exception $e) {
6666
$this->messageManager->addException(
@@ -121,7 +121,7 @@ public function massMarkAsReadAction()
121121
$this->messageManager->addSuccess(
122122
__('A total of %1 record(s) have been marked as Read.', count($ids))
123123
);
124-
} catch (\Magento\Core\Exception $e) {
124+
} catch (\Magento\Model\Exception $e) {
125125
$this->messageManager->addError($e->getMessage());
126126
} catch (\Exception $e) {
127127
$this->messageManager->addException(
@@ -149,7 +149,7 @@ public function removeAction()
149149
try {
150150
$model->setIsRemove(1)->save();
151151
$this->messageManager->addSuccess(__('The message has been removed.'));
152-
} catch (\Magento\Core\Exception $e) {
152+
} catch (\Magento\Model\Exception $e) {
153153
$this->messageManager->addError($e->getMessage());
154154
} catch (\Exception $e) {
155155
$this->messageManager->addException($e, __("We couldn't remove the messages because of an error."));
@@ -178,7 +178,7 @@ public function massRemoveAction()
178178
}
179179
}
180180
$this->messageManager->addSuccess(__('Total of %1 record(s) have been removed.', count($ids)));
181-
} catch (\Magento\Core\Exception $e) {
181+
} catch (\Magento\Model\Exception $e) {
182182
$this->messageManager->addError($e->getMessage());
183183
} catch (\Exception $e) {
184184
$this->messageManager->addException($e, __("We couldn't remove the messages because of an error."));

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
* @package Magento_AdminNotification
3333
* @author Magento Core Team <core@magentocommerce.com>
3434
*/
35-
class Feed extends \Magento\Core\Model\AbstractModel
35+
class Feed extends \Magento\Model\AbstractModel
3636
{
3737
const XML_USE_HTTPS_PATH = 'system/adminnotification/use_https';
3838

@@ -64,7 +64,7 @@ class Feed extends \Magento\Core\Model\AbstractModel
6464
* @param \Magento\Registry $registry
6565
* @param \Magento\Backend\App\ConfigInterface $backendConfig
6666
* @param \Magento\AdminNotification\Model\InboxFactory $inboxFactory
67-
* @param \Magento\Core\Model\Resource\AbstractResource $resource
67+
* @param \Magento\Model\Resource\AbstractResource $resource
6868
* @param \Magento\Data\Collection\Db $resourceCollection
6969
* @param array $data
7070
*/
@@ -73,7 +73,7 @@ public function __construct(
7373
\Magento\Registry $registry,
7474
\Magento\Backend\App\ConfigInterface $backendConfig,
7575
\Magento\AdminNotification\Model\InboxFactory $inboxFactory,
76-
\Magento\Core\Model\Resource\AbstractResource $resource = null,
76+
\Magento\Model\Resource\AbstractResource $resource = null,
7777
\Magento\Data\Collection\Db $resourceCollection = null,
7878
array $data = array()
7979
) {

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
* @package Magento_AdminNotification
5050
* @author Magento Core Team <core@magentocommerce.com>
5151
*/
52-
class Inbox extends \Magento\Core\Model\AbstractModel
52+
class Inbox extends \Magento\Model\AbstractModel
5353
{
5454
const SEVERITY_CRITICAL = 1;
5555

@@ -133,13 +133,13 @@ public function parse(array $data)
133133
* @param string|string[] $description
134134
* @param string $url
135135
* @param bool $isInternal
136-
* @throws \Magento\Core\Exception
136+
* @throws \Magento\Model\Exception
137137
* @return $this
138138
*/
139139
public function add($severity, $title, $description, $url = '', $isInternal = true)
140140
{
141141
if (!$this->getSeverities($severity)) {
142-
throw new \Magento\Core\Exception(__('Wrong message type'));
142+
throw new \Magento\Model\Exception(__('Wrong message type'));
143143
}
144144
if (is_array($description)) {
145145
$description = '<ul><li>' . implode('</li><li>', $description) . '</li></ul>';

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -52,14 +52,14 @@ public function __construct(\Magento\AdminNotification\Model\InboxFactory $notif
5252
*
5353
* @param int $notificationId
5454
* @return void
55-
* @throws \Magento\Core\Exception
55+
* @throws \Magento\Model\Exception
5656
*/
5757
public function markAsRead($notificationId)
5858
{
5959
$notification = $this->_notificationFactory->create();
6060
$notification->load($notificationId);
6161
if (!$notification->getId()) {
62-
throw new \Magento\Core\Exception('Wrong notification ID specified.');
62+
throw new \Magento\Model\Exception('Wrong notification ID specified.');
6363
}
6464
$notification->setIsRead(1);
6565
$notification->save();

app/code/Magento/AdminNotification/Model/Resource/Grid/Collection.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ class Collection extends \Magento\AdminNotification\Model\Resource\Inbox\Collect
3838
/**
3939
* Add remove filter
4040
*
41-
* @return \Magento\AdminNotification\Model\Resource\Grid\Collection|\Magento\Core\Model\Resource\Db\Collection\AbstractCollection
41+
* @return \Magento\AdminNotification\Model\Resource\Grid\Collection|\Magento\Model\Resource\Db\Collection\AbstractCollection
4242
*/
4343
protected function _initSelect()
4444
{

app/code/Magento/AdminNotification/Model/Resource/Inbox.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
* @package Magento_AdminNotification
3333
* @author Magento Core Team <core@magentocommerce.com>
3434
*/
35-
class Inbox extends \Magento\Core\Model\Resource\Db\AbstractDb
35+
class Inbox extends \Magento\Model\Resource\Db\AbstractDb
3636
{
3737
/**
3838
* AdminNotification Resource initialization

app/code/Magento/AdminNotification/Model/Resource/Inbox/Collection.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
* @package Magento_AdminNotification
3333
* @author Magento Core Team <core@magentocommerce.com>
3434
*/
35-
class Collection extends \Magento\Core\Model\Resource\Db\Collection\AbstractCollection
35+
class Collection extends \Magento\Model\Resource\Db\Collection\AbstractCollection
3636
{
3737
/**
3838
* Resource collection initialization

app/code/Magento/AdminNotification/Model/Resource/Inbox/Collection/Critical.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
*/
2626
namespace Magento\AdminNotification\Model\Resource\Inbox\Collection;
2727

28-
class Critical extends \Magento\Core\Model\Resource\Db\Collection\AbstractCollection
28+
class Critical extends \Magento\Model\Resource\Db\Collection\AbstractCollection
2929
{
3030
/**
3131
* Resource collection initialization

app/code/Magento/AdminNotification/Model/Resource/System/Message.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
*/
2424
namespace Magento\AdminNotification\Model\Resource\System;
2525

26-
class Message extends \Magento\Core\Model\Resource\Db\AbstractDb
26+
class Message extends \Magento\Model\Resource\Db\AbstractDb
2727
{
2828
/**
2929
* Flag that notifies whether Primary key of table is auto-incremeted

app/code/Magento/AdminNotification/Model/Resource/System/Message/Collection.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
*/
2424
namespace Magento\AdminNotification\Model\Resource\System\Message;
2525

26-
class Collection extends \Magento\Core\Model\Resource\Db\Collection\AbstractCollection
26+
class Collection extends \Magento\Model\Resource\Db\Collection\AbstractCollection
2727
{
2828
/**
2929
* System message list
@@ -46,7 +46,7 @@ class Collection extends \Magento\Core\Model\Resource\Db\Collection\AbstractColl
4646
* @param \Magento\Event\ManagerInterface $eventManager
4747
* @param \Magento\AdminNotification\Model\System\MessageList $messageList
4848
* @param mixed $connection
49-
* @param \Magento\Core\Model\Resource\Db\AbstractDb $resource
49+
* @param \Magento\Model\Resource\Db\AbstractDb $resource
5050
*/
5151
public function __construct(
5252
\Magento\Core\Model\EntityFactory $entityFactory,
@@ -55,7 +55,7 @@ public function __construct(
5555
\Magento\Event\ManagerInterface $eventManager,
5656
\Magento\AdminNotification\Model\System\MessageList $messageList,
5757
$connection = null,
58-
\Magento\Core\Model\Resource\Db\AbstractDb $resource = null
58+
\Magento\Model\Resource\Db\AbstractDb $resource = null
5959
) {
6060
$this->_messageList = $messageList;
6161
parent::__construct($entityFactory, $logger, $fetchStrategy, $eventManager, $connection, $resource);

app/code/Magento/AdminNotification/Model/Resource/System/Message/Collection/Synchronized.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ class Synchronized extends \Magento\AdminNotification\Model\Resource\System\Mess
3535
/**
3636
* Store new messages in database and remove outdated messages
3737
*
38-
* @return $this|\Magento\Core\Model\Resource\Db\AbstractDb
38+
* @return $this|\Magento\Model\Resource\Db\AbstractDb
3939
*/
4040
public function _afterLoad()
4141
{

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

+5-5
Original file line numberDiff line numberDiff line change
@@ -44,12 +44,12 @@ class Survey
4444
protected $_flagCode = 'admin_notification_survey';
4545

4646
/**
47-
* @var \Magento\Core\Model\Flag
47+
* @var \Magento\Flag
4848
*/
4949
protected $_flagModel = null;
5050

5151
/**
52-
* @var \Magento\Core\Model\FlagFactory
52+
* @var \Magento\FlagFactory
5353
*/
5454
protected $_flagFactory;
5555

@@ -59,10 +59,10 @@ class Survey
5959
protected $_request;
6060

6161
/**
62-
* @param \Magento\Core\Model\FlagFactory $flagFactory
62+
* @param \Magento\FlagFactory $flagFactory
6363
* @param \Magento\App\RequestInterface $request
6464
*/
65-
public function __construct(\Magento\Core\Model\FlagFactory $flagFactory, \Magento\App\RequestInterface $request)
65+
public function __construct(\Magento\FlagFactory $flagFactory, \Magento\App\RequestInterface $request)
6666
{
6767
$this->_request = $request;
6868
$this->_flagFactory = $flagFactory;
@@ -100,7 +100,7 @@ public function getSurveyUrl()
100100
/**
101101
* Return core flag model
102102
*
103-
* @return \Magento\Core\Model\Flag
103+
* @return \Magento\Flag
104104
*/
105105
protected function _getFlagModel()
106106
{

app/code/Magento/AdminNotification/Model/System/Message.php

+1-2
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,7 @@
2323
*/
2424
namespace Magento\AdminNotification\Model\System;
2525

26-
class Message extends \Magento\Core\Model\AbstractModel implements
27-
\Magento\AdminNotification\Model\System\MessageInterface
26+
class Message extends \Magento\Model\AbstractModel implements \Magento\AdminNotification\Model\System\MessageInterface
2827
{
2928
/**
3029
* @return void

app/code/Magento/Authorizenet/Controller/Adminhtml/Authorizenet/Directpost/Payment.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ public function placeAction()
150150

151151
$result['success'] = 1;
152152
$isError = false;
153-
} catch (\Magento\Core\Exception $e) {
153+
} catch (\Magento\Model\Exception $e) {
154154
$message = $e->getMessage();
155155
if (!empty($message)) {
156156
$this->messageManager->addError($message);

app/code/Magento/Authorizenet/Controller/Adminhtml/Authorizenet/Payment.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ public function cancelAction()
7777
)->getPaymentMethodsHtml(
7878
$this->_view
7979
);
80-
} catch (\Magento\Core\Exception $e) {
80+
} catch (\Magento\Model\Exception $e) {
8181
$this->_objectManager->get('Magento\Logger')->logException($e);
8282
$result['error_message'] = $e->getMessage();
8383
} catch (\Exception $e) {

app/code/Magento/Authorizenet/Controller/Authorizenet/Payment.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ public function cancelAction()
6767
)->getPaymentMethodsHtml(
6868
$this->_view
6969
);
70-
} catch (\Magento\Core\Exception $e) {
70+
} catch (\Magento\Model\Exception $e) {
7171
$this->_objectManager->get('Magento\Logger')->logException($e);
7272
$result['error_message'] = $e->getMessage();
7373
} catch (\Exception $e) {

app/code/Magento/Authorizenet/Controller/Directpost/Payment.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ protected function _responseAction(\Magento\Authorizenet\Helper\HelperInterface
114114
}
115115
$paymentMethod->process($data);
116116
$result['success'] = 1;
117-
} catch (\Magento\Core\Exception $e) {
117+
} catch (\Magento\Model\Exception $e) {
118118
$this->_objectManager->get('Magento\Logger')->logException($e);
119119
$result['success'] = 0;
120120
$result['error_msg'] = $e->getMessage();

0 commit comments

Comments
 (0)