Merge remote-tracking branch 'remotes/origin/develop' into MAGETWO-56012

Author: Sergey Kovalenko

app/code/Magento/Backend/Model/View/Result/Redirect.php

@@ -10,6 +10,7 @@
 use Magento\Backend\Model\UrlInterface;
 use Magento\Framework\App;
 use Magento\Framework\App\ActionFlag;
+use Magento\Framework\App\Response\HttpInterface as HttpResponseInterface;
 
 class Redirect extends \Magento\Framework\Controller\Result\Redirect
 {
@@ -56,7 +57,7 @@ public function setRefererOrBaseUrl()
     /**
      * {@inheritdoc}
      */
-    protected function render(App\ResponseInterface $response)
+    protected function render(HttpResponseInterface $response)
     {
         $this->session->setIsUrlNotice($this->actionFlag->get('', AbstractAction::FLAG_IS_URLS_CHECKED));
         return parent::render($response);

app/code/Magento/CatalogSearch/Model/Adapter/Mysql/Filter/Preprocessor.php

@@ -179,14 +179,14 @@ private function processRangeNumeric(FilterInterface $filter, $query, $attribute
         $tableSuffix = $attribute->getBackendType() === 'decimal' ? '_decimal' : '';
         $table = $this->resource->getTableName("catalog_product_index_eav{$tableSuffix}");
         $select = $this->connection->select();
-        $linkIdField = $this->getMetadataPool()->getMetadata(ProductInterface::class)->getLinkField();
+        $entityField = $this->getMetadataPool()->getMetadata(ProductInterface::class)->getIdentifierField();
 
         $currentStoreId = $this->scopeResolver->getScope()->getId();
 
         $select->from(['e' => $this->resource->getTableName('catalog_product_entity')], ['entity_id'])
             ->join(
                 ['main_table' => $table],
-                "main_table.{$linkIdField} = e.{$linkIdField}",
+                "main_table.{$entityField} = e.{$entityField}",
                 []
             )
             ->columns([$filter->getField() => 'main_table.value'])

app/code/Magento/Integration/Block/Adminhtml/Integration/Activate/Permissions/Tab/Webapi.php

@@ -147,8 +147,7 @@ public function isEverythingAllowed()
      */
     public function getResourcesTreeJson()
     {
-        $resources = $this->_resourceProvider->getAclResources();
-        $aclResourcesTree = $this->_integrationData->mapResources($resources[1]['children']);
+        $aclResourcesTree = $this->_integrationData->mapResources($this->getAclResources());
 
         return $this->encoder->encode($aclResourcesTree);
     }
@@ -166,12 +165,29 @@ public function getSelectedResourcesJson()
     {
         $selectedResources = $this->_selectedResources;
         if ($this->isEverythingAllowed()) {
-            $resources = $this->_resourceProvider->getAclResources();
-            $selectedResources = $this->_getAllResourceIds($resources[1]['children']);
+            $selectedResources = $this->_getAllResourceIds($this->getAclResources());
         }
         return $this->encoder->encode($selectedResources);
     }
 
+    /**
+     * Get lit of all ACL resources declared in the system.
+     *
+     * @return array
+     */
+    private function getAclResources()
+    {
+        $resources = $this->_resourceProvider->getAclResources();
+        $configResource = array_filter(
+            $resources,
+            function ($node) {
+                return $node['id'] == 'Magento_Backend::admin';
+            }
+        );
+        $configResource = reset($configResource);
+        return isset($configResource['children']) ? $configResource['children'] : [];
+    }
+
     /**
      * Whether tree has any resources.
      *

app/code/Magento/Integration/Block/Adminhtml/Integration/Edit/Tab/Webapi.php

@@ -6,7 +6,6 @@
 
 namespace Magento\Integration\Block\Adminhtml\Integration\Edit\Tab;
 
-use Magento\Integration\Block\Adminhtml\Integration\Edit\Tab\Info;
 use Magento\Integration\Controller\Adminhtml\Integration as IntegrationController;
 use Magento\Integration\Model\Integration as IntegrationModel;
 
@@ -174,11 +173,25 @@ public function isEverythingAllowed()
      * @return array
      */
     public function getTree()
+    {
+        return $this->integrationData->mapResources($this->getAclResources());
+    }
+
+    /**
+     * Get lit of all ACL resources declared in the system.
+     *
+     * @return array
+     */
+    private function getAclResources()
     {
         $resources = $this->aclResourceProvider->getAclResources();
-        $rootArray = $this->integrationData->mapResources(
-            isset($resources[1]['children']) ? $resources[1]['children'] : []
+        $configResource = array_filter(
+            $resources,
+            function ($node) {
+                return $node['id'] == 'Magento_Backend::admin';
+            }
         );
-        return $rootArray;
+        $configResource = reset($configResource);
+        return isset($configResource['children']) ? $configResource['children'] : [];
     }
 }

app/code/Magento/Integration/Test/Unit/Block/Adminhtml/Integration/Edit/Tab/WebapiTest.php

@@ -155,15 +155,16 @@ public function testGetTree()
     {
         $this->webapiBlock = $this->getWebapiBlock();
         $resources = [
-            1 => [ 'children' => [1, 2, 3] ]
+            ['id' => 'Magento_Backend::admin', 'children' => ['resource1', 'resource2', 'resource3']],
+            ['id' => 'Invalid_Node', 'children' => ['resource4', 'resource5', 'resource6']]
         ];
         $this->aclResourceProvider->expects($this->once())
             ->method('getAclResources')
             ->will($this->returnValue($resources));
         $rootArray = "rootArrayValue";
         $this->integrationHelper->expects($this->once())
             ->method('mapResources')
-            ->with([1, 2, 3])
+            ->with(['resource1', 'resource2', 'resource3'])
             ->will($this->returnValue($rootArray));
         $this->assertEquals($rootArray, $this->webapiBlock->getTree());
     }
@@ -197,7 +198,7 @@ public function isEverythingAllowedWithSavedFromDataProvider()
         return [
             'root resource in array' => [
                 2,
-                ['all_resources' => 0, 'resource'=>[2, 3]],
+                ['all_resources' => 0, 'resource' => [2, 3]],
                 true
             ],
             'root resource not in array' => [

app/code/Magento/User/Block/Role/Tab/Edit.php

@@ -6,7 +6,6 @@
 
 namespace Magento\User\Block\Role\Tab;
 
-use Magento\Framework\App\ObjectManager;
 use Magento\User\Controller\Adminhtml\User\Role\SaveRole;
 
 /**
@@ -93,7 +92,6 @@ public function __construct(
      */
     public function setCoreRegistry(\Magento\Framework\Registry $coreRegistry)
     {
-
         $this->coreRegistry = $coreRegistry;
     }
 
@@ -105,7 +103,6 @@ public function setCoreRegistry(\Magento\Framework\Registry $coreRegistry)
      */
     public function getCoreRegistry()
     {
-
         if (!($this->coreRegistry instanceof \Magento\Framework\Registry)) {
             return \Magento\Framework\App\ObjectManager::getInstance()->get(\Magento\Framework\Registry::class);
         } else {
@@ -197,11 +194,25 @@ public function getSelectedResources()
      * @return array
      */
     public function getTree()
+    {
+        return $this->_integrationData->mapResources($this->getAclResources());
+    }
+
+    /**
+     * Get lit of all ACL resources declared in the system.
+     *
+     * @return array
+     */
+    private function getAclResources()
     {
         $resources = $this->_aclResourceProvider->getAclResources();
-        $rootArray = $this->_integrationData->mapResources(
-            isset($resources[1]['children']) ? $resources[1]['children'] : []
+        $configResource = array_filter(
+            $resources,
+            function ($node) {
+                return $node['id'] == 'Magento_Backend::admin';
+            }
         );
-        return $rootArray;
+        $configResource = reset($configResource);
+        return isset($configResource['children']) ? $configResource['children'] : [];
     }
 }

app/code/Magento/User/Block/User/Edit/Tab/Roles.php

@@ -144,19 +144,19 @@ public function getSelectedRoles($json = false)
         //checking if we have this data and we
         //don't need load it through resource model
         if ($user->hasData('roles')) {
-            $uRoles = $user->getData('roles');
+            $userRoles = $user->getData('roles');
         } else {
-            $uRoles = $user->getRoles();
+            $userRoles = $user->getRoles();
         }
 
         if ($json) {
             $jsonRoles = [];
-            foreach ($uRoles as $urid) {
-                $jsonRoles[$urid] = 0;
+            foreach ($userRoles as $roleId) {
+                $jsonRoles[$roleId] = 0;
             }
             return $this->_jsonEncoder->encode((object)$jsonRoles);
         } else {
-            return $uRoles;
+            return $userRoles;
         }
     }
 }

app/code/Magento/User/Controller/Adminhtml/User/Save.php

@@ -55,9 +55,9 @@ public function execute()
             return;
         }
         $model->setData($this->_getAdminUserData($data));
-        $uRoles = $this->getRequest()->getParam('roles', []);
-        if (count($uRoles)) {
-            $model->setRoleId($uRoles[0]);
+        $userRoles = $this->getRequest()->getParam('roles', []);
+        if (count($userRoles)) {
+            $model->setRoleId($userRoles[0]);
         }
 
         /** @var $currentUser \Magento\User\Model\User */

app/code/Magento/User/Test/Unit/Block/Role/Tab/EditTest.php

@@ -86,7 +86,10 @@ protected function setUp()
 
     public function testGetTree()
     {
-        $resources = ['resource1', 'resource2', 'resource3'];
+        $resources = [
+            ['id' => 'Magento_Backend::admin', 'children' => ['resource1', 'resource2', 'resource3']],
+            ['id' => 'Invalid_Node', 'children' => ['resource4', 'resource5', 'resource6']]
+        ];
         $mappedResources = ['mapped1', 'mapped2', 'mapped3'];
         $this->aclResourceProviderMock->expects($this->once())->method('getAclResources')->willReturn($resources);
         $this->integrationDataMock->expects($this->once())->method('mapResources')->willReturn($mappedResources);

auth.json.sample

@@ -0,0 +1,8 @@
+{
+   "http-basic": {
+      "repo.magento.com": {
+         "username": "<public-key>",
+         "password": "<private-key>"
+      }
+   }
+}