Merge branch '2.2-develop' into compare-success-message

# Conflicts:
#	app/code/Magento/Catalog/etc/frontend/di.xml

Author: avstudnitz

.php_cs.dist

@@ -4,10 +4,6 @@
  * See COPYING.txt for license details.
  */
 
-/**
- * Pre-commit hook installation:
- * vendor/bin/static-review.php hook:install dev/tools/Magento/Tools/StaticReview/pre-commit .git/hooks/pre-commit
- */
 $finder = PhpCsFixer\Finder::create()
     ->name('*.phtml')
     ->exclude('dev/tests/functional/generated')

README.md

@@ -1,16 +1,16 @@
-[![Build Status](https://travis-ci.org/magento/magento2.svg?branch=develop)](https://travis-ci.org/magento/magento2)
+[![Build Status](https://travis-ci.org/magento/magento2.svg?branch=2.2-develop)](https://travis-ci.org/magento/magento2)
+[![Open Source Helpers](https://www.codetriage.com/magento/magento2/badges/users.svg)](https://www.codetriage.com/magento/magento2)
 [![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/magento/magento2?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
 [![Crowdin](https://d322cqt584bo4o.cloudfront.net/magento-2/localized.png)](https://crowdin.com/project/magento-2)
 <h2>Welcome</h2>
-Welcome to Magento 2 installation! We're glad you chose to install Magento 2, a cutting edge, feature-rich eCommerce solution that gets results.
+Welcome to Magento 2 installation! We're glad you chose to install Magento 2, a cutting-edge, feature-rich eCommerce solution that gets results.
 
 ## Magento system requirements
 [Magento system requirements](http://devdocs.magento.com/guides/v2.2/install-gde/system-requirements2.html)
 
 ## Install Magento
 To install Magento, see either:
 
-*	[Magento DevBox](https://magento.com/tech-resources/download), the easiest way to get started with Magento.
 *	[Installation guide](http://devdocs.magento.com/guides/v2.2/install-gde/bk-install-guide.html)
 
 <h2>Contributing to the Magento 2 code base</h2>
@@ -27,6 +27,19 @@ To suggest documentation improvements, click [here][4].
 [3]: <https://github.com/magento/magento2/issues>
 [4]: <http://devdocs.magento.com>
 
+<h3>Community Maintainers</h3>
+The members of this team have been recognized for their outstanding commitment to maintaining and improving Magento. Magento has granted them permission to accept, merge, and reject pull requests, as well as review issues, and thanks these Community Maintainers for their valuable contributions.
+
+<a href="https://magento.com/magento-contributors#maintainers">
+    <img src="https://raw.githubusercontent.com/wiki/magento/magento2/images/maintainers.png"/>
+</a>
+
+<h3>Top Contributors</h3>
+Magento is thankful for any contribution that can improve our code base, documentation or increase test coverage. We always recognize our most active members, as their contributions are the foundation of the Magento Open Source platform.
+<a href="https://magento.com/magento-contributors">
+    <img src="https://raw.githubusercontent.com/wiki/magento/magento2/images/contributors.png"/>
+</a>
+
 <h3>Labels applied by the Magento team</h3>
 
 | Label        | Description           | 

app/code/Magento/AdminNotification/Controller/Adminhtml/Notification/MassRemove.php

@@ -39,6 +39,6 @@ public function execute()
                 $this->messageManager->addException($e, __("We couldn't remove the messages because of an error."));
             }
         }
-        $this->getResponse()->setRedirect($this->_redirect->getRedirectUrl($this->getUrl('*')));
+        $this->_redirect('adminhtml/*/');
     }
 }

app/code/Magento/AdminNotification/composer.json

@@ -2,7 +2,7 @@
     "name": "magento/module-admin-notification",
     "description": "N/A",
     "require": {
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
+        "php": "~7.0.13|~7.1.0",
         "magento/module-store": "100.2.*",
         "magento/module-backend": "100.2.*",
         "magento/module-media-storage": "100.2.*",

app/code/Magento/AdvancedPricingImportExport/composer.json

@@ -2,7 +2,7 @@
     "name": "magento/module-advanced-pricing-import-export",
     "description": "N/A",
     "require": {
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
+        "php": "~7.0.13|~7.1.0",
         "magento/module-catalog": "102.0.*",
         "magento/module-catalog-inventory": "100.2.*",
         "magento/module-eav": "101.0.*",

app/code/Magento/Analytics/composer.json

@@ -2,7 +2,7 @@
     "name": "magento/module-analytics",
     "description": "N/A",
     "require": {
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
+        "php": "~7.0.13|~7.1.0",
         "magento/module-backend": "100.2.*",
         "magento/module-config": "101.0.*",
         "magento/module-integration": "100.2.*",

app/code/Magento/Authorization/composer.json

@@ -2,7 +2,7 @@
     "name": "magento/module-authorization",
     "description": "Authorization module provides access to Magento ACL functionality.",
     "require": {
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
+        "php": "~7.0.13|~7.1.0",
         "magento/module-backend": "100.2.*",
         "magento/framework": "101.0.*"
     },

app/code/Magento/Authorizenet/composer.json

@@ -2,7 +2,7 @@
     "name": "magento/module-authorizenet",
     "description": "N/A",
     "require": {
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
+        "php": "~7.0.13|~7.1.0",
         "magento/module-sales": "101.0.*",
         "magento/module-store": "100.2.*",
         "magento/module-quote": "101.0.*",

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

@@ -22,24 +22,29 @@ protected function _construct()
         $this->_headerText = __('Cache Storage Management');
         parent::_construct();
         $this->buttonList->remove('add');
-        $this->buttonList->add(
-            'flush_magento',
-            [
-                'label' => __('Flush Magento Cache'),
-                'onclick' => 'setLocation(\'' . $this->getFlushSystemUrl() . '\')',
-                'class' => 'primary flush-cache-magento'
-            ]
-        );
 
-        $message = __('The cache storage may contain additional data. Are you sure that you want to flush it?');
-        $this->buttonList->add(
-            'flush_system',
-            [
-                'label' => __('Flush Cache Storage'),
-                'onclick' => 'confirmSetLocation(\'' . $message . '\', \'' . $this->getFlushStorageUrl() . '\')',
-                'class' => 'flush-cache-storage'
-            ]
-        );
+        if ($this->_authorization->isAllowed('Magento_Backend::flush_magento_cache')) {
+            $this->buttonList->add(
+                'flush_magento',
+                [
+                    'label' => __('Flush Magento Cache'),
+                    'onclick' => 'setLocation(\'' . $this->getFlushSystemUrl() . '\')',
+                    'class' => 'primary flush-cache-magento'
+                ]
+            );
+        }
+
+        if ($this->_authorization->isAllowed('Magento_Backend::flush_cache_storage')) {
+            $message = __('The cache storage may contain additional data. Are you sure that you want to flush it?');
+            $this->buttonList->add(
+                'flush_system',
+                [
+                    'label' => __('Flush Cache Storage'),
+                    'onclick' => 'confirmSetLocation(\'' . $message . '\', \'' . $this->getFlushStorageUrl() . '\')',
+                    'class' => 'flush-cache-storage'
+                ]
+            );
+        }
     }
 
     /**

app/code/Magento/Backend/Block/Cache/Permissions.php

@@ -0,0 +1,62 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Backend\Block\Cache;
+
+use Magento\Framework\AuthorizationInterface;
+use Magento\Framework\View\Element\Block\ArgumentInterface;
+
+/**
+ * Class Permissions
+ */
+class Permissions implements ArgumentInterface
+{
+    /**
+     * @var AuthorizationInterface
+     */
+    private $authorization;
+
+    /**
+     * Permissions constructor.
+     *
+     * @param AuthorizationInterface $authorization
+     */
+    public function __construct(AuthorizationInterface $authorization)
+    {
+        $this->authorization = $authorization;
+    }
+
+    /**
+     * @return bool
+     */
+    public function hasAccessToFlushCatalogImages()
+    {
+        return $this->authorization->isAllowed('Magento_Backend::flush_catalog_images');
+    }
+    /**
+     * @return bool
+     */
+    public function hasAccessToFlushJsCss()
+    {
+        return $this->authorization->isAllowed('Magento_Backend::flush_js_css');
+    }
+    /**
+     * @return bool
+     */
+    public function hasAccessToFlushStaticFiles()
+    {
+        return $this->authorization->isAllowed('Magento_Backend::flush_static_files');
+    }
+    /**
+     * @return bool
+     */
+    public function hasAccessToAdditionalActions()
+    {
+        return ($this->hasAccessToFlushCatalogImages()
+                || $this->hasAccessToFlushJsCss()
+                || $this->hasAccessToFlushStaticFiles());
+    }
+}