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

Author: orlangur

CHANGELOG.md

@@ -1,3 +1,57 @@
+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

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

app/code/Magento/Backend/App/Config.php

@@ -10,6 +10,8 @@
 
 namespace Magento\Backend\App;
 
+use Magento\Framework\App\Config\ScopeConfigInterface;
+
 /**
  * Backend config accessor
  */
@@ -36,7 +38,7 @@ public function __construct(\Magento\Framework\App\Config\ScopePool $scopePool)
      */
     public function getValue($path)
     {
-        return $this->_scopePool->getScope(\Magento\Framework\App\ScopeInterface::SCOPE_DEFAULT, null)->getValue($path);
+        return $this->_scopePool->getScope(ScopeConfigInterface::SCOPE_TYPE_DEFAULT, null)->getValue($path);
     }
 
     /**
@@ -48,7 +50,7 @@ public function getValue($path)
      */
     public function setValue($path, $value)
     {
-        $this->_scopePool->getScope(\Magento\Framework\App\ScopeInterface::SCOPE_DEFAULT, null)->setValue($path, $value);
+        $this->_scopePool->getScope(ScopeConfigInterface::SCOPE_TYPE_DEFAULT, null)->setValue($path, $value);
     }
 
     /**
@@ -59,6 +61,6 @@ public function setValue($path, $value)
      */
     public function isSetFlag($path)
     {
-        return !!$this->_scopePool->getScope(\Magento\Framework\App\ScopeInterface::SCOPE_DEFAULT, null)->getValue($path);
+        return !!$this->_scopePool->getScope(ScopeConfigInterface::SCOPE_TYPE_DEFAULT, null)->getValue($path);
     }
 }

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

@@ -436,6 +436,7 @@ protected function _addSubMenu($menuItem, $level, $limit, $id = null)
      * @param array $colBrakes
      * @return string HTML
      * @SuppressWarnings(PHPMD.NPathComplexity)
+     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      */
     public function renderNavigation($menu, $level = 0, $limit = 0, $colBrakes = [])
     {
@@ -454,21 +455,30 @@ public function renderNavigation($menu, $level = 0, $limit = 0, $colBrakes = [])
             }
 
             $id = $this->getJsId($menuItem->getId());
-            $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>';
+            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>';
+            } else {
+                $output .= $this->_addSubMenu(
+                    $menuItem,
+                    $level,
+                    $limit,
+                    $id);
+            }
+
             $itemPosition++;
         }
 

app/code/Magento/Backend/Block/Page/System/Config/Robots/Reset.php

@@ -8,6 +8,8 @@
 
 namespace Magento\Backend\Block\Page\System\Config\Robots;
 
+use Magento\Framework\App\Config\ScopeConfigInterface;
+
 /**
  * "Reset to Defaults" button renderer
  *
@@ -50,7 +52,7 @@ protected function _construct()
     public function getRobotsDefaultCustomInstructions()
     {
         return trim((string)$this->_scopeConfig->getValue(
-            self::XML_PATH_ROBOTS_DEFAULT_CUSTOM_INSTRUCTIONS, \Magento\Framework\App\ScopeInterface::SCOPE_DEFAULT
+            self::XML_PATH_ROBOTS_DEFAULT_CUSTOM_INSTRUCTIONS, ScopeConfigInterface::SCOPE_TYPE_DEFAULT
         ));
     }
 

app/code/Magento/Backend/Console/Command/AbstractCacheCommand.php

@@ -0,0 +1,50 @@
+<?php
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Backend\Console\Command;
+
+use Magento\Framework\App\Cache\Manager;
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Input\InputOption;
+
+abstract class AbstractCacheCommand extends Command
+{
+    /**
+     * Input option bootsrap
+     */
+    const INPUT_KEY_BOOTSTRAP = 'bootstrap';
+
+    /**
+     * CacheManager
+     *
+     * @var Manager
+     */
+    protected $cacheManager;
+
+    /**
+     * Constructor
+     *
+     * @param Manager $cacheManager
+     */
+    public function __construct(Manager $cacheManager)
+    {
+        $this->cacheManager = $cacheManager;
+        parent::__construct();
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function configure()
+    {
+        $this->addOption(
+            self::INPUT_KEY_BOOTSTRAP,
+            null,
+            InputOption::VALUE_REQUIRED,
+            'add or override parameters of the bootstrap'
+        );
+    }
+}

app/code/Magento/Backend/Console/Command/AbstractCacheManageCommand.php

@@ -0,0 +1,72 @@
+<?php
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Backend\Console\Command;
+
+use Symfony\Component\Console\Input\InputArgument;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Input\InputOption;
+
+abstract class AbstractCacheManageCommand extends AbstractCacheCommand
+{
+    /**
+     * Input argument types
+     */
+    const INPUT_KEY_TYPES = 'types';
+
+    /**
+     * Input key all
+     */
+    const INPUT_KEY_ALL = 'all';
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function configure()
+    {
+        $this->addArgument(
+            self::INPUT_KEY_TYPES,
+            InputArgument::IS_ARRAY,
+            'List of cache types, space separated. If omitted, all caches will be affected'
+        );
+        $this->addOption(
+            self::INPUT_KEY_ALL,
+            null,
+            InputOption::VALUE_NONE,
+            'All cache types'
+        );
+        parent::configure();
+    }
+
+
+    /**
+     * Get requested cache types
+     *
+     * @param InputInterface $input
+     * @return array
+     */
+    protected function getRequestedTypes(InputInterface $input)
+    {
+        $requestedTypes = [];
+        if ($input->getArgument(self::INPUT_KEY_TYPES)) {
+            $requestedTypes = $input->getArgument(self::INPUT_KEY_TYPES);
+            $requestedTypes = array_filter(array_map('trim', $requestedTypes), 'strlen');
+        }
+        if (empty($requestedTypes)) {
+            return [];
+        } else {
+            $availableTypes = $this->cacheManager->getAvailableTypes();
+            $unsupportedTypes = array_diff($requestedTypes, $availableTypes);
+            if ($unsupportedTypes) {
+                throw new \InvalidArgumentException(
+                    "The following requested cache types are not supported: '" . join("', '", $unsupportedTypes)
+                    . "'." . PHP_EOL . 'Supported types: ' . join(", ", $availableTypes)
+                );
+            }
+            return array_values(array_intersect($availableTypes, $requestedTypes));
+        }
+    }
+}

app/code/Magento/Backend/Console/Command/AbstractCacheSetCommand.php

@@ -0,0 +1,47 @@
+<?php
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Backend\Console\Command;
+
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
+
+abstract class AbstractCacheSetCommand extends AbstractCacheManageCommand
+{
+    /**
+     * Is enable cache or not
+     *
+     * @return bool
+     */
+    abstract protected function isEnable();
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function execute(InputInterface $input, OutputInterface $output)
+    {
+        $isEnable = $this->isEnable();
+        if ($input->getOption(self::INPUT_KEY_ALL)) {
+            $types = $this->cacheManager->getAvailableTypes();
+        } else {
+            $types = $this->getRequestedTypes($input);
+        }
+        $changedTypes = $this->cacheManager->setEnabled($types, $isEnable);
+        if ($changedTypes) {
+            $output->writeln('Changed cache status:');
+            foreach ($changedTypes as $type) {
+                $output->writeln(sprintf('%30s: %d -> %d', $type, !$isEnable, $isEnable));
+            }
+        } else {
+            $output->writeln('There is nothing to change in cache status');
+        }
+        if (!empty($changedTypes) && $isEnable) {
+            $this->cacheManager->clean($changedTypes);
+            $output->writeln('Cleaned cache types:');
+            $output->writeln(join(PHP_EOL, $changedTypes));
+        }
+    }
+}