Skip to content

Commit fa214d8

Browse files
magento-teammagento-team
committed
0.1.0-alpha105
* Various improvements: * Merged SQL and Data Upgrades for the Tax, Weee, Customer, CustomerImportExport, ProductAlert, Sendfriend and Wishlist modules * Added 'Interface' suffix to all interface names * Stabilized functional tests for the following modules: * CheckoutAgreements * Customer * GiftMessage * Integration * Msrp * Reports * Added the following functional tests: * Create product attribute from product page * Fixed bugs: * Fixed an issue where bundle product price doubled during backend order creation * Fixed an issue where an error was thrown during Tax Rate creation, deletion and update * Fixed an issue where FPT was doubled when creating a refund if two FPTs were applied, and as a result the refund could not be created * Fixed an issue where the subtotal including tax field was not refreshed after removing downloadable product from cart * Fixed an issue where a downloadable link tax was not added to a product price on the product page if price was displayed including tax * Fixed an issue with incorrect product prices for bundle products in shopping cart * Fixed an issue where bundle product price was calculated incorrectly on the product page * Fixed an issue where configurable product options were not updated after changing currency * Fixed an issue where a standalone simple product and the same product as part of the grouped, were not recognized as one product in the shopping cart. * Fixed an issue where the incorrect tier pricing information was displayed in shopping cart * Fixed an issue where no notice was displayed in the shopping cart for products with MAP enabled * Fixed an issue where it was impossible to place an order from customer page in Admin * Fixed an issue where it was impossible to add address for a customer in Admin * Fixed an issue with broken redirect URL after deleting a product from the My Wishlist widget * Fixed an issue where it was impossible to assign an admin user to a user role * Service Contracts: * Implemented Service Contracts for the CatalogInventory Module * Framework Improvements: * Added the ability to configure the list of loaded modules before installation * Added the ability to use the Composer autoloader instead of the Magento custom autoloaders for tests * Introduced a repository for storing a quote entity * Performance improvements: * Split Magento\Customer\Helper\Data * Processed GitHub requests: * [#731](#731) -- Filter grid is absent on CMS Pages in Backend
1 parent 02a9a0e commit fa214d8

File tree

1,426 files changed

+30092
-14968
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,426 files changed

+30092
-14968
lines changed

‎CHANGELOG.md

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,44 @@
1+
0.1.0-alpha105
2+
=============
3+
* Various improvements:
4+
* Merged SQL and Data Upgrades for the Tax, Weee, Customer, CustomerImportExport, ProductAlert, Sendfriend and Wishlist modules
5+
* Added 'Interface' suffix to all interface names
6+
* Stabilized functional tests for the following modules:
7+
* CheckoutAgreements
8+
* Customer
9+
* GiftMessage
10+
* Integration
11+
* Msrp
12+
* Reports
13+
* Added the following functional tests:
14+
* Create product attribute from product page
15+
* Fixed bugs:
16+
* Fixed an issue where bundle product price doubled during backend order creation
17+
* Fixed an issue where an error was thrown during Tax Rate creation, deletion and update
18+
* Fixed an issue where FPT was doubled when creating a refund if two FPTs were applied, and as a result the refund could not be created
19+
* Fixed an issue where the subtotal including tax field was not refreshed after removing downloadable product from cart
20+
* Fixed an issue where a downloadable link tax was not added to a product price on the product page if price was displayed including tax
21+
* Fixed an issue with incorrect product prices for bundle products in shopping cart
22+
* Fixed an issue where bundle product price was calculated incorrectly on the product page
23+
* Fixed an issue where configurable product options were not updated after changing currency
24+
* Fixed an issue where a standalone simple product and the same product as part of the grouped, were not recognized as one product in the shopping cart.
25+
* Fixed an issue where the incorrect tier pricing information was displayed in shopping cart
26+
* Fixed an issue where no notice was displayed in the shopping cart for products with MAP enabled
27+
* Fixed an issue where it was impossible to place an order from customer page in Admin
28+
* Fixed an issue where it was impossible to add address for a customer in Admin
29+
* Fixed an issue with broken redirect URL after deleting a product from the My Wishlist widget
30+
* Fixed an issue where it was impossible to assign an admin user to a user role
31+
* Service Contracts:
32+
* Implemented Service Contracts for the CatalogInventory Module
33+
* Framework Improvements:
34+
* Added the ability to configure the list of loaded modules before installation
35+
* Added the ability to use the Composer autoloader instead of the Magento custom autoloaders for tests
36+
* Introduced a repository for storing a quote entity
37+
* Performance improvements:
38+
* Split Magento\Customer\Helper\Data
39+
* Processed GitHub requests:
40+
* [#731](https://github.com/magento/magento2/issues/731) -- Filter grid is absent on CMS Pages in Backend
41+
142
0.1.0-alpha104
243
=============
344
* Various improvements:

‎app/autoload.php

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@
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+
use Magento\Framework\Autoload\AutoloaderRegistry;
27+
use Magento\Framework\Autoload\ClassLoaderWrapper;
2628

2729
/**
2830
* Shortcut constant for the root directory
@@ -32,5 +34,10 @@
3234
$vendorDir = require BP . '/app/etc/vendor_path.php';
3335
$vendorAutoload = BP . "/{$vendorDir}/autoload.php";
3436
if (file_exists($vendorAutoload)) {
35-
require_once $vendorAutoload;
37+
$composerAutoloader = include $vendorAutoload;
3638
}
39+
40+
AutoloaderRegistry::registerAutoloader(new ClassLoaderWrapper($composerAutoloader));
41+
42+
// Sets default autoload mappings, may be overridden in Bootstrap::create
43+
\Magento\Framework\App\Bootstrap::populateAutoloader(BP, []);

‎app/code/Magento/AdminNotification/composer.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@
33
"description": "N/A",
44
"require": {
55
"php": "~5.4.11|~5.5.0",
6-
"magento/module-store": "0.1.0-alpha104",
7-
"magento/module-core": "0.1.0-alpha104",
8-
"magento/module-backend": "0.1.0-alpha104",
9-
"magento/framework": "0.1.0-alpha104",
6+
"magento/module-store": "0.1.0-alpha105",
7+
"magento/module-core": "0.1.0-alpha105",
8+
"magento/module-backend": "0.1.0-alpha105",
9+
"magento/framework": "0.1.0-alpha105",
1010
"lib-libxml": "*",
1111
"magento/magento-composer-installer": "*"
1212
},
1313
"type": "magento2-module",
14-
"version": "0.1.0-alpha104",
14+
"version": "0.1.0-alpha105",
1515
"extra": {
1616
"map": [
1717
[

‎app/code/Magento/Authorization/composer.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
"description": "Authorization module provides access to Magento ACL functionality.",
44
"require": {
55
"php": "~5.4.11|~5.5.0",
6-
"magento/module-backend": "0.1.0-alpha104",
7-
"magento/framework": "0.1.0-alpha104",
6+
"magento/module-backend": "0.1.0-alpha105",
7+
"magento/framework": "0.1.0-alpha105",
88
"magento/magento-composer-installer": "*"
99
},
1010
"type": "magento2-module",
11-
"version": "0.1.0-alpha104",
11+
"version": "0.1.0-alpha105",
1212
"extra": {
1313
"map": [
1414
[

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

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -134,10 +134,17 @@ protected function _returnCustomerQuote($cancelOrder = false, $errorMsg = '')
134134
/* @var $order \Magento\Sales\Model\Order */
135135
$order = $this->_objectManager->create('Magento\Sales\Model\Order')->loadByIncrementId($incrementId);
136136
if ($order->getId()) {
137-
$quote = $this->_objectManager->create('Magento\Sales\Model\Quote')->load($order->getQuoteId());
138-
if ($quote->getId()) {
139-
$quote->setIsActive(1)->setReservedOrderId(null)->save();
137+
try {
138+
/** @var \Magento\Sales\Model\QuoteRepository $quoteRepository */
139+
$quoteRepository = $this->_objectManager->create('Magento\Sales\Model\QuoteRepository');
140+
/** @var \Magento\Sales\Model\Quote $quote */
141+
$quote = $quoteRepository->get($order->getQuoteId());
142+
143+
$quote->setIsActive(1)->setReservedOrderId(null);
144+
$quoteRepository->save($quote);
140145
$this->_getCheckout()->replaceQuote($quote);
146+
} catch (\Magento\Framework\Exception\NoSuchEntityException $e) {
147+
141148
}
142149
$this->_getDirectPostSession()->removeCheckoutOrderIncrementId($incrementId);
143150
$this->_getDirectPostSession()->unsetData('quote_id');

‎app/code/Magento/Authorizenet/Model/Directpost.php

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -78,9 +78,9 @@ class Directpost extends \Magento\Authorizenet\Model\Authorizenet
7878
protected $_storeManager;
7979

8080
/**
81-
* @var \Magento\Sales\Model\QuoteFactory
81+
* @var \Magento\Sales\Model\QuoteRepository
8282
*/
83-
protected $_quoteFactory;
83+
protected $quoteRepository;
8484

8585
/**
8686
* @var \Magento\Authorizenet\Model\Directpost\Response
@@ -113,7 +113,7 @@ class Directpost extends \Magento\Authorizenet\Model\Authorizenet
113113
* @param \Magento\Framework\Session\SessionManagerInterface $session
114114
* @param \Magento\Authorizenet\Helper\Data $authorizenetData
115115
* @param \Magento\Framework\StoreManagerInterface $storeManager
116-
* @param \Magento\Sales\Model\QuoteFactory $quoteFactory
116+
* @param \Magento\Sales\Model\QuoteRepository $quoteRepository
117117
* @param \Magento\Authorizenet\Model\Directpost\RequestFactory $directRequestFactory
118118
* @param \Magento\Authorizenet\Model\Directpost\Response $response
119119
* @param \Magento\Authorizenet\Helper\HelperInterface $helper
@@ -138,7 +138,7 @@ public function __construct(
138138
\Magento\Framework\Session\SessionManagerInterface $session,
139139
\Magento\Authorizenet\Helper\Data $authorizenetData,
140140
\Magento\Framework\StoreManagerInterface $storeManager,
141-
\Magento\Sales\Model\QuoteFactory $quoteFactory,
141+
\Magento\Sales\Model\QuoteRepository $quoteRepository,
142142
\Magento\Authorizenet\Model\Directpost\RequestFactory $directRequestFactory,
143143
\Magento\Authorizenet\Model\Directpost\Response $response,
144144
\Magento\Authorizenet\Helper\HelperInterface $helper,
@@ -163,7 +163,7 @@ public function __construct(
163163
$data
164164
);
165165
$this->_storeManager = $storeManager;
166-
$this->_quoteFactory = $quoteFactory;
166+
$this->quoteRepository = $quoteRepository;
167167
$this->_requestFactory = $directRequestFactory;
168168
$this->_response = $response;
169169
$this->_helper = $helper;
@@ -718,7 +718,8 @@ protected function _authOrder(\Magento\Sales\Model\Order $order)
718718
$this->orderSender->send($order);
719719
}
720720

721-
$this->_quoteFactory->create()->load($order->getQuoteId())->setIsActive(false)->save();
721+
$quote = $this->quoteRepository->get($order->getQuoteId())->setIsActive(false);
722+
$this->quoteRepository->save($quote);
722723
} catch (\Exception $e) {
723724
// do not cancel order if we couldn't send email
724725
}

‎app/code/Magento/Authorizenet/Model/Directpost/Session.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ class Session extends \Magento\Framework\Session\SessionManager
3535
* @param \Magento\Framework\Session\SaveHandlerInterface $saveHandler
3636
* @param \Magento\Framework\Session\ValidatorInterface $validator
3737
* @param \Magento\Framework\Session\StorageInterface $storage
38-
* @param \Magento\Framework\Stdlib\CookieManager $cookieManager
38+
* @param \Magento\Framework\Stdlib\CookieManagerInterface $cookieManager
3939
* @param \Magento\Framework\Stdlib\Cookie\CookieMetadataFactory $cookieMetadataFactory
4040
* @internal param array $data
4141
*/
@@ -46,7 +46,7 @@ public function __construct(
4646
\Magento\Framework\Session\SaveHandlerInterface $saveHandler,
4747
\Magento\Framework\Session\ValidatorInterface $validator,
4848
\Magento\Framework\Session\StorageInterface $storage,
49-
\Magento\Framework\Stdlib\CookieManager $cookieManager,
49+
\Magento\Framework\Stdlib\CookieManagerInterface $cookieManager,
5050
\Magento\Framework\Stdlib\Cookie\CookieMetadataFactory $cookieMetadataFactory
5151
) {
5252
parent::__construct(

‎app/code/Magento/Authorizenet/composer.json

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,18 @@
33
"description": "N/A",
44
"require": {
55
"php": "~5.4.11|~5.5.0",
6-
"magento/module-sales": "0.1.0-alpha104",
7-
"magento/module-checkout": "0.1.0-alpha104",
8-
"magento/module-backend": "0.1.0-alpha104",
9-
"magento/module-core": "0.1.0-alpha104",
10-
"magento/module-payment": "0.1.0-alpha104",
11-
"magento/module-centinel": "0.1.0-alpha104",
12-
"magento/module-catalog": "0.1.0-alpha104",
13-
"magento/framework": "0.1.0-alpha104",
6+
"magento/module-sales": "0.1.0-alpha105",
7+
"magento/module-checkout": "0.1.0-alpha105",
8+
"magento/module-backend": "0.1.0-alpha105",
9+
"magento/module-core": "0.1.0-alpha105",
10+
"magento/module-payment": "0.1.0-alpha105",
11+
"magento/module-centinel": "0.1.0-alpha105",
12+
"magento/module-catalog": "0.1.0-alpha105",
13+
"magento/framework": "0.1.0-alpha105",
1414
"magento/magento-composer-installer": "*"
1515
},
1616
"type": "magento2-module",
17-
"version": "0.1.0-alpha104",
17+
"version": "0.1.0-alpha105",
1818
"extra": {
1919
"map": [
2020
[

‎app/code/Magento/Backend/App/Action/Context.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ class Context extends \Magento\Framework\App\Action\Context
7676
/**
7777
* @param \Magento\Framework\App\RequestInterface $request
7878
* @param \Magento\Framework\App\ResponseInterface $response
79-
* @param \Magento\Framework\ObjectManager $objectManager
79+
* @param \Magento\Framework\ObjectManagerInterface $objectManager
8080
* @param \Magento\Framework\Event\ManagerInterface $eventManager
8181
* @param \Magento\Framework\UrlInterface $url
8282
* @param \Magento\Framework\App\Response\RedirectInterface $redirect
@@ -96,7 +96,7 @@ class Context extends \Magento\Framework\App\Action\Context
9696
public function __construct(
9797
\Magento\Framework\App\RequestInterface $request,
9898
\Magento\Framework\App\ResponseInterface $response,
99-
\Magento\Framework\ObjectManager $objectManager,
99+
\Magento\Framework\ObjectManagerInterface $objectManager,
100100
\Magento\Framework\Event\ManagerInterface $eventManager,
101101
\Magento\Framework\UrlInterface $url,
102102
\Magento\Framework\App\Response\RedirectInterface $redirect,

‎app/code/Magento/Backend/Block/System/Config/Form/Field/Factory.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,14 +30,14 @@
3030
class Factory
3131
{
3232
/**
33-
* @var \Magento\Framework\ObjectManager
33+
* @var \Magento\Framework\ObjectManagerInterface
3434
*/
3535
protected $_objectManager;
3636

3737
/**
38-
* @param \Magento\Framework\ObjectManager $objectManager
38+
* @param \Magento\Framework\ObjectManagerInterface $objectManager
3939
*/
40-
public function __construct(\Magento\Framework\ObjectManager $objectManager)
40+
public function __construct(\Magento\Framework\ObjectManagerInterface $objectManager)
4141
{
4242
$this->_objectManager = $objectManager;
4343
}

0 commit comments

Comments
 (0)