Merge pull request #1408 from magento-engcom/develop-prs

Public Pull Requests

#10484
#10475

Author: Oleksii Korshenko

app/code/Magento/Customer/Model/Customer/Source/Group.php

@@ -56,7 +56,7 @@ public function toOptionArray()
         $customerGroups = [];
         $customerGroups[] = [
             'label' => __('ALL GROUPS'),
-            'value' => GroupInterface::CUST_GROUP_ALL,
+            'value' => (string)GroupInterface::CUST_GROUP_ALL,
         ];
 
         /** @var GroupSearchResultsInterface $groups */

app/code/Magento/Customer/Test/Unit/Model/Customer/Source/GroupTest.php

@@ -71,8 +71,8 @@ protected function setUp()
     public function testToOptionArray()
     {
         $customerGroups = [
-            ['label' => __('ALL GROUPS'), 'value' => 32000],
-            ['label' => __('NOT LOGGED IN'), 'value' => 0]
+            ['label' => __('ALL GROUPS'), 'value' => '32000'],
+            ['label' => __('NOT LOGGED IN'), 'value' => '0'],
         ];
 
         $this->moduleManagerMock->expects($this->any())
@@ -95,11 +95,17 @@ public function testToOptionArray()
             ->setMethods(['getCode', 'getId'])
             ->getMockForAbstractClass();
         $groupTest->expects($this->any())->method('getCode')->willReturn(__('NOT LOGGED IN'));
-        $groupTest->expects($this->any())->method('getId')->willReturn(0);
+        $groupTest->expects($this->any())->method('getId')->willReturn('0');
         $groups = [$groupTest];
 
         $this->searchResultMock->expects($this->any())->method('getItems')->willReturn($groups);
 
-        $this->assertEquals($customerGroups, $this->model->toOptionArray());
+        $actualCustomerGroups = $this->model->toOptionArray();
+
+        $this->assertEquals($customerGroups, $actualCustomerGroups);
+
+        foreach ($actualCustomerGroups as $actualCustomerGroup) {
+            $this->assertInternalType('string', $actualCustomerGroup['value']);
+        }
     }
 }

app/code/Magento/Search/Block/Term.php

@@ -94,8 +94,8 @@ protected function _loadTerms()
                     continue;
                 }
                 $term->setRatio(($term->getPopularity() - $this->_minPopularity) / $range);
-                $temp[$term->getName()] = $term;
-                $termKeys[] = $term->getName();
+                $temp[$term->getQueryText()] = $term;
+                $termKeys[] = $term->getQueryText();
             }
             natcasesort($termKeys);
 
@@ -127,7 +127,7 @@ public function getSearchUrl($obj)
          * url encoding will be done in Url.php http_build_query
          * so no need to explicitly called urlencode for the text
          */
-        $url->setQueryParam('q', $obj->getName());
+        $url->setQueryParam('q', $obj->getQueryText());
         return $url->getUrl('catalogsearch/result');
     }
 

app/code/Magento/Search/view/frontend/templates/term.phtml

@@ -13,7 +13,7 @@
             <li class="item">
                 <a href="<?= /* @escapeNotVerified */ $block->getSearchUrl($_term) ?>"
                    style="font-size:<?= /* @escapeNotVerified */ $_term->getRatio()*70+75 ?>%;">
-                    <?= $block->escapeHtml($_term->getName()) ?>
+                    <?= $block->escapeHtml($_term->getQueryText()) ?>
                 </a>
             </li>
         <?php endforeach; ?>

dev/tests/integration/testsuite/Magento/CatalogSearch/Block/TermTest.php

@@ -24,7 +24,7 @@ protected function setUp()
     public function testGetSearchUrl()
     {
         $query = uniqid();
-        $obj = new \Magento\Framework\DataObject(['name' => $query]);
+        $obj = new \Magento\Framework\DataObject(['query_text' => $query]);
         $this->assertStringEndsWith("/catalogsearch/result/?q={$query}", $this->_block->getSearchUrl($obj));
     }
 }