Skip to content

Commit d895f13

Browse files
magento-teammagento-team
committed
2.0.0.0-dev81
* Framework improvements: * Covered the following Magento application components with unit tests: * `SalesRule/Model/Observer` * `SalesRule/Helper/*` * `SalesRule/Model/Plugin/*` * `SalesRule/Model/System/Config*` * `Sales/Model/Config.php` * `Sales/Model/Download.php` * `Sales/Model/Quote.php` * Covered the following Magento lib form elements with unit tests: * `lib/Magento/Framework/Flag.php` * `lib/Magento/Framework/Escaper` * `lib/Magento/Framework/Event` * `lib/Magento/Framework/Logger` * `lib/Magento/Framework/Util` * `lib/Magento/Framework/Registry.php` * `lib/Magento/Framework/Backup/Media` * `lib/Magento/Framework/Backup/NoMedia` * `lib/Magento/Framework/Archive` * `lib/Magento/Framework/Translate.php` * Created Service API for Magento_Catalog module: * AttributeSet service * AttributeSetGroup service * ProductLinks service * ProductType service * Payments Improvements: * Resolved a performance issue with Merchant Country selector under Payment Methods settings * Removed the PayPal Payments Pro Payflow Edition payment solution * Removed the Saved Credit Card payment method * Added the following functional tests: * Delete Admin User * Delete Backend Customer * Delete Product UrlRewrite * Downloadable Product Creation * Update Simple Product * Update Tax Rule * Update Tax Rate * Suggest Searching Result * Fixed bugs: * Fixed an issue where the Create Order page title was not correct when scrolling down was performed * Fixed the concurrent test running in MTF * Fixed an issue where product custom options were merged incorrectly * Fixed an issue where customer group discount was not applied for bundle products * Fixed an issue where it was impossible to create a refund for the PayPal Exprecch Checkout Payflow Edition if captured from the PayPal admin * Fixed an issue where adding customer review caused an error in system.log * Fixed an issue where the Manage Stock option was automatically reset to No after changing the Stock Availability option * Fixed an issue where the recurring profile attributes where displayed for a product when they were not included in the product attribute set. * Fixed an issue where a fatal error appeared in some cases on attempt to add a product to cart when FPT was enabled * Fixed an issue where back in stock product alert emails showed HTML markup * Fixed an issue where the Refresh Statistics link on the Sales Report page redirected to the frontend after setting Add Store Code to Urls to Yes * Fixed an issue where the selected bundle options price was included to the price displayed in the MAP popup * Fixed an issue where the wrong allowed countries list was used in Checkout * Fixed an issue where configurable products with out of stock associated simple products were displayed in layered navigation * Fixed an issue where configurable products lost options after being duplicated using the Save and Duplicate button * Fixed issues with simple product custom options where it was impossible to import them from a product page and they were not duplicated correctly using the Save and Duplicate button * Fixed an issue where it was impossible to create a customer on the backend in a single store mode * Fixed an issue where reviews created on the backend appeared with the Guest status * Fixed an issue where it was impossible to add an image for a configurable product variation during editing * Processed GitHub requests: * [#539] (#539) The "{config.xml,*/config.xml}" pattern cannot be processed * [#564] (#564) Catalog product images - Do not removing from file system * [#256] (#256) Unused file app\code\core\Mage\Backend\view\adminhtml\store\switcher\enhanced.phtml * [#561] (#561) Bugfix Magento\Framework\DB\Adapter\Pdo\Mysql::getForeignKeys() * [#576] (#576) Change Request for InvokerDefault::_callObserverMethod()
1 parent db0b8d9 commit d895f13

File tree

545 files changed

+26958
-5623
lines changed

Some content is hidden

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

545 files changed

+26958
-5623
lines changed

‎CHANGELOG.md

+69-2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,70 @@
1+
2.0.0.0-dev81
2+
=============
3+
* Framework improvements:
4+
* Covered the following Magento application components with unit tests:
5+
* `SalesRule/Model/Observer`
6+
* `SalesRule/Helper/*`
7+
* `SalesRule/Model/Plugin/*`
8+
* `SalesRule/Model/System/Config*`
9+
* `Sales/Model/Config.php`
10+
* `Sales/Model/Download.php`
11+
* `Sales/Model/Quote.php`
12+
* Covered the following Magento lib form elements with unit tests:
13+
* `lib/Magento/Framework/Flag.php`
14+
* `lib/Magento/Framework/Escaper`
15+
* `lib/Magento/Framework/Event`
16+
* `lib/Magento/Framework/Logger`
17+
* `lib/Magento/Framework/Util`
18+
* `lib/Magento/Framework/Registry.php`
19+
* `lib/Magento/Framework/Backup/Media`
20+
* `lib/Magento/Framework/Backup/NoMedia`
21+
* `lib/Magento/Framework/Archive`
22+
* `lib/Magento/Framework/Translate.php`
23+
* Created Service API for Magento_Catalog module:
24+
* AttributeSet service
25+
* AttributeSetGroup service
26+
* ProductLinks service
27+
* ProductType service
28+
* Payments Improvements:
29+
* Resolved a performance issue with Merchant Country selector under Payment Methods settings
30+
* Removed the PayPal Payments Pro Payflow Edition payment solution
31+
* Removed the Saved Credit Card payment method
32+
* Added the following functional tests:
33+
* Delete Admin User
34+
* Delete Backend Customer
35+
* Delete Product UrlRewrite
36+
* Downloadable Product Creation
37+
* Update Simple Product
38+
* Update Tax Rule
39+
* Update Tax Rate
40+
* Suggest Searching Result
41+
* Fixed bugs:
42+
* Fixed an issue where the Create Order page title was not correct when scrolling down was performed
43+
* Fixed the concurrent test running in MTF
44+
* Fixed an issue where product custom options were merged incorrectly
45+
* Fixed an issue where customer group discount was not applied for bundle products
46+
* Fixed an issue where it was impossible to create a refund for the PayPal Exprecch Checkout Payflow Edition if captured from the PayPal admin
47+
* Fixed an issue where adding customer review caused an error in system.log
48+
* Fixed an issue where the Manage Stock option was automatically reset to No after changing the Stock Availability option
49+
* Fixed an issue where the recurring profile attributes where displayed for a product when they were not included in the product attribute set.
50+
* Fixed an issue where a fatal error appeared in some cases on attempt to add a product to cart when FPT was enabled
51+
* Fixed an issue where back in stock product alert emails showed HTML markup
52+
* Fixed an issue where the Refresh Statistics link on the Sales Report page redirected to the frontend after setting Add Store Code to Urls to Yes
53+
* Fixed an issue where the selected bundle options price was included to the price displayed in the MAP popup
54+
* Fixed an issue where the wrong allowed countries list was used in Checkout
55+
* Fixed an issue where configurable products with out of stock associated simple products were displayed in layered navigation
56+
* Fixed an issue where configurable products lost options after being duplicated using the Save and Duplicate button
57+
* Fixed issues with simple product custom options where it was impossible to import them from a product page and they were not duplicated correctly using the Save and Duplicate button
58+
* Fixed an issue where it was impossible to create a customer on the backend in a single store mode
59+
* Fixed an issue where reviews created on the backend appeared with the Guest status
60+
* Fixed an issue where it was impossible to add an image for a configurable product variation during editing
61+
* Processed GitHub requests:
62+
* [#539] (https://github.com/magento/magento2/issues/539) The "{config.xml,*/config.xml}" pattern cannot be processed
63+
* [#564] (https://github.com/magento/magento2/issues/564) Catalog product images - Do not removing from file system
64+
* [#256] (https://github.com/magento/magento2/issues/256) Unused file app\code\core\Mage\Backend\view\adminhtml\store\switcher\enhanced.phtml
65+
* [#561] (https://github.com/magento/magento2/pull/561) Bugfix Magento\Framework\DB\Adapter\Pdo\Mysql::getForeignKeys()
66+
* [#576] (https://github.com/magento/magento2/pull/576) Change Request for InvokerDefault::_callObserverMethod()
67+
168
2.0.0.0-dev80
269
=============
370
* Framework improvements:
@@ -104,7 +171,7 @@
104171
* Fixed an issue where the Links section was absent while editing downloadable products from the Wishlist
105172
* Fixed an issue where specified details for composite products were lost after adding to Gift Card and Downloadable products to the Wishlist
106173
* Fixed and issue where the Date widget was set to incorrect date when creating a new customer
107-
* Fixed an issue where a customer was redirected to Dashboard if the Redirect user to dashboard after login option was set to ‘No’
174+
* Fixed an issue where a customer was redirected to Dashboard if the Redirect user to dashboard after login option was set to "No"
108175
* Fixed an issue where a customer was not able to register during checkout if Guest Checkout was not allowed
109176
* Fixed an issue where System logs were not generated properly in integration tests
110177
* Fixed benchmarking script
@@ -122,7 +189,7 @@
122189
* Catalog Price Rule Creation
123190
* Category Url Rewrite Creation
124191
* Admin User Role Deletion
125-
* Update composer.json.dist in order to download and install MTF from Public GitHub (MAGETWO-24698)
192+
* Update composer.json.dist in order to download and install MTF from Public GitHub
126193
* GitHub requests:
127194
* [#542] (https://github.com/magento/magento2/pull/542) Fix ImportExport bug which occurs while importing multiple rows per entity
128195
* [#507] (https://github.com/magento/magento2/issues/507) "Insert Image" window is overlapped on menu

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ protected function _getHeaderHtml($element)
9292
if ($element->getIsNested()) {
9393
$html = '<tr class="nested"><td colspan="4"><div class="' . $this->_getFrontendClass($element) . '">';
9494
} else {
95-
$html = '<div class="' . $this->_getFrontendClass($element) . ' ">';
95+
$html = '<div class="' . $this->_getFrontendClass($element) . '">';
9696
}
9797

9898
$html .= '<div class="entry-edit-head collapseable">' .

‎app/code/Magento/Backend/Model/Url.php

+4-4
Original file line numberDiff line numberDiff line change
@@ -93,20 +93,20 @@ class Url extends \Magento\Framework\Url implements \Magento\Backend\Model\UrlIn
9393
* @param \Magento\Framework\App\Route\ConfigInterface $routeConfig
9494
* @param \Magento\Framework\App\RequestInterface $request
9595
* @param \Magento\Framework\Url\SecurityInfoInterface $urlSecurityInfo
96-
* @param \Magento\Backend\Model\Url\ScopeResolver $scopeResolver
96+
* @param \Magento\Framework\Url\ScopeResolverInterface $scopeResolver
9797
* @param \Magento\Framework\Session\Generic $session
9898
* @param \Magento\Framework\Session\SidResolverInterface $sidResolver
9999
* @param \Magento\Framework\Url\RouteParamsResolverFactory $routeParamsResolver
100100
* @param \Magento\Framework\Url\QueryParamsResolverInterface $queryParamsResolver
101101
* @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
102+
* @param string $scopeType
102103
* @param \Magento\Backend\Helper\Data $backendHelper
103104
* @param Menu\Config $menuConfig
104105
* @param \Magento\Framework\App\CacheInterface $cache
105106
* @param Auth\Session $authSession
106107
* @param \Magento\Framework\Encryption\EncryptorInterface $encryptor
107108
* @param \Magento\Store\Model\StoreFactory $storeFactory
108109
* @param \Magento\Framework\Data\Form\FormKey $formKey
109-
* @param string $scopeType
110110
* @param array $data
111111
*
112112
* @SuppressWarnings(PHPMD.ExcessiveParameterList)
@@ -115,20 +115,20 @@ public function __construct(
115115
\Magento\Framework\App\Route\ConfigInterface $routeConfig,
116116
\Magento\Framework\App\RequestInterface $request,
117117
\Magento\Framework\Url\SecurityInfoInterface $urlSecurityInfo,
118-
\Magento\Backend\Model\Url\ScopeResolver $scopeResolver,
118+
\Magento\Framework\Url\ScopeResolverInterface $scopeResolver,
119119
\Magento\Framework\Session\Generic $session,
120120
\Magento\Framework\Session\SidResolverInterface $sidResolver,
121121
\Magento\Framework\Url\RouteParamsResolverFactory $routeParamsResolver,
122122
\Magento\Framework\Url\QueryParamsResolverInterface $queryParamsResolver,
123123
\Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
124+
$scopeType,
124125
\Magento\Backend\Helper\Data $backendHelper,
125126
\Magento\Backend\Model\Menu\Config $menuConfig,
126127
\Magento\Framework\App\CacheInterface $cache,
127128
\Magento\Backend\Model\Auth\Session $authSession,
128129
\Magento\Framework\Encryption\EncryptorInterface $encryptor,
129130
\Magento\Store\Model\StoreFactory $storeFactory,
130131
\Magento\Framework\Data\Form\FormKey $formKey,
131-
$scopeType,
132132
array $data = array()
133133
) {
134134
$this->_encryptor = $encryptor;

‎app/code/Magento/Backend/etc/di.xml

+2-1
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,7 @@
9797
</type>
9898
<type name="Magento\Backend\Model\Url">
9999
<arguments>
100+
<argument name="scopeResolver" xsi:type="object">Magento\Backend\Model\Url\ScopeResolver</argument>
100101
<argument name="authSession" xsi:type="object">Magento\Backend\Model\Auth\Session\Proxy</argument>
101102
<argument name="formKey" xsi:type="object">Magento\Framework\Data\Form\FormKey\Proxy</argument>
102103
<argument name="scopeType" xsi:type="const">Magento\Store\Model\ScopeInterface::SCOPE_STORE</argument>
@@ -186,7 +187,7 @@
186187

187188
<type name="Magento\Backend\Model\Config\Structure\Element\Iterator\Group" shared="false" />
188189
<type name="Magento\Backend\Model\Config\Structure\Element\Group\Proxy" shared="false" />
189-
190+
190191
<type name="Magento\Backend\Model\Config\Structure\Element\Dependency\Mapper" shared="false">
191192
<arguments>
192193
<argument name="fieldLocator" xsi:type="object">Magento\Backend\Model\Config\Structure\Search\Proxy</argument>

‎app/code/Magento/Backend/etc/events.xml

-3
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,6 @@
2424
*/
2525
-->
2626
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../lib/internal/Magento/Framework/Event/etc/events.xsd">
27-
<event name="adminhtml_controller_action_predispatch_start">
28-
<observer name="massaction" instance="Magento\Backend\Model\Observer" method="massactionPrepareKey" />
29-
</event>
3027
<event name="admin_user_authenticate_after">
3128
<observer name="configuration_files_access_level_verification" instance="Magento\Backend\Model\Observer" method="clearCacheConfigurationFilesAccessLevelVerification" />
3229
</event>

‎app/code/Magento/Backend/etc/system.xsd

+1-2
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@
106106

107107
<xs:complexType>
108108
<xs:sequence>
109-
<xs:choice minOccurs="2" maxOccurs="unbounded">
109+
<xs:choice minOccurs="1" maxOccurs="unbounded">
110110
<xs:element name="label" type="xs:string" />
111111
<xs:element name="class" type="xs:string" />
112112
<xs:element name="tab" type="typeTabId" />
@@ -144,7 +144,6 @@
144144
<xs:element name="frontend_model" type="typeModel" />
145145
<xs:element name="clone_model" type="typeModel" />
146146
<xs:element name="clone_fields" type="xs:int" />
147-
<xs:element name="expanded" type="xs:int" />
148147
<xs:element name="help_url" type="typeUrl" />
149148
<xs:element name="more_url" type="typeUrl" />
150149
<xs:element name="demo_link" type="typeUrl" />

‎app/code/Magento/Backend/etc/system_file.xsd

-1
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,6 @@
145145
<xs:element name="frontend_model" type="typeModel" />
146146
<xs:element name="clone_model" type="typeModel" />
147147
<xs:element name="clone_fields" type="xs:int" />
148-
<xs:element name="expanded" type="xs:int" />
149148
<xs:element name="help_url" type="typeUrl" />
150149
<xs:element name="more_url" type="typeUrl" />
151150
<xs:element name="demo_link" type="typeUrl" />

‎app/code/Magento/Backend/view/adminhtml/templates/store/switcher/enhanced.phtml

-119
This file was deleted.

‎app/code/Magento/Bundle/Pricing/Price/BasePrice.php

-67
This file was deleted.

‎app/code/Magento/Bundle/Pricing/Price/BundleOptionPrice.php

+2-1
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,8 @@ public function getOptions()
125125
*/
126126
public function getOptionSelectionAmount($selection)
127127
{
128-
$selectionPrice = $this->selectionFactory->create($this->product, $selection, $selection->getSelectionQty());
128+
$selectionPrice = $this->selectionFactory
129+
->create($this->product, $selection, $selection->getSelectionQty());
129130
return $selectionPrice->getAmount();
130131
}
131132

0 commit comments

Comments
 (0)