Merge remote-tracking branch 'mainline/develop' into MAGETWO-36888

Author: vkholoshenko

.travis.yml

@@ -4,7 +4,8 @@ php:
   - 5.6
 env:
   - TEST_SUITE=unit
-  - TEST_SUITE=integration
+  - TEST_SUITE=integration_part_1
+  - TEST_SUITE=integration_part_2
   - TEST_SUITE=integration_integrity
   - TEST_SUITE=static_phpcs
   - TEST_SUITE=static_annotation
@@ -32,7 +33,7 @@ before_script:
   - echo '' > ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/xdebug.ini
   # Install MySQL 5.6, create DB for integration tests
   - >
-      sh -c "if [ '$TEST_SUITE' = 'integration' ] || [ '$TEST_SUITE' = 'integration_integrity' ]; then
+      sh -c "if [ '$TEST_SUITE' = 'integration_part_1' ] || [ '$TEST_SUITE' = 'integration_part_2' ] || [ '$TEST_SUITE' = 'integration_integrity' ]; then
       sudo apt-get remove --purge mysql-common mysql-server-5.5 mysql-server-core-5.5 mysql-client-5.5 mysql-client-core-5.5;
       sudo apt-get autoremove;
       sudo apt-get autoclean;
@@ -50,10 +51,12 @@ script:
   # Unit tests
   - sh -c "if [ '$TEST_SUITE' = 'unit' ]; then ./vendor/bin/phpunit -c dev/tests/unit/phpunit.xml.dist; fi"
   # Integration tests
-  - sh -c "if [ '$TEST_SUITE' = 'integration' ]; then cd dev/tests/integration/; ./../../../vendor/bin/phpunit -c phpunit.xml.dist; fi"
+  - sh -c "if [ '$TEST_SUITE' = 'integration_part_1' ] || [ '$TEST_SUITE' = 'integration_part_2' ]; then cd dev/tests/integration/; bash IntegationTestsForTravis.sh 2; fi"
+  - sh -c "if [ '$TEST_SUITE' = 'integration_part_1' ]; then cd dev/tests/integration/; ./../../../vendor/bin/phpunit -c phpunit.xml.travis1; fi"
+  - sh -c "if [ '$TEST_SUITE' = 'integration_part_2' ]; then cd dev/tests/integration/; ./../../../vendor/bin/phpunit -c phpunit.xml.travis2; fi"
   # Integration integrity tests
   - sh -c "if [ '$TEST_SUITE' = 'integration_integrity' ]; then cd dev/tests/integration/; ./../../../vendor/bin/phpunit -c phpunit.xml.dist testsuite/Magento/Test/Integrity; fi"
   # Static tests [Code Style]
   - sh -c "if [ '$TEST_SUITE' = 'static_phpcs' ]; then cd dev/tests/static; ./../../../vendor/bin/phpunit -c phpunit.xml.dist --filter 'Magento\\\\Test\\\\Php\\\\LiveCodeTest::testCodeStyle'; fi"
   # Static tests [Code Style]
-  - sh -c "if [ '$TEST_SUITE' = 'static_annotation' ]; then cd dev/tests/static; ./../../../vendor/bin/phpunit -c phpunit.xml.dist --filter 'Magento\\\\Test\\\\Php\\\\LiveCodeTest::testAnnotationStandard'; fi"
+  - sh -c "if [ '$TEST_SUITE' = 'static_annotation' ]; then cd dev/tests/static; ./../../../vendor/bin/phpunit -c phpunit.xml.dist --filter 'Magento\\\\Test\\\\Php\\\\LiveCodeTest::testAnnotationStandard'; fi"

CHANGELOG.md

@@ -1,3 +1,66 @@
+0.74.0-beta13
+=============
+* Framework improvements:
+    * Created Join Directive, Join Process for Tables, XML Config support to define a performance join for search services
+    * Added support of field weighting for MySQL Search Engine
+    * Modified indexer declaration to support field declaration
+    * Model related methods and properties are removed from Magento Object
+* Various improvements:
+    * Added supporting of lost product types for Product Import/Export
+    * Improved performance of Product Import/Export
+    * Implemented Payment\Gateway infrastructure as a new design for payment methods
+    * Fixed messages in Setup CLI
+    * JS Smart fixed scroll
+    * Improved sub-menu animation and sub-menu links mouse event effects
+    * Automated UI Documentation build process with Grunt.js
+    * Updated composer dependency to newer version
+    * Implemented direct web link on Magento order transactions records
+* Tests:
+    * Reduced Travis CI integration test time
+    * Increased test coverage for the Integration module
+    * Re-structured unit tests for the updater app to follow the convention used by the rest of Magento code
+* Fixed Bugs:
+    * Fixed Help links in Install Wizard
+    * Fixed an issue where composer install failed since ext-xsl was not available
+    * Fixed web installer on HHVM
+    * Fixed broken links to static assets when error occurs
+    * Fixed failed integration tests on Travis CI builds
+    * Fixed an issue where menu with one sub-menu item not being displayed
+    * Fixed an issue where IPN messages did not show relevant info about transaction
+    * Fixed an issue where Magento\Framework\Data\Form did not accept data-mage-init parameter
+    * Fixed an issue where not all specified "Multiple Select" Bundle options were added to Shopping Cart
+    * Fixed ConfigureProductInCustomerWishlistOnBackendTest functional test
+    * Fixed an issue with all mandatory fields in the Sales data interfaces
+    * Fixed an issue where billing and shipping sections did not contain address information on order print from Guest
+    * Fixed an issue where orders placed in different store views had duplicated IDs
+    * Fixed an issue where Shopping Cart Price Rules were not applying properly for Bundled products
+    * Fixed an issue where column coupon_rule_name was not filled in the sales_order table when you create the order
+    * Fixed an issue where customer registration or login on frontend created an empty cart
+    * Fixed an issue where Product Model sometimes values change in getters methods
+    * Fixed an issue where deleting option through API service for configurable product did not unlink variations
+    * Fixed an issue where there was no ability to place order using multishipping if cart contained virtual product
+    * Fixed an issue where "Terms and Conditions" was absent on order review step
+    * Fixed an issue where grid actions for "Shopping Cart Items" grid was absent in Customer Account (Backend)
+    * Fixed XSS vulnerability in Magento "Add to cart" link
+    * Fixed UI issues on view order info frontend pages for guest customer
+    * Fixed an issue where "Currency Rates" backend form was displayed broken
+    * Fixed an issue where padding was missed for Custom Price Checkbox on "Create Order" Backend page
+    * Fixed an issue where "Choose Variation" buttons lost alignment on "Create Configurable Product" Backend page
+    * Fixed an issue where "Date & Time" Custom option was displayed broken on "Create Order" Backend page
+    * Fixed an issue where colon was displayed before every Product Attribute label on Frontend
+    * Fixed an issue where record from url_rewrite table was not removed when CMS page deleted
+    * Fixed an issue where widget option "Number of Products to Display" did not work
+    * Fixed validation message issues for CMS pages
+    * Fixed an issue where "Click for Price" link was displayed in widgets for product with "Display Actual Price" != "On Gesture" MAP setting
+    * Fixed an issue where Form_key cookie was not listed in privacy page
+    * Fixed an issue where merchant wasn’t redirected to correspondent option when trying to enable Dashboard charts
+    * Fixed an issue where wrong message was displayed after exceeding maximum failed login attempts
+* GitHub issues:
+    * [#1292](https://github.com/magento/magento2/pull/1292) Admin menu with 1 submenu item does not show the subitem
+    * [#1133](https://github.com/magento/magento2/pull/1133) Getter methods shouldn't change values
+    * [#1263](https://github.com/magento/magento2/issues/1263) "We don't have as many "product name" as you requested" not showing in mini cart
+    * [#1284](https://github.com/magento/magento2/issues/1284) Order tracking link redirected to dashboard in admin
+
 0.74.0-beta12
 =============
 * MTF Improvements:
@@ -2589,7 +2652,7 @@
   * Canadian provincial sales taxes
   * Fixed issues with bundle product price inconsistency across the system
   * Added warnings if invalid tax configuration is created in the Admin panel
-  * Fixed issues with regards to hidden tax
+  * Fixed issues with regards to discount tax compensation
 * Fixed bugs:
   * Fixed an issue where grouped price was not applied for grouped products
   * Fixed an issue where a fatal error occurred when opening a grouped product page without assigned products on the frontend

app/code/Magento/AdminNotification/composer.json

@@ -3,15 +3,15 @@
     "description": "N/A",
     "require": {
         "php": "~5.5.0|~5.6.0",
-        "magento/module-store": "0.74.0-beta12",
-        "magento/module-backend": "0.74.0-beta12",
-        "magento/module-media-storage": "0.74.0-beta12",
-        "magento/framework": "0.74.0-beta12",
+        "magento/module-store": "0.74.0-beta13",
+        "magento/module-backend": "0.74.0-beta13",
+        "magento/module-media-storage": "0.74.0-beta13",
+        "magento/framework": "0.74.0-beta13",
         "lib-libxml": "*",
         "magento/magento-composer-installer": "*"
     },
     "type": "magento2-module",
-    "version": "0.74.0-beta12",
+    "version": "0.74.0-beta13",
     "license": [
         "OSL-3.0",
         "AFL-3.0"

app/code/Magento/Authorization/composer.json

@@ -3,12 +3,12 @@
     "description": "Authorization module provides access to Magento ACL functionality.",
     "require": {
         "php": "~5.5.0|~5.6.0",
-        "magento/module-backend": "0.74.0-beta12",
-        "magento/framework": "0.74.0-beta12",
+        "magento/module-backend": "0.74.0-beta13",
+        "magento/framework": "0.74.0-beta13",
         "magento/magento-composer-installer": "*"
     },
     "type": "magento2-module",
-    "version": "0.74.0-beta12",
+    "version": "0.74.0-beta13",
     "license": [
         "OSL-3.0",
         "AFL-3.0"

app/code/Magento/Backend/Block/Menu.php

@@ -455,28 +455,14 @@ public function renderNavigation($menu, $level = 0, $limit = 0, $colBrakes = [])
             }
 
             $id = $this->getJsId($menuItem->getId());
-            if (count($menu) > 1 || $level != 1) {
-                $output .= '<li ' . $this->getUiId(
-                        $menuItem->getId()
-                    ) . ' class="item-' . $itemClass . ' ' . $this->_renderItemCssClass(
-                        $menuItem,
-                        $level
-                    ) . ($level == 0 ? '" id="' . $id . '" aria-haspopup="true' : '')
-                    . '" role="menu-item">' . $this->_renderAnchor(
-                        $menuItem,
-                        $level
-                    ) . $this->_addSubMenu(
-                        $menuItem,
-                        $level,
-                        $limit,
-                        $id
-                    ) . '</li>';
+            $subMenu = $this->_addSubMenu($menuItem, $level, $limit, $id);
+            if (count($menu) > 1 || $level != 1 || $menuItem->getUrl() !== '#') {
+                $output .= '<li ' . $this->getUiId($menuItem->getId())
+                    . ' class="item-' . $itemClass . ' ' . $this->_renderItemCssClass($menuItem, $level)
+                    . ($level == 0 ? '" id="' . $id . '" aria-haspopup="true' : '')
+                    . '" role="menu-item">' . $this->_renderAnchor($menuItem, $level) . $subMenu . '</li>';
             } else {
-                $output .= $this->_addSubMenu(
-                    $menuItem,
-                    $level,
-                    $limit,
-                    $id);
+                $output .= $subMenu;
             }
 
             $itemPosition++;

app/code/Magento/Backend/Block/Widget/Button/Item.php

@@ -16,4 +16,25 @@
  */
 class Item extends \Magento\Framework\Object
 {
+    /**
+     * Object delete flag
+     *
+     * @var bool
+     */
+    protected $_isDeleted = false;
+
+    /**
+     * Set _isDeleted flag value (if $isDeleted parameter is defined) and return current flag value
+     *
+     * @param boolean $isDeleted
+     * @return bool
+     */
+    public function isDeleted($isDeleted = null)
+    {
+        $result = $this->_isDeleted;
+        if ($isDeleted !== null) {
+            $this->_isDeleted = $isDeleted;
+        }
+        return $result;
+    }
 }

app/code/Magento/Backend/Block/Widget/Form.php

@@ -111,6 +111,13 @@ public function setForm(\Magento\Framework\Data\Form $form)
         $this->_form = $form;
         $this->_form->setParent($this);
         $this->_form->setBaseUrl($this->_urlBuilder->getBaseUrl());
+
+        $customAttributes = $this->getData('custom_attributes');
+        if (is_array($customAttributes)) {
+            foreach ($customAttributes as $key => $value) {
+                $this->_form->addCustomAttribute($key, $value);
+            }
+        }
         return $this;
     }
 

app/code/Magento/Backend/Test/Unit/Block/Widget/FormTest.php

@@ -0,0 +1,104 @@
+<?php
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Backend\Test\Unit\Block\Widget;
+
+use Magento\Backend\Block\Template\Context;
+use Magento\Backend\Block\Widget\Form;
+use Magento\Framework\Data\Form as DataForm;
+use Magento\Framework\UrlInterface;
+
+class FormTest extends \PHPUnit_Framework_TestCase
+{
+    /** @var  Form */
+    protected $model;
+
+    /** @var  Context |\PHPUnit_Framework_MockObject_MockObject */
+    protected $context;
+
+    /** @var  DataForm |\PHPUnit_Framework_MockObject_MockObject */
+    protected $dataForm;
+
+    /** @var  UrlInterface |\PHPUnit_Framework_MockObject_MockObject */
+    protected $urlBuilder;
+
+    protected function setUp()
+    {
+        $this->prepareContext();
+
+        $this->dataForm = $this->getMockBuilder('Magento\Framework\Data\Form')
+            ->disableOriginalConstructor()
+            ->setMethods([
+                'setParent',
+                'setBaseUrl',
+                'addCustomAttribute',
+            ])
+            ->getMock();
+
+        $this->model = new Form(
+            $this->context
+        );
+    }
+
+    protected function prepareContext()
+    {
+        $this->urlBuilder = $this->getMockBuilder('Magento\Framework\UrlInterface')
+            ->getMock();
+
+        $this->context = $this->getMockBuilder('Magento\Backend\Block\Template\Context')
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->context->expects($this->any())
+            ->method('getUrlBuilder')
+            ->willReturn($this->urlBuilder);
+    }
+
+    public function testSetForm()
+    {
+        $baseUrl = 'base_url';
+        $attributeKey = 'attribute_key';
+        $attributeValue = 'attribute_value';
+
+        $this->dataForm->expects($this->once())
+            ->method('setParent')
+            ->with($this->model)
+            ->willReturnSelf();
+        $this->dataForm->expects($this->once())
+            ->method('setBaseUrl')
+            ->with($baseUrl)
+            ->willReturnSelf();
+        $this->dataForm->expects($this->once())
+            ->method('addCustomAttribute')
+            ->with($attributeKey, $attributeValue)
+            ->willReturnSelf();
+
+        $this->urlBuilder->expects($this->once())
+            ->method('getBaseUrl')
+            ->willReturn($baseUrl);
+
+        $this->model->setData('custom_attributes', [$attributeKey => $attributeValue]);
+        $this->assertEquals($this->model, $this->model->setForm($this->dataForm));
+    }
+
+    public function testSetFormNoCustomAttributes()
+    {
+        $baseUrl = 'base_url';
+
+        $this->dataForm->expects($this->once())
+            ->method('setParent')
+            ->with($this->model)
+            ->willReturnSelf();
+        $this->dataForm->expects($this->once())
+            ->method('setBaseUrl')
+            ->with($baseUrl)
+            ->willReturnSelf();
+
+        $this->urlBuilder->expects($this->once())
+            ->method('getBaseUrl')
+            ->willReturn($baseUrl);
+
+        $this->assertEquals($this->model, $this->model->setForm($this->dataForm));
+    }
+}

app/code/Magento/Backend/composer.json

@@ -3,27 +3,27 @@
     "description": "N/A",
     "require": {
         "php": "~5.5.0|~5.6.0",
-        "magento/module-store": "0.74.0-beta12",
-        "magento/module-directory": "0.74.0-beta12",
-        "magento/module-developer": "0.74.0-beta12",
-        "magento/module-eav": "0.74.0-beta12",
-        "magento/module-cron": "0.74.0-beta12",
-        "magento/module-theme": "0.74.0-beta12",
-        "magento/module-reports": "0.74.0-beta12",
-        "magento/module-sales": "0.74.0-beta12",
-        "magento/module-quote": "0.74.0-beta12",
-        "magento/module-catalog": "0.74.0-beta12",
-        "magento/module-user": "0.74.0-beta12",
-        "magento/module-backup": "0.74.0-beta12",
-        "magento/module-customer": "0.74.0-beta12",
-        "magento/module-translation": "0.74.0-beta12",
-        "magento/module-require-js": "0.74.0-beta12",
-        "magento/module-config": "0.74.0-beta12",
-        "magento/framework": "0.74.0-beta12",
+        "magento/module-store": "0.74.0-beta13",
+        "magento/module-directory": "0.74.0-beta13",
+        "magento/module-developer": "0.74.0-beta13",
+        "magento/module-eav": "0.74.0-beta13",
+        "magento/module-cron": "0.74.0-beta13",
+        "magento/module-theme": "0.74.0-beta13",
+        "magento/module-reports": "0.74.0-beta13",
+        "magento/module-sales": "0.74.0-beta13",
+        "magento/module-quote": "0.74.0-beta13",
+        "magento/module-catalog": "0.74.0-beta13",
+        "magento/module-user": "0.74.0-beta13",
+        "magento/module-backup": "0.74.0-beta13",
+        "magento/module-customer": "0.74.0-beta13",
+        "magento/module-translation": "0.74.0-beta13",
+        "magento/module-require-js": "0.74.0-beta13",
+        "magento/module-config": "0.74.0-beta13",
+        "magento/framework": "0.74.0-beta13",
         "magento/magento-composer-installer": "*"
     },
     "type": "magento2-module",
-    "version": "0.74.0-beta12",
+    "version": "0.74.0-beta13",
     "license": [
         "OSL-3.0",
         "AFL-3.0"

app/code/Magento/Backup/Model/Resource/Db.php

@@ -124,7 +124,6 @@ public function getTableStatus($tableName)
 
         if ($row) {
             $statusObject = new \Magento\Framework\Object();
-            $statusObject->setIdFieldName('name');
             foreach ($row as $field => $value) {
                 $statusObject->setData(strtolower($field), $value);
             }