Skip to content

Commit

Permalink
2.0.0.0-dev81
Browse files Browse the repository at this point in the history
* 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()
  • Loading branch information
magento-team committed Jun 6, 2014
1 parent db0b8d9 commit d895f13
Show file tree
Hide file tree
Showing 545 changed files with 26,958 additions and 5,623 deletions.
71 changes: 69 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,70 @@
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] (https://github.com/magento/magento2/issues/539) The "{config.xml,*/config.xml}" pattern cannot be processed
* [#564] (https://github.com/magento/magento2/issues/564) Catalog product images - Do not removing from file system
* [#256] (https://github.com/magento/magento2/issues/256) Unused file app\code\core\Mage\Backend\view\adminhtml\store\switcher\enhanced.phtml
* [#561] (https://github.com/magento/magento2/pull/561) Bugfix Magento\Framework\DB\Adapter\Pdo\Mysql::getForeignKeys()
* [#576] (https://github.com/magento/magento2/pull/576) Change Request for InvokerDefault::_callObserverMethod()

2.0.0.0-dev80
=============
* Framework improvements:
Expand Down Expand Up @@ -104,7 +171,7 @@
* Fixed an issue where the Links section was absent while editing downloadable products from the Wishlist
* Fixed an issue where specified details for composite products were lost after adding to Gift Card and Downloadable products to the Wishlist
* Fixed and issue where the Date widget was set to incorrect date when creating a new customer
* Fixed an issue where a customer was redirected to Dashboard if the Redirect user to dashboard after login option was set to ‘No’
* Fixed an issue where a customer was redirected to Dashboard if the Redirect user to dashboard after login option was set to "No"
* Fixed an issue where a customer was not able to register during checkout if Guest Checkout was not allowed
* Fixed an issue where System logs were not generated properly in integration tests
* Fixed benchmarking script
Expand All @@ -122,7 +189,7 @@
* Catalog Price Rule Creation
* Category Url Rewrite Creation
* Admin User Role Deletion
* Update composer.json.dist in order to download and install MTF from Public GitHub (MAGETWO-24698)
* Update composer.json.dist in order to download and install MTF from Public GitHub
* GitHub requests:
* [#542] (https://github.com/magento/magento2/pull/542) Fix ImportExport bug which occurs while importing multiple rows per entity
* [#507] (https://github.com/magento/magento2/issues/507) "Insert Image" window is overlapped on menu
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ protected function _getHeaderHtml($element)
if ($element->getIsNested()) {
$html = '<tr class="nested"><td colspan="4"><div class="' . $this->_getFrontendClass($element) . '">';
} else {
$html = '<div class="' . $this->_getFrontendClass($element) . ' ">';
$html = '<div class="' . $this->_getFrontendClass($element) . '">';
}

$html .= '<div class="entry-edit-head collapseable">' .
Expand Down
8 changes: 4 additions & 4 deletions app/code/Magento/Backend/Model/Url.php
Original file line number Diff line number Diff line change
Expand Up @@ -93,20 +93,20 @@ class Url extends \Magento\Framework\Url implements \Magento\Backend\Model\UrlIn
* @param \Magento\Framework\App\Route\ConfigInterface $routeConfig
* @param \Magento\Framework\App\RequestInterface $request
* @param \Magento\Framework\Url\SecurityInfoInterface $urlSecurityInfo
* @param \Magento\Backend\Model\Url\ScopeResolver $scopeResolver
* @param \Magento\Framework\Url\ScopeResolverInterface $scopeResolver
* @param \Magento\Framework\Session\Generic $session
* @param \Magento\Framework\Session\SidResolverInterface $sidResolver
* @param \Magento\Framework\Url\RouteParamsResolverFactory $routeParamsResolver
* @param \Magento\Framework\Url\QueryParamsResolverInterface $queryParamsResolver
* @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
* @param string $scopeType
* @param \Magento\Backend\Helper\Data $backendHelper
* @param Menu\Config $menuConfig
* @param \Magento\Framework\App\CacheInterface $cache
* @param Auth\Session $authSession
* @param \Magento\Framework\Encryption\EncryptorInterface $encryptor
* @param \Magento\Store\Model\StoreFactory $storeFactory
* @param \Magento\Framework\Data\Form\FormKey $formKey
* @param string $scopeType
* @param array $data
*
* @SuppressWarnings(PHPMD.ExcessiveParameterList)
Expand All @@ -115,20 +115,20 @@ public function __construct(
\Magento\Framework\App\Route\ConfigInterface $routeConfig,
\Magento\Framework\App\RequestInterface $request,
\Magento\Framework\Url\SecurityInfoInterface $urlSecurityInfo,
\Magento\Backend\Model\Url\ScopeResolver $scopeResolver,
\Magento\Framework\Url\ScopeResolverInterface $scopeResolver,
\Magento\Framework\Session\Generic $session,
\Magento\Framework\Session\SidResolverInterface $sidResolver,
\Magento\Framework\Url\RouteParamsResolverFactory $routeParamsResolver,
\Magento\Framework\Url\QueryParamsResolverInterface $queryParamsResolver,
\Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
$scopeType,
\Magento\Backend\Helper\Data $backendHelper,
\Magento\Backend\Model\Menu\Config $menuConfig,
\Magento\Framework\App\CacheInterface $cache,
\Magento\Backend\Model\Auth\Session $authSession,
\Magento\Framework\Encryption\EncryptorInterface $encryptor,
\Magento\Store\Model\StoreFactory $storeFactory,
\Magento\Framework\Data\Form\FormKey $formKey,
$scopeType,
array $data = array()
) {
$this->_encryptor = $encryptor;
Expand Down
3 changes: 2 additions & 1 deletion app/code/Magento/Backend/etc/di.xml
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,7 @@
</type>
<type name="Magento\Backend\Model\Url">
<arguments>
<argument name="scopeResolver" xsi:type="object">Magento\Backend\Model\Url\ScopeResolver</argument>
<argument name="authSession" xsi:type="object">Magento\Backend\Model\Auth\Session\Proxy</argument>
<argument name="formKey" xsi:type="object">Magento\Framework\Data\Form\FormKey\Proxy</argument>
<argument name="scopeType" xsi:type="const">Magento\Store\Model\ScopeInterface::SCOPE_STORE</argument>
Expand Down Expand Up @@ -186,7 +187,7 @@

<type name="Magento\Backend\Model\Config\Structure\Element\Iterator\Group" shared="false" />
<type name="Magento\Backend\Model\Config\Structure\Element\Group\Proxy" shared="false" />

<type name="Magento\Backend\Model\Config\Structure\Element\Dependency\Mapper" shared="false">
<arguments>
<argument name="fieldLocator" xsi:type="object">Magento\Backend\Model\Config\Structure\Search\Proxy</argument>
Expand Down
3 changes: 0 additions & 3 deletions app/code/Magento/Backend/etc/events.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,6 @@
*/
-->
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../lib/internal/Magento/Framework/Event/etc/events.xsd">
<event name="adminhtml_controller_action_predispatch_start">
<observer name="massaction" instance="Magento\Backend\Model\Observer" method="massactionPrepareKey" />
</event>
<event name="admin_user_authenticate_after">
<observer name="configuration_files_access_level_verification" instance="Magento\Backend\Model\Observer" method="clearCacheConfigurationFilesAccessLevelVerification" />
</event>
Expand Down
3 changes: 1 addition & 2 deletions app/code/Magento/Backend/etc/system.xsd
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@

<xs:complexType>
<xs:sequence>
<xs:choice minOccurs="2" maxOccurs="unbounded">
<xs:choice minOccurs="1" maxOccurs="unbounded">
<xs:element name="label" type="xs:string" />
<xs:element name="class" type="xs:string" />
<xs:element name="tab" type="typeTabId" />
Expand Down Expand Up @@ -144,7 +144,6 @@
<xs:element name="frontend_model" type="typeModel" />
<xs:element name="clone_model" type="typeModel" />
<xs:element name="clone_fields" type="xs:int" />
<xs:element name="expanded" type="xs:int" />
<xs:element name="help_url" type="typeUrl" />
<xs:element name="more_url" type="typeUrl" />
<xs:element name="demo_link" type="typeUrl" />
Expand Down
1 change: 0 additions & 1 deletion app/code/Magento/Backend/etc/system_file.xsd
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,6 @@
<xs:element name="frontend_model" type="typeModel" />
<xs:element name="clone_model" type="typeModel" />
<xs:element name="clone_fields" type="xs:int" />
<xs:element name="expanded" type="xs:int" />
<xs:element name="help_url" type="typeUrl" />
<xs:element name="more_url" type="typeUrl" />
<xs:element name="demo_link" type="typeUrl" />
Expand Down

This file was deleted.

67 changes: 0 additions & 67 deletions app/code/Magento/Bundle/Pricing/Price/BasePrice.php

This file was deleted.

3 changes: 2 additions & 1 deletion app/code/Magento/Bundle/Pricing/Price/BundleOptionPrice.php
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,8 @@ public function getOptions()
*/
public function getOptionSelectionAmount($selection)
{
$selectionPrice = $this->selectionFactory->create($this->product, $selection, $selection->getSelectionQty());
$selectionPrice = $this->selectionFactory
->create($this->product, $selection, $selection->getSelectionQty());
return $selectionPrice->getAmount();
}

Expand Down
Loading

0 comments on commit d895f13

Please sign in to comment.