Merge remote-tracking branch 'magento2/develop' into MAGETWO-36095

Conflicts:
	app/code/Magento/Cms/Api/BlockRepositoryInterface.php
	app/code/Magento/Cms/Api/Data/BlockInterface.php
	app/code/Magento/Cms/Api/Data/BlockSearchResultsInterface.php
	app/code/Magento/Cms/Api/Data/PageInterface.php
	app/code/Magento/Cms/Api/Data/PageSearchResultsInterface.php
	app/code/Magento/Cms/Api/PageRepositoryInterface.php

Author: Dooffy

.gitignore

@@ -10,6 +10,7 @@ atlassian*
 /.gitattributes
 /app/config_sandbox
 /app/etc/config.php
+/app/etc/env.php
 /app/code/Magento/TestModule*
 /lib/internal/flex/uploader/.actionScriptProperties
 /lib/internal/flex/uploader/.flexProperties
@@ -37,6 +38,7 @@ atlassian*
 !/pub/media/wysiwyg/.htaccess
 /pub/media/tmp/*
 !/pub/media/tmp/.htaccess
+/pub/media/captcha/*
 /pub/static/*
 !/pub/static/.htaccess
 

.htaccess

@@ -188,4 +188,4 @@
 ## If running in cluster environment, uncomment this
 ## http://developer.yahoo.com/performance/rules.html#etags
 
-    #FileETag none
+    #FileETag none

CHANGELOG.md

@@ -1,36 +1,168 @@
+0.74.0-beta8
+=============
+* Performance Toolkit improvements
+    * Added order generator
+    * Added indexer mode switcher via profile config
+* UI Improvements
+    * Added hide/show columns for CMS pages/blocks grid on backend
+    * Updated the multi-select functionality & UI for CMS pages/blocks grid on backend
+    * Added the new look & feel for Edit Order Page (view/edit order)
+* Framework Improvements
+    * Updated API framework to support different integration object ACLs
+    * Updated unit and integration tests config files to include tests from the Updater Application
+    * Exceptions caught and logged before reaching Phrase::__toString() method
+* MTF Improvements
+    * Replaced end-to-end One-page Checkout test with online shipment methods with scenario test
+    * Replaced end-to-end Layered Navigation test with injectable test
+    * Replaced end-to-end Shopping Cart price rule test with injectable test
+    * Replaced end-to-end Switch Currency test with injectable test
+    * Fixed the filling condition element
+    * Updated a set of functional tests
+* Various
+    * Eliminated functional logic in constructors
+    * Updated public API definitions
+    * Added information for Downloadable Products to Catalog Product Data Object
+    * Added information for Catalog Inventory data to Catalog Product Data Object
+    * Added information for Grouped Products to Catalog Product Data Object
+    * Added information for Configurable Products to Catalog Product Data Object
+    * Cleaned Tax API data interfaces
+    * Removed OptionTypesListInterface and type field in OptionInterface
+* Fixed bugs
+    * Fixed an issue with focus state appearing on click event in Admin Menu logo.
+    * Fixed an issue where order was placed via Payflow link without providing credit card data
+    * Fixed an issue where titles were displayed for backend navigation menu group when it only contained a single section
+    * Fixed an issue where REST URL paths were not case-sensitive
+    * Implement transparent redirect API
+    * Fixed an issue in cron.php with checking for functions which are disabled in php.ini
+    * Front-end development workflow settings scope changed to Global
+    * Fixed an issue with widget title escape
+    * Fixed the filename filtering
+    * Fixed an issue with universal fatal error in the profiler option #2
+    * Fixed an issue when shipping address in backend could not be changed when creating order
+    * Fixed the performance issue with tax rules creation
+    * The extended attributes became optional
+    * Fixed an issue where final price did not recalculate when option was selected
+    * Fixed an issue with price currency symbols
+    * Fixed an issue when low_stock_date showed incorrect data
+    * Fixed an issue with random integration test failure
+* GitHub issues
+    * [#526] (https://github.com/magento/magento2/issues/526) -- Area Sessions: Magento 2 Should not Allow "area-less" Sessions During an Area Aware Request
+    * [#1212] (https://github.com/magento/magento2/issues/1212) -- Magento 2 0.74.0-beta5 unable to open home page after successful installation
+    * [#1213] (https://github.com/magento/magento2/issues/1213) -- Magento 2 0.74.0-beta6 unable to open home page right after successful installation
+    * [#1157] (https://github.com/magento/magento2/issues/1157) -- Something went wrong with the subscription
+    * [#1228] (https://github.com/magento/magento2/issues/1228) -- PDOException during attempt to export products: Unknown column 'entity_value.entity_type_id' in 'on clause’
+
+0.74.0-beta7
+=============
+* Framework improvements
+    * Exceptions are caught and logged before reaching the Phrase::__toString() method
+    * Refactored controller actions in the Checkout area
+    * Refactored controller actions in the Tax area
+    * Implemented new look & feel for the Edit Order page (View/Edit Order)
+    * Replaced the end-to-end test for Onepage Checkout with online shipment methods with the scenario test
+* Fixed bugs
+    * Fixed an issue where a success message was absent when adding a product with options from Wishlist to Shopping Cart
+    * Fixed an issue where an exception was thrown when trying to sort Customer Groups by Tax Class
+    * Fixed an issue where the background color changed to the “on focus” state when clicking  the Admin Menu logo
+    * Fixed an issue with Mini Shopping Cart containing extra empty space
+* GitHub issues
+    * [#1173] (https://github.com/magento/magento2/pull/1173) -- Change to HttpClient4 from Java client; fix regex issues
+    * [#1185] (https://github.com/magento/magento2/pull/1185) -- Error message for duplicated phrases not allowed in Generator.php
+    * [#1199] (https://github.com/magento/magento2/pull/1199) -- Add Event for sales_order_state_change_before during Order->saveState()
+    * [#1201] (https://github.com/magento/magento2/pull/1101) -- Add customer_validate event
+    * [#1202] (https://github.com/magento/magento2/pull/1102) -- Email sending events
+
+0.74.0-beta6
+=============
+* Framework improvements
+    * Implemented a default exception handler for blocks
+    * Updated the root composer.json file
+    * Updated the setup tool to support different editions
+    * Added an ability to operate with Sales & Checkout APIs as guests and registered users
+    * Implemented the additional Sales & Checkout APIs for registered customers and guests
+    * Added unit tests to cover Sales & Checkout services code
+* Various
+    * Standardized the hierarchy of exceptions
+    * Added bundle product API integration to Catalog
+* Fixed bugs
+    * Fixed an issue where it was impossible to place an order using multiple address checkout
+    * Fixed an issue where DB timestamp columns with current_timestamp on update were not handled correctly
+    * Fixed an issue with FPT in partial invoices
+    * Fixed a performance issue in benchmark test
+    * Fixed the incorrect Exception class in the Magento_CurrencySymbol module
+    * Fixed an issue by letting MySQL determine a database table type instead of MyISAM
+    * Fixed an issue where test failures occurred when the database and the application were in different time zones
+    * Fixed an issue where \Magento\Framework\Phrase omitted placeholder values if no renderer was set
+
+0.74.0-beta5
+=============
+* Various
+    * Added the new methods/fields in the Catalog Product Data Object
+    * Improved the Nginx configuration sample file for better web-server responsiveness and security
+    * Implemented the new look & feel for Create New Order page
+    * Removed the redundant DB constraints for cascade operations related to order management
+    * Implemented the mechanism of asynchronous email notifications after creation of Orders, Invoices, Shipments and Credit Memos
+    * Moved the join logic on application level in order to make DB separation possible in Reports component
+    * Implemented the TTL and event approaches of cache invalidation, introduced the full and the partial Varnish Cache flush
+    * Moved all Setup commands to Magento CLI
+    * Exposed CMS API as Web API
+* Fixed bugs:
+    * Unexpected response for API "/V1/customers/password" service
+    * Can’t include a third-party link to frontend section via layout
+    * Specified details for Grouped product are lost after adding to wishlist
+    * Impossible to configure products in customer wishlist in Admin Panel
+    * Adding the product from wishlist to cart if more than one store view exists
+    * Specified product field custom options is not displayed in wishlist in Admin Panel
+    * Checkout doesn't work with JS bundling enabled in production mode
+    * Issue with price excluding tax when selecting downloadable links
+    * Undefined index warning in case the frontend cache information is missing in configuration file
+    * "New Order" email is not sent to customer after placing order via API service
+    * 503 error when placing order with multiple shipping addresses if mail transport doesn't exist
+    * Broken words for fields with long labels all over the Admin Panel
+    * Issue with saving 'is_virtual' flag in quote
+    * "Void" button available after "Deny Payment" operation
+    * Uninstall logic did not clean cache properly
+    * Obsolete code tests did not cover Tests folders
+    * Random fail of Magento\Log\Test\Unit\Model\VisitorTest
+* GitHub issues:
+   * [#1149] (https://github.com/magento/magento2/issues/1149) -- Checkout Grand Total amount miscalculation
+   * [#1165] (https://github.com/magento/magento2/pull/1165) -- Fix typos
+   * [#1182] (https://github.com/magento/magento2/pull/1182) -- Update system.xml for 'fix' sortOrder in adminhtml
+   * [#1186] (https://github.com/magento/magento2/pull/1186) -- SalesSequence: Fixed composer installer dependency
+
 0.74.0-beta4
 =============
 * Various
-   * Implemented the getDefaultResult method, to be able to catch exceptions in FrontController and redirect user to the correct page
-   * The getDefaultResult method is invoked to return default result of action execution within controllers. It can be used to generate the ‘execute’ method result in action controllers
-   * Eliminated the unused exceptions. Exceptions that weren't linked to any logic were also eliminated and replaced with LocalizedException or its child classes
-   * Refactored all controllers where possible: the default exception handling logic moved to FrontController. Controllers that cannot be refactored do not conflict with the new logic
+    * Implemented the getDefaultResult method, to be able to catch exceptions in FrontController and redirect user to the correct page
+    * The getDefaultResult method is invoked to return default result of action execution within controllers. It can be used to generate the ‘execute’ method result in action controllers
+    * Eliminated the unused exceptions. Exceptions that weren't linked to any logic were also eliminated and replaced with LocalizedException or its child classes
+    * Refactored all controllers where possible: the default exception handling logic moved to FrontController. Controllers that cannot be refactored do not conflict with the new logic
 * Framework:
-   * Created Magento Console to perform CLI actions
-   * Introduced a new SalesSequence module that is responsible for documents numeration management across the Order Management System
-   * Implemented the mechanism of asynchronous indexing of sales entities grids
+    * Created Magento Console to perform CLI actions
+    * Introduced a new SalesSequence module that is responsible for documents numeration management across the Order Management System
+    * Implemented the mechanism of asynchronous indexing of sales entities grids
 * Setup
-   * Added the ConfigOption and ConfigOptionsList classes to be used by modules to manage deployment configuration
-   * Moved all existing segments logic to new classes
-   * Added the config:set command, which enables deployment configuration management
-   * Removed the old 'install-configuration' tool
+    * Added the ConfigOption and ConfigOptionsList classes to be used by modules to manage deployment configuration
+    * Moved all existing segments logic to new classes
+    * Added the config:set command, which enables deployment configuration management
+    * Removed the old 'install-configuration' tool
 * Functional tests:
-   * Fixed functional test for order placement from backend
-   * Replaced the end-to-end test for a product with MAP with an injectable test
+    * Fixed functional test for order placement from backend
+    * Replaced the end-to-end test for a product with MAP with an injectable test
 * Design
-   * Updated the Blank and Luma themes to enable theme (not only library) variables overriding in the _theme.less file of any inherited theme. Included LESS code standards to the UI Library documentation
+    * Updated the Blank and Luma themes to enable theme (not only library) variables overriding in the _theme.less file of any inherited theme. Included LESS code standards to the UI Library documentation
 * Fixed bugs:
-   * Fixed an issue where composite products could not be added to the order from the Recently Viewed Products section
-   * Fixed an issue where not all .js files were added to a bundle
-   * Fixed an issue where it was possible to save an incorrect IP value in the Developer Client Restriction field
-   * Fixed an issue where a raw DB error was thrown when trying to enter a custom variable with duplicated variable code
+    * Fixed an issue where composite products could not be added to the order from the Recently Viewed Products section
+    * Fixed an issue where not all .js files were added to a bundle
+    * Fixed an issue where it was possible to save an incorrect IP value in the Developer Client Restriction field
+    * Fixed an issue where a raw DB error was thrown when trying to enter a custom variable with duplicated variable code
 
 0.74.0-beta3
 =============
 * API
-   * The orders were extended with the gift messages
-   * The page and block data and repository interfaces
-   * Updated the public API list
+    * The orders were extended with the gift messages
+    * The page and block data and repository interfaces
+    * Updated the public API list
 * Framework improvements
     * Improved the profile generator 
     * Introduced the new environment for Jasmine tests
@@ -54,7 +186,7 @@
     * Fixed the Navigation Menu items on Admin Area
     * Various unit and integration tests bugs
 * GitHub issues and requests
-    [#675] (https://github.com/magento/magento2/issues/675) -- Fix for Textarea element cols and rows #675
+    * [#675] (https://github.com/magento/magento2/issues/675) -- Fix for Textarea element cols and rows #675
 
 0.74.0-beta2
 =============

Gruntfile.js

@@ -23,17 +23,17 @@ module.exports = function (grunt) {
     require('load-grunt-config')(grunt, {
         configPath: path.join(__dirname, configDir),
         init: true,
-        loadGruntTasks: {
-            pattern: [
-                'grunt-*'
-            ]
+        jitGrunt: {
+            staticMappings: {
+                usebanner: 'grunt-banner'
+            }
         }
     });
 
     _.each({
         /**
          * Assembling tasks.
-         * ToDo UI: define default tasks.
+         * ToDo: define default tasks.
          */
         default: function () {
             grunt.log.subhead('I\'m default task and at the moment I\'m empty, sorry :/');
@@ -43,17 +43,19 @@ module.exports = function (grunt) {
          * Production preparation task.
          */
         prod: function (component) {
-            if (component === 'setup') {
-                grunt.task.run([
-                    'less:' + component,
-                    'autoprefixer:' + component,
-                    'cssmin:' + component,
-                    'usebanner:' + component
-                ]);
-            }
+            var tasks = [
+                'less',
+                'autoprefixer',
+                'cssmin',
+                'usebanner'
+            ].map(function(task){
+                return task + ':' + component;
+            });
 
             if (typeof component === 'undefined') {
                 grunt.log.subhead('Tip: Please make sure that u specify prod subtask. By default prod task do nothing');
+            } else {
+                grunt.task.run(tasks);
             }
         },
 

app/code/Magento/AdminNotification/Block/System/Messages.php

@@ -123,6 +123,7 @@ public function getSystemMessageDialogJson()
                     'autoOpen' => false,
                     'width' => '75%',
                     'modal' => true,
+                    'minHeight' => '0',
                     'dialogClass' => 'ui-dialog-active ui-popup-message',
                     'ajaxUrl' => $this->_getMessagesUrl()
                 ],

app/code/Magento/AdminNotification/Model/Feed.php

@@ -5,7 +5,7 @@
  */
 namespace Magento\AdminNotification\Model;
 
-use Magento\Framework\Config\ConfigOptionsList;
+use Magento\Framework\Config\ConfigOptionsListConstants;
 
 /**
  * AdminNotification Feed model
@@ -137,7 +137,7 @@ public function checkUpdate()
 
         $feedXml = $this->getFeedData();
 
-        $installDate = strtotime($this->_deploymentConfig->get(ConfigOptionsList::CONFIG_PATH_INSTALL_DATE));
+        $installDate = strtotime($this->_deploymentConfig->get(ConfigOptionsListConstants::CONFIG_PATH_INSTALL_DATE));
 
         if ($feedXml && $feedXml->channel && $feedXml->channel->item) {
             foreach ($feedXml->channel->item as $item) {
@@ -239,6 +239,8 @@ public function getFeedData()
     }
 
     /**
+     * Retrieve feed as XML element
+     *
      * @return \SimpleXMLElement
      */
     public function getFeedXml()

app/code/Magento/AdminNotification/Model/Inbox.php

@@ -7,6 +7,7 @@
 
 use Magento\Framework\Notification\MessageInterface;
 use Magento\Framework\Notification\NotifierInterface;
+use Magento\AdminNotification\Model\InboxInterface;
 
 /**
  * AdminNotification Inbox model
@@ -30,7 +31,7 @@
  *
  * @author      Magento Core Team <core@magentocommerce.com>
  */
-class Inbox extends \Magento\Framework\Model\AbstractModel implements NotifierInterface
+class Inbox extends \Magento\Framework\Model\AbstractModel implements NotifierInterface, InboxInterface
 {
     /**
      * @return void
@@ -41,10 +42,7 @@ protected function _construct()
     }
 
     /**
-     * Retrieve Severity collection array
-     *
-     * @param int|null $severity
-     * @return array|string|null
+     * {@inheritdoc}
      */
     public function getSeverities($severity = null)
     {
@@ -66,9 +64,7 @@ public function getSeverities($severity = null)
     }
 
     /**
-     * Retrieve Latest Notice
-     *
-     * @return $this
+     * {@inheritdoc}
      */
     public function loadLatestNotice()
     {
@@ -78,9 +74,7 @@ public function loadLatestNotice()
     }
 
     /**
-     * Retrieve notice statuses
-     *
-     * @return array
+     * {@inheritdoc}
      */
     public function getNoticeStatus()
     {

app/code/Magento/AdminNotification/Model/InboxInterface.php

@@ -0,0 +1,39 @@
+<?php
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\AdminNotification\Model;
+
+/**
+ * AdminNotification Inbox interface
+ *
+ * @author Magento Core Team <core@magentocommerce.com>
+ */
+interface InboxInterface
+{
+    /**
+     * Retrieve Severity collection array
+     *
+     * @param int|null $severity
+     * @return array|string|null
+     * @api
+     */
+    public function getSeverities($severity = null);
+
+    /**
+     * Retrieve Latest Notice
+     *
+     * @return $this
+     * @api
+     */
+    public function loadLatestNotice();
+
+    /**
+     * Retrieve notice statuses
+     *
+     * @return array
+     * @api
+     */
+    public function getNoticeStatus();
+}