Merge pull request #4267 from magento-mpi/PR-05-28-2019

[mpi] MAGETWO-93497: admin/url/custom cause media directives to break

Author: viktym

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

@@ -101,7 +101,7 @@ private function generateRequest($attributeType, $container, $useFulltext)
                 }
             }
             /** @var $attribute Attribute */
-            if (!$attribute->getIsSearchable() || in_array($attribute->getAttributeCode(), ['price', 'sku'], true)) {
+            if (!$attribute->getIsSearchable() || in_array($attribute->getAttributeCode(), ['price'], true)) {
                 // Some fields have their own specific handlers
                 continue;
             }

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

@@ -9,6 +9,9 @@
 use Magento\CatalogSearch\Model\Search\RequestGenerator\GeneratorResolver;
 use Magento\CatalogSearch\Model\Search\RequestGenerator\GeneratorInterface;
 
+/**
+ * Test for \Magento\CatalogSearch\Model\Search\RequestGenerator
+ */
 class RequestGeneratorTest extends \PHPUnit\Framework\TestCase
 {
     /** @var \Magento\Framework\TestFramework\Unit\Helper\ObjectManager  */
@@ -61,7 +64,7 @@ public function attributesProvider()
         return [
             [
                 [
-                    'quick_search_container' => ['queries' => 0, 'filters' => 0, 'aggregations' => 0],
+                    'quick_search_container' => ['queries' => 1, 'filters' => 0, 'aggregations' => 0],
                     'advanced_search_container' => ['queries' => 0, 'filters' => 0, 'aggregations' => 0],
                     'catalog_view_container' => ['queries' => 0, 'filters' => 0, 'aggregations' => 0]
                 ],

app/code/Magento/CatalogSearch/etc/search_request.xml

@@ -19,7 +19,6 @@
                 <queryReference clause="must" ref="visibility"/>
             </query>
             <query xsi:type="matchQuery" value="$search_term$" name="search">
-                <match field="sku"/>
                 <match field="*"/>
             </query>
             <query xsi:type="filteredQuery" name="category">

app/code/Magento/Cms/Helper/Wysiwyg/Images.php

@@ -239,11 +239,7 @@ public function getCurrentUrl()
     {
         if (!$this->_currentUrl) {
             $path = $this->getCurrentPath();
-            $mediaUrl = $this->_storeManager->getStore(
-                $this->_storeId
-            )->getBaseUrl(
-                \Magento\Framework\UrlInterface::URL_TYPE_MEDIA
-            );
+            $mediaUrl = $this->_storeManager->getStore()->getBaseUrl(\Magento\Framework\UrlInterface::URL_TYPE_MEDIA);
             $this->_currentUrl = $mediaUrl . $this->_directory->getRelativePath($path) . '/';
         }
         return $this->_currentUrl;

dev/tests/integration/testsuite/Magento/Cms/Helper/Wysiwyg/ImagesTest.php

@@ -7,6 +7,9 @@
 
 use Magento\Framework\App\Filesystem\DirectoryList;
 
+/**
+ * @magentoAppArea adminhtml
+ */
 class ImagesTest extends \PHPUnit\Framework\TestCase
 {
     public function testGetStorageRoot()
@@ -23,6 +26,12 @@ public function testGetStorageRoot()
         $this->assertStringStartsWith($mediaPath, $helper->getStorageRoot());
     }
 
+    /**
+     * @magentoConfigFixture default_store admin/url/use_custom 1
+     * @magentoConfigFixture default_store admin/url/custom http://backend/
+     * @magentoConfigFixture admin_store web/secure/base_url http://backend/
+     * @magentoConfigFixture admin_store web/unsecure/base_url http://backend/
+     */
     public function testGetCurrentUrl()
     {
         $helper = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(