Merge remote-tracking branch 'vanilla/develop' into MAGETWO-36407

Author: guz-anton

.php_cs

@@ -15,7 +15,6 @@ $finder = Symfony\CS\Finder\DefaultFinder::create()
     ->exclude('dev/tests/functional/vendor')
     ->exclude('dev/tests/integration/tmp')
     ->exclude('dev/tests/integration/var')
-    ->exclude('lib/internal/CardinalCommerce')
     ->exclude('lib/internal/Cm')
     ->exclude('lib/internal/Credis')
     ->exclude('lib/internal/JSMin')

CHANGELOG.md

@@ -1,3 +1,100 @@
+0.74.0-beta10
+=============
+* Framework improvements:
+    * Created Admin Login support into the Upgrade Setup Tool
+    * Added support for image types as custom attributes
+    * Added @api annotations to all classes that are considered as stable public APIs; marked public data interfaces with '@api'
+    * Defined Public API for modules: Catalog, CatalogRule, Msrp, UrlRewrite, CatalogUrlRewrite, CmsUrlRewrite, Sales, Quote, SalesRule, Captcha, Cms, Widget
+    * Created documentation and code samples for Sales & Checkout Module Integration APIs
+    * Increased code coverage of Integration module
+    * Fixed performance issues in unit tests
+    * Moved Sample Data install.php, dev/shell/cron.sh, performance-toolkit/generate.php, dependencies tools, and xmlUpdater to new bin/magento CLI
+    * Separated Config File (config.php) into Environmental and App configs
+    * Better validation of install and setup CLI commands
+    * Changed option names to use dashes in order to conform to naming convention
+* Code quality improvements:
+    * Removed unused classes in Magento\Reports module
+    * Overall unit test coverage was improved
+    * Replaced all functional tests which were not end-to-end with injectable test
+    * Replaced end-to-end test for automatic tax applying with injectable test
+    * Functional tests maintained
+    * Updated getElements method for Selenium Driver class in MTF
+    * Implemented mechanism of cleaning up all data after scenario execution
+    * Fixed integration testLayoutFilesTest
+* Design improvements:
+    * New look&feel for Collapsible Panels in backend
+    * New look&feel for System Warnings Pop-Ups in backend
+    * New look&feel for Grid Tables in backend
+* Various improvements:
+    * Implemented checkout UI rendering in browser
+    * Added exact image sizes provision in templates
+    * Added width and height attributes to Frontend logo
+    * Integrated JIT(Just In Time) plugin loader for Grunt.js
+    * Handling Invalid Less During PHP Compilation
+    * Enhanced PageCache invalidation
+    * Private data rendering in browser based on JSON data obtained from server side and kept in Local Storage instead of HTML obtained using AJAX PageCache action
+    * Refactor blocks on most frequently used pages (Catalog, CMS) to use new private data rendering mechanism
+    * Refactor blocks which can be added on any page (like widgets, banners) to use new private data rendering mechanism
+    * Default PageCache entries TTL value increased from 2 minutes to 24 hours
+    * Cache entries invalidation logging was introduced in order to simplify running of invalidation process
+* Fixed bugs:
+    * Fixed an issue where orders total report was not showing results grouped by day
+    * Fixed an issue with non-displaying Abandoned Carts report grid
+    * Fixed integration test failure in Reports GridTest
+    * Fixed an issue where fixed bundle product could not be created
+    * Fixed an issue where grouped product with quantity 0 was added to cart with quantity of 1
+    * Fixed an issue where versions tab was absent after publish CMS page
+    * Fixed an issue where shopping cart was empty after attempt to update it
+    * Fixed an issue where there was no redirect to shopping cart after EDIT/UPDATE cart product if custom options
+    * Fixed an issue where New Accounts report did not work
+    * Fixed bug when Admin user wasn't locked after exceeding maximum login failures attempts
+    * Fixed an issue where downloadable Product detailed info wasn't displayed in Cart & on Checkout
+    * Fixed an issue with wrong copyright year for store front
+    * Fixed: JSMinException when deploying static files in production mode with minification enabled
+    * Fixed: Overlapped FPT Attribute in Mini Shopping Cart
+    * Fixed: View of current item for Customer menu tabs
+    * Fixed an issue where status label was not refreshed when disabling/enabling cache
+    * Fixed an issue where Success Page of Web Setup did not show https
+    * Fixed an issue with irrelevant/unused template
+    * Fixed an issue where static content running setup:static-content:deploy with language code {a-Z}{a-Z}{a-Z} couldn't be generated
+    * [Usability] Output from language, and timezone help commands is alphabetized
+    * Fixed an issue with two identical IdentityInterface definitions in code base.
+    * Fixed an issue where default value of timezone in installer was not correct
+    * Fixed an issue where bank Transfer payment instructions were not displayed
+    * Fixed an issue when New Accounts report did not work
+    * Fixed an issue when New Accounts report showed invalid data
+    * Fixed an issue with Exception in setup wizard after Magento is installed
+    * Fixed visual misfits for Custom Options on "edit Bundle Product" Frontend page
+    * Fixed broken layout for configurable variations when changing from pricing measure from $ to %
+    * Fixed widget UI issues on Frontend
+    * Fixed an issue with Float button bar on Backend
+    * Fixed UI issue shown in ACL Resource Tree
+    * Fixed an issue where it was not possible to place order on frontend using secure urls
+    * Fixed an issue with wrong behaviour for save new shipping address during checkout
+    * Fixed an issue with customers information leak via Checkout
+    * Fixed an issue where users could not login to Magento admin & front on HipHop Virtual Machine
+    * Fixed an issue where product Options details were not shown in Mini Cart
+    * Fixed an issue where Create Permanent Redirect check-box was inactive on Edit Category page
+    * Fixed an issue where it was impossible to perform product mass update
+    * Fixed an issue where category redirect was absent after update category url
+* Github issues:
+    * [#566](https://github.com/magento/magento2/issues/566) -- Fulltext search index: slow query in resetSearchResults()
+    * [#1269](https://github.com/magento/magento2/issues/1269) -- Magento dashboard revenue ,shipping ,qty,tax all are 0.
+    * [#1200](https://github.com/magento/magento2/issues/1200) -- I'm not getting default values (name & email) in contact form when i logged in
+    * [#1087](https://github.com/magento/magento2/pull/1087) -- Check for select and multiselect to ignore corrupted attributes
+    * [#1268](https://github.com/magento/magento2/issues/1268) -- Dist front: search is broken
+    * [#1195](https://github.com/magento/magento2/pull/1195) -- Use table alias for qty field
+    * [#1274](https://github.com/magento/magento2/pull/1274) -- CatalogImportExport validation
+    * [#1233](https://github.com/magento/magento2/issues/1233) -- Wrong message when moving a category
+    * [#1040](https://github.com/magento/magento2/issues/1040) -- Required date validation on Magento2 Backend
+    * [#1246](https://github.com/magento/magento2/issues/1246) -- How to load product store wise?
+    * [#1222](https://github.com/magento/magento2/issues/1222) -- Sku attribute save error
+    * [#1237](https://github.com/magento/magento2/issues/1237) -- Category admin reset button does nothing
+    * [#1046](https://github.com/magento/magento2/issues/1046) -- Two equal files
+    * [#1282](https://github.com/magento/magento2/pull/1282), [#1285](https://github.com/magento/magento2/pull/1285) -- Fix broken link in CHANGELOG.md
+    * [#1223](https://github.com/magento/magento2/issues/1223) -- Store config re-encrypt encrypted values on save
+    * [#1242](https://github.com/magento/magento2/issues/1242) -- Eclipse pdt validator error
+
 0.74.0-beta9
 =============
 * Framework improvements
@@ -9,7 +106,7 @@
     * Refactored controller actions in the Product area
     * Moved commands cache.php, indexer.php, log.php, test.php, compiler.php, singletenant\_compiler.php, generator.php, pack.php, deploy.php and file\_assembler.php to the new bin/magento CLI framework
 * Data Migration Tool
-    * The Data Migraiton Tool is published in the separate [repository](https://github.com/magento/data-migration-tool-ce, "Data Migration Tool repository")
+    * The Data Migraiton Tool is published in the separate [repository](https://github.com/magento/data-migration-tool-ce "Data Migration Tool repository")
 * Fixed bugs
     * Fixed an issue where error appeared during placing order with virtual product
     * Fixed an issue where billing and shipping sections didn't contain address information on order print

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-beta9",
-        "magento/module-backend": "0.74.0-beta9",
-        "magento/module-media-storage": "0.74.0-beta9",
-        "magento/framework": "0.74.0-beta9",
+        "magento/module-store": "0.74.0-beta10",
+        "magento/module-backend": "0.74.0-beta10",
+        "magento/module-media-storage": "0.74.0-beta10",
+        "magento/framework": "0.74.0-beta10",
         "lib-libxml": "*",
         "magento/magento-composer-installer": "*"
     },
     "type": "magento2-module",
-    "version": "0.74.0-beta9",
+    "version": "0.74.0-beta10",
     "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-beta9",
-        "magento/framework": "0.74.0-beta9",
+        "magento/module-backend": "0.74.0-beta10",
+        "magento/framework": "0.74.0-beta10",
         "magento/magento-composer-installer": "*"
     },
     "type": "magento2-module",
-    "version": "0.74.0-beta9",
+    "version": "0.74.0-beta10",
     "license": [
         "OSL-3.0",
         "AFL-3.0"

app/code/Magento/Backend/Test/Unit/App/UserConfigTest.php

@@ -10,7 +10,7 @@ class UserConfigTest extends \PHPUnit_Framework_TestCase
 {
     public function testUserRequestCreation()
     {
-        $factoryMock = $this->getMock('Magento\Config\Model\Config\Factory', [], [], '', false);
+        $factoryMock = $this->getMock('Magento\Config\Model\Config\Factory', ['create'], [], '', false);
         $responseMock = $this->getMock('Magento\Framework\App\Console\Response', [], [], '', false);
         $configMock = $this->getMock('Magento\Config\Model\Config', [], [], '', false);
 

app/code/Magento/Backend/Test/Unit/Model/Session/QuoteTest.php

@@ -177,7 +177,7 @@ protected function setUp()
         );
         $this->orderFactoryMock = $this->getMock(
             'Magento\Sales\Model\OrderFactory',
-            [],
+            ['create'],
             [],
             '',
             false

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-beta9",
-        "magento/module-directory": "0.74.0-beta9",
-        "magento/module-developer": "0.74.0-beta9",
-        "magento/module-eav": "0.74.0-beta9",
-        "magento/module-cron": "0.74.0-beta9",
-        "magento/module-theme": "0.74.0-beta9",
-        "magento/module-reports": "0.74.0-beta9",
-        "magento/module-sales": "0.74.0-beta9",
-        "magento/module-quote": "0.74.0-beta9",
-        "magento/module-catalog": "0.74.0-beta9",
-        "magento/module-user": "0.74.0-beta9",
-        "magento/module-backup": "0.74.0-beta9",
-        "magento/module-customer": "0.74.0-beta9",
-        "magento/module-translation": "0.74.0-beta9",
-        "magento/module-require-js": "0.74.0-beta9",
-        "magento/module-config": "0.74.0-beta9",
-        "magento/framework": "0.74.0-beta9",
+        "magento/module-store": "0.74.0-beta10",
+        "magento/module-directory": "0.74.0-beta10",
+        "magento/module-developer": "0.74.0-beta10",
+        "magento/module-eav": "0.74.0-beta10",
+        "magento/module-cron": "0.74.0-beta10",
+        "magento/module-theme": "0.74.0-beta10",
+        "magento/module-reports": "0.74.0-beta10",
+        "magento/module-sales": "0.74.0-beta10",
+        "magento/module-quote": "0.74.0-beta10",
+        "magento/module-catalog": "0.74.0-beta10",
+        "magento/module-user": "0.74.0-beta10",
+        "magento/module-backup": "0.74.0-beta10",
+        "magento/module-customer": "0.74.0-beta10",
+        "magento/module-translation": "0.74.0-beta10",
+        "magento/module-require-js": "0.74.0-beta10",
+        "magento/module-config": "0.74.0-beta10",
+        "magento/framework": "0.74.0-beta10",
         "magento/magento-composer-installer": "*"
     },
     "type": "magento2-module",
-    "version": "0.74.0-beta9",
+    "version": "0.74.0-beta10",
     "license": [
         "OSL-3.0",
         "AFL-3.0"

app/code/Magento/Backend/view/adminhtml/layout/default.xml

@@ -42,9 +42,6 @@
         <referenceContainer name="page.formkey">
             <block class="Magento\Backend\Block\Admin\Formkey" name="formkey" as="formkey" template="Magento_Backend::admin/formkey.phtml"/>
         </referenceContainer>
-        <referenceContainer name="page.js.translate">
-            <block class="Magento\Framework\View\Element\Template" name="js_translate" as="js_translate" template="Magento_Backend::page/js/translate.phtml"/>
-        </referenceContainer>
         <referenceContainer name="main.top">
             <block class="Magento\Theme\Block\Html\Title" name="page.title" template="title.phtml"/>
         </referenceContainer>

app/code/Magento/Backend/view/adminhtml/templates/page/js/translate.phtml

@@ -94,6 +94,7 @@ public function setUp()
             ->getMock();
         $this->backupModelFactoryMock = $this->getMockBuilder('Magento\Backup\Model\BackupFactory')
             ->disableOriginalConstructor()
+            ->setMethods(['create'])
             ->getMock();
         $this->backupModelMock = $this->getMockBuilder('Magento\Backup\Model\Backup')
             ->disableOriginalConstructor()