Merge remote-tracking branch 'upstream/develop' into develop

# Conflicts:
#	lib/internal/Magento/Framework/Setup/FilePermissions.php
#	lib/internal/Magento/Framework/Setup/Test/Unit/FilePermissionsTest.php

Author: Joan He

app/code/Magento/Catalog/Ui/Component/Listing/Columns/Websites.php

@@ -56,6 +56,9 @@ public function prepareDataSource(array $dataSource)
             foreach ($dataSource['data']['items'] as & $item) {
                 $websites = [];
                 foreach ($item[$fieldName] as $websiteId) {
+                    if (!isset($websiteNames[$websiteId])) {
+                        continue;
+                    }
                     $websites[] = $websiteNames[$websiteId];
                 }
                 $item[$fieldName] = implode(', ', $websites);

app/code/Magento/CatalogSearch/Model/Adapter/Mysql/Aggregation/DataProvider.php

@@ -73,7 +73,7 @@ public function getDataSet(
         array $dimensions,
         Table $entityIdsTable
     ) {
-        $currentScope = $dimensions['scope']->getValue();
+        $currentScope = $this->scopeResolver->getScope($dimensions['scope']->getValue())->getId();
 
         $attribute = $this->eavConfig->getAttribute(Product::ENTITY, $bucket->getField());
 

app/code/Magento/CatalogSearch/Model/Adapter/Mysql/Plugin/Aggregation/Category/DataProvider.php

@@ -67,8 +67,7 @@ public function aroundGetDataSet(
         Table $entityIdsTable
     ) {
         if ($bucket->getField() == 'category_ids') {
-            $currentScope = $dimensions['scope']->getValue();
-            $currentScopeId = $this->scopeResolver->getScope($currentScope)->getId();
+            $currentScopeId = $this->scopeResolver->getScope($dimensions['scope']->getValue())->getId();
             $currentCategory = $this->layer->getCurrentCategory();
 
             $derivedTable = $this->resource->getConnection()->select();

app/code/Magento/CatalogSearch/Model/Search/IndexBuilder.php

@@ -20,6 +20,7 @@
 use Magento\Framework\Indexer\ScopeResolver\IndexScopeResolver;
 use Magento\Store\Model\ScopeInterface;
 use Magento\Store\Model\StoreManagerInterface;
+use Magento\Framework\App\ScopeResolverInterface;
 
 /**
  * Build base Query for Index
@@ -57,28 +58,36 @@ class IndexBuilder implements IndexBuilderInterface
      */
     private $tableMapper;
 
+    /**
+     * @var ScopeResolverInterface
+     */
+    private $dimensionScopeResolver;
+
     /**
      * @param \Magento\Framework\App\ResourceConnection $resource
      * @param ScopeConfigInterface $config
      * @param StoreManagerInterface $storeManager
      * @param ConditionManager $conditionManager
      * @param IndexScopeResolver $scopeResolver
      * @param TableMapper $tableMapper
+     * @param ScopeResolverInterface $dimensionScopeResolver
      */
     public function __construct(
         ResourceConnection $resource,
         ScopeConfigInterface $config,
         StoreManagerInterface $storeManager,
         ConditionManager $conditionManager,
         IndexScopeResolver $scopeResolver,
-        TableMapper $tableMapper
+        TableMapper $tableMapper,
+        ScopeResolverInterface $dimensionScopeResolver
     ) {
         $this->resource = $resource;
         $this->config = $config;
         $this->storeManager = $storeManager;
         $this->conditionManager = $conditionManager;
         $this->scopeResolver = $scopeResolver;
         $this->tableMapper = $tableMapper;
+        $this->dimensionScopeResolver = $dimensionScopeResolver;
     }
 
     /**
@@ -158,7 +167,7 @@ private function prepareDimensions(array $dimensions)
             $preparedDimensions[] = $this->conditionManager->generateCondition(
                 $dimension->getName(),
                 '=',
-                $dimension->getValue()
+                $this->dimensionScopeResolver->getScope($dimension->getValue())->getId()
             );
         }
 

app/code/Magento/CatalogSearch/Test/Unit/Model/Search/IndexBuilderTest.php

@@ -6,46 +6,55 @@
 
 namespace Magento\CatalogSearch\Test\Unit\Model\Search;
 
-use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
-use PHPUnit_Framework_MockObject_MockObject as MockObject;
-
 /**
  * Test for \Magento\CatalogSearch\Model\Search\IndexBuilder
+ *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class IndexBuilderTest extends \PHPUnit_Framework_TestCase
 {
-    /** @var  \Magento\CatalogSearch\Model\Search\TableMapper|MockObject */
+    /** @var  \Magento\CatalogSearch\Model\Search\TableMapper|\PHPUnit_Framework_MockObject_MockObject */
     private $tableMapper;
 
-    /** @var  \Magento\Framework\Search\Adapter\Mysql\ConditionManager|MockObject */
+    /** @var  \Magento\Framework\Search\Adapter\Mysql\ConditionManager|\PHPUnit_Framework_MockObject_MockObject */
     private $conditionManager;
 
-    /** @var  \Magento\Search\Model\IndexScopeResolver|MockObject */
+    /** @var  \Magento\Search\Model\IndexScopeResolver|\PHPUnit_Framework_MockObject_MockObject */
     private $scopeResolver;
 
-    /** @var \Magento\Framework\DB\Adapter\AdapterInterface|MockObject */
+    /** @var \Magento\Framework\DB\Adapter\AdapterInterface|\PHPUnit_Framework_MockObject_MockObject */
     private $connection;
 
-    /** @var \Magento\Framework\DB\Select|MockObject */
+    /** @var \Magento\Framework\DB\Select|\PHPUnit_Framework_MockObject_MockObject */
     private $select;
 
-    /** @var \Magento\Framework\App\Config\ScopeConfigInterface|MockObject */
+    /** @var \Magento\Framework\App\Config\ScopeConfigInterface|\PHPUnit_Framework_MockObject_MockObject */
     private $config;
 
-    /** @var \Magento\Store\Model\StoreManagerInterface|MockObject */
+    /** @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject */
     private $storeManager;
 
-    /** @var \Magento\Framework\Search\RequestInterface|MockObject */
+    /** @var \Magento\Framework\Search\RequestInterface|\PHPUnit_Framework_MockObject_MockObject */
     private $request;
 
-    /** @var \Magento\Search\Model\IndexScopeResolver|MockObject */
+    /** @var \Magento\Search\Model\IndexScopeResolver|\PHPUnit_Framework_MockObject_MockObject */
     private $resource;
 
     /**
      * @var \Magento\CatalogSearch\Model\Search\IndexBuilder
      */
     private $target;
 
+    /**
+     * @var \Magento\Framework\App\ScopeResolverInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $dimensionScopeResolver;
+
+    /**
+     * @var \Magento\Framework\App\ScopeInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $scopeInterface;
+
     protected function setUp()
     {
         $this->select = $this->getMockBuilder('\Magento\Framework\DB\Select')
@@ -118,8 +127,20 @@ function ($left, $operator, $right) {
             ->method('addTables')
             ->with($this->select, $this->request)
             ->willReturnArgument(0);
+        $this->dimensionScopeResolver = $this->getMockForAbstractClass(
+            '\Magento\Framework\App\ScopeResolverInterface',
+            [],
+            '',
+            false
+        );
+        $this->scopeInterface = $this->getMockForAbstractClass(
+            '\Magento\Framework\App\ScopeInterface',
+            [],
+            '',
+            false
+        );
 
-        $objectManagerHelper = new ObjectManagerHelper($this);
+        $objectManagerHelper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
         $this->target = $objectManagerHelper->getObject(
             'Magento\CatalogSearch\Model\Search\IndexBuilder',
             [
@@ -129,6 +150,7 @@ function ($left, $operator, $right) {
                 'conditionManager' => $this->conditionManager,
                 'scopeResolver' => $this->scopeResolver,
                 'tableMapper' => $this->tableMapper,
+                'dimensionScopeResolver' => $this->dimensionScopeResolver
             ]
         );
     }
@@ -167,6 +189,12 @@ public function testBuildWithoutOutOfStock()
         $this->request->expects($this->exactly(2))
             ->method('getDimensions')
             ->willReturn($dimensions);
+        $this->dimensionScopeResolver->expects($this->once())
+            ->method('getScope')
+            ->willReturn($this->scopeInterface);
+        $this->scopeInterface->expects($this->once())
+            ->method('getId')
+            ->willReturn('someValue');
 
         $this->mockBuild($index, $tableSuffix, false);
 
@@ -270,7 +298,7 @@ function ($index, $dimensions) {
     /**
      * @param $name
      * @param $value
-     * @return MockObject
+     * @return \PHPUnit_Framework_MockObject_MockObject
      */
     private function createDimension($name, $value)
     {

app/code/Magento/CatalogUrlRewrite/etc/setup/events.xml

@@ -22,12 +22,13 @@ class Cache extends \Magento\Framework\App\Config\Value
     /**
      * Clean cache, value was changed
      *
-     * @return void
+     * @return $this
      */
     public function afterSave()
     {
         if ($this->isValueChanged()) {
             $this->_cacheManager->clean($this->_cacheTags);
         }
+        return $this;
     }
 }

app/code/Magento/CmsUrlRewrite/etc/adminhtml/events.xml renamed to app/code/Magento/CmsUrlRewrite/etc/events.xml

@@ -14,9 +14,10 @@
 class Datashare extends \Magento\Framework\App\Config\Value
 {
     /**
-     * @return void
+     * @return $this
      */
     public function afterSave()
     {
+        return $this;
     }
 }