Skip to content

Commit

Permalink
2.0.0.0-dev71
Browse files Browse the repository at this point in the history
* 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:
  * [#512] (#512) -- Theme Thumbnails not showing
  * [#520] (#502) -- Corrected Search Engine Optimization i18n
  * [#519] (#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
  • Loading branch information
magento-team committed Mar 28, 2014
1 parent 9c2b633 commit 1e3c166
Show file tree
Hide file tree
Showing 1,532 changed files with 14,644 additions and 13,611 deletions.
44 changes: 44 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,47 @@
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:
* [#512] (https://github.com/magento/magento2/issues/512) -- Theme Thumbnails not showing
* [#520] (https://github.com/magento/magento2/pull/502) -- Corrected Search Engine Optimization i18n
* [#519] (https://github.com/magento/magento2/issues/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

2.0.0.0-dev70
=============
* Fixed bugs:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ public function markAsReadAction()
$notificationId
);
$this->messageManager->addSuccess(__('The message has been marked as Read.'));
} catch (\Magento\Core\Exception $e) {
} catch (\Magento\Model\Exception $e) {
$this->messageManager->addError($e->getMessage());
} catch (\Exception $e) {
$this->messageManager->addException(
Expand Down Expand Up @@ -121,7 +121,7 @@ public function massMarkAsReadAction()
$this->messageManager->addSuccess(
__('A total of %1 record(s) have been marked as Read.', count($ids))
);
} catch (\Magento\Core\Exception $e) {
} catch (\Magento\Model\Exception $e) {
$this->messageManager->addError($e->getMessage());
} catch (\Exception $e) {
$this->messageManager->addException(
Expand Down Expand Up @@ -149,7 +149,7 @@ public function removeAction()
try {
$model->setIsRemove(1)->save();
$this->messageManager->addSuccess(__('The message has been removed.'));
} catch (\Magento\Core\Exception $e) {
} catch (\Magento\Model\Exception $e) {
$this->messageManager->addError($e->getMessage());
} catch (\Exception $e) {
$this->messageManager->addException($e, __("We couldn't remove the messages because of an error."));
Expand Down Expand Up @@ -178,7 +178,7 @@ public function massRemoveAction()
}
}
$this->messageManager->addSuccess(__('Total of %1 record(s) have been removed.', count($ids)));
} catch (\Magento\Core\Exception $e) {
} catch (\Magento\Model\Exception $e) {
$this->messageManager->addError($e->getMessage());
} catch (\Exception $e) {
$this->messageManager->addException($e, __("We couldn't remove the messages because of an error."));
Expand Down
6 changes: 3 additions & 3 deletions app/code/Magento/AdminNotification/Model/Feed.php
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
* @package Magento_AdminNotification
* @author Magento Core Team <core@magentocommerce.com>
*/
class Feed extends \Magento\Core\Model\AbstractModel
class Feed extends \Magento\Model\AbstractModel
{
const XML_USE_HTTPS_PATH = 'system/adminnotification/use_https';

Expand Down Expand Up @@ -64,7 +64,7 @@ class Feed extends \Magento\Core\Model\AbstractModel
* @param \Magento\Registry $registry
* @param \Magento\Backend\App\ConfigInterface $backendConfig
* @param \Magento\AdminNotification\Model\InboxFactory $inboxFactory
* @param \Magento\Core\Model\Resource\AbstractResource $resource
* @param \Magento\Model\Resource\AbstractResource $resource
* @param \Magento\Data\Collection\Db $resourceCollection
* @param array $data
*/
Expand All @@ -73,7 +73,7 @@ public function __construct(
\Magento\Registry $registry,
\Magento\Backend\App\ConfigInterface $backendConfig,
\Magento\AdminNotification\Model\InboxFactory $inboxFactory,
\Magento\Core\Model\Resource\AbstractResource $resource = null,
\Magento\Model\Resource\AbstractResource $resource = null,
\Magento\Data\Collection\Db $resourceCollection = null,
array $data = array()
) {
Expand Down
6 changes: 3 additions & 3 deletions app/code/Magento/AdminNotification/Model/Inbox.php
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
* @package Magento_AdminNotification
* @author Magento Core Team <core@magentocommerce.com>
*/
class Inbox extends \Magento\Core\Model\AbstractModel
class Inbox extends \Magento\Model\AbstractModel
{
const SEVERITY_CRITICAL = 1;

Expand Down Expand Up @@ -133,13 +133,13 @@ public function parse(array $data)
* @param string|string[] $description
* @param string $url
* @param bool $isInternal
* @throws \Magento\Core\Exception
* @throws \Magento\Model\Exception
* @return $this
*/
public function add($severity, $title, $description, $url = '', $isInternal = true)
{
if (!$this->getSeverities($severity)) {
throw new \Magento\Core\Exception(__('Wrong message type'));
throw new \Magento\Model\Exception(__('Wrong message type'));
}
if (is_array($description)) {
$description = '<ul><li>' . implode('</li><li>', $description) . '</li></ul>';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,14 +52,14 @@ public function __construct(\Magento\AdminNotification\Model\InboxFactory $notif
*
* @param int $notificationId
* @return void
* @throws \Magento\Core\Exception
* @throws \Magento\Model\Exception
*/
public function markAsRead($notificationId)
{
$notification = $this->_notificationFactory->create();
$notification->load($notificationId);
if (!$notification->getId()) {
throw new \Magento\Core\Exception('Wrong notification ID specified.');
throw new \Magento\Model\Exception('Wrong notification ID specified.');
}
$notification->setIsRead(1);
$notification->save();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ class Collection extends \Magento\AdminNotification\Model\Resource\Inbox\Collect
/**
* Add remove filter
*
* @return \Magento\AdminNotification\Model\Resource\Grid\Collection|\Magento\Core\Model\Resource\Db\Collection\AbstractCollection
* @return \Magento\AdminNotification\Model\Resource\Grid\Collection|\Magento\Model\Resource\Db\Collection\AbstractCollection
*/
protected function _initSelect()
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
* @package Magento_AdminNotification
* @author Magento Core Team <core@magentocommerce.com>
*/
class Inbox extends \Magento\Core\Model\Resource\Db\AbstractDb
class Inbox extends \Magento\Model\Resource\Db\AbstractDb
{
/**
* AdminNotification Resource initialization
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
* @package Magento_AdminNotification
* @author Magento Core Team <core@magentocommerce.com>
*/
class Collection extends \Magento\Core\Model\Resource\Db\Collection\AbstractCollection
class Collection extends \Magento\Model\Resource\Db\Collection\AbstractCollection
{
/**
* Resource collection initialization
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
*/
namespace Magento\AdminNotification\Model\Resource\Inbox\Collection;

class Critical extends \Magento\Core\Model\Resource\Db\Collection\AbstractCollection
class Critical extends \Magento\Model\Resource\Db\Collection\AbstractCollection
{
/**
* Resource collection initialization
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
*/
namespace Magento\AdminNotification\Model\Resource\System;

class Message extends \Magento\Core\Model\Resource\Db\AbstractDb
class Message extends \Magento\Model\Resource\Db\AbstractDb
{
/**
* Flag that notifies whether Primary key of table is auto-incremeted
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
*/
namespace Magento\AdminNotification\Model\Resource\System\Message;

class Collection extends \Magento\Core\Model\Resource\Db\Collection\AbstractCollection
class Collection extends \Magento\Model\Resource\Db\Collection\AbstractCollection
{
/**
* System message list
Expand All @@ -46,7 +46,7 @@ class Collection extends \Magento\Core\Model\Resource\Db\Collection\AbstractColl
* @param \Magento\Event\ManagerInterface $eventManager
* @param \Magento\AdminNotification\Model\System\MessageList $messageList
* @param mixed $connection
* @param \Magento\Core\Model\Resource\Db\AbstractDb $resource
* @param \Magento\Model\Resource\Db\AbstractDb $resource
*/
public function __construct(
\Magento\Core\Model\EntityFactory $entityFactory,
Expand All @@ -55,7 +55,7 @@ public function __construct(
\Magento\Event\ManagerInterface $eventManager,
\Magento\AdminNotification\Model\System\MessageList $messageList,
$connection = null,
\Magento\Core\Model\Resource\Db\AbstractDb $resource = null
\Magento\Model\Resource\Db\AbstractDb $resource = null
) {
$this->_messageList = $messageList;
parent::__construct($entityFactory, $logger, $fetchStrategy, $eventManager, $connection, $resource);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ class Synchronized extends \Magento\AdminNotification\Model\Resource\System\Mess
/**
* Store new messages in database and remove outdated messages
*
* @return $this|\Magento\Core\Model\Resource\Db\AbstractDb
* @return $this|\Magento\Model\Resource\Db\AbstractDb
*/
public function _afterLoad()
{
Expand Down
10 changes: 5 additions & 5 deletions app/code/Magento/AdminNotification/Model/Survey.php
Original file line number Diff line number Diff line change
Expand Up @@ -44,12 +44,12 @@ class Survey
protected $_flagCode = 'admin_notification_survey';

/**
* @var \Magento\Core\Model\Flag
* @var \Magento\Flag
*/
protected $_flagModel = null;

/**
* @var \Magento\Core\Model\FlagFactory
* @var \Magento\FlagFactory
*/
protected $_flagFactory;

Expand All @@ -59,10 +59,10 @@ class Survey
protected $_request;

/**
* @param \Magento\Core\Model\FlagFactory $flagFactory
* @param \Magento\FlagFactory $flagFactory
* @param \Magento\App\RequestInterface $request
*/
public function __construct(\Magento\Core\Model\FlagFactory $flagFactory, \Magento\App\RequestInterface $request)
public function __construct(\Magento\FlagFactory $flagFactory, \Magento\App\RequestInterface $request)
{
$this->_request = $request;
$this->_flagFactory = $flagFactory;
Expand Down Expand Up @@ -100,7 +100,7 @@ public function getSurveyUrl()
/**
* Return core flag model
*
* @return \Magento\Core\Model\Flag
* @return \Magento\Flag
*/
protected function _getFlagModel()
{
Expand Down
3 changes: 1 addition & 2 deletions app/code/Magento/AdminNotification/Model/System/Message.php
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,7 @@
*/
namespace Magento\AdminNotification\Model\System;

class Message extends \Magento\Core\Model\AbstractModel implements
\Magento\AdminNotification\Model\System\MessageInterface
class Message extends \Magento\Model\AbstractModel implements \Magento\AdminNotification\Model\System\MessageInterface
{
/**
* @return void
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ public function placeAction()

$result['success'] = 1;
$isError = false;
} catch (\Magento\Core\Exception $e) {
} catch (\Magento\Model\Exception $e) {
$message = $e->getMessage();
if (!empty($message)) {
$this->messageManager->addError($message);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ public function cancelAction()
)->getPaymentMethodsHtml(
$this->_view
);
} catch (\Magento\Core\Exception $e) {
} catch (\Magento\Model\Exception $e) {
$this->_objectManager->get('Magento\Logger')->logException($e);
$result['error_message'] = $e->getMessage();
} catch (\Exception $e) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ public function cancelAction()
)->getPaymentMethodsHtml(
$this->_view
);
} catch (\Magento\Core\Exception $e) {
} catch (\Magento\Model\Exception $e) {
$this->_objectManager->get('Magento\Logger')->logException($e);
$result['error_message'] = $e->getMessage();
} catch (\Exception $e) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ protected function _responseAction(\Magento\Authorizenet\Helper\HelperInterface
}
$paymentMethod->process($data);
$result['success'] = 1;
} catch (\Magento\Core\Exception $e) {
} catch (\Magento\Model\Exception $e) {
$this->_objectManager->get('Magento\Logger')->logException($e);
$result['success'] = 0;
$result['error_msg'] = $e->getMessage();
Expand Down
Loading

0 comments on commit 1e3c166

Please sign in to comment.