ACP2E-231:Code Review Fixes

Author: abhattGlo

app/code/Magento/Search/ViewModel/SearchAdditionalFormData.php renamed to app/code/Magento/Search/ViewModel/AdditionalSearchFormData.php

@@ -12,7 +12,7 @@
 /**
  * View model for search additional form params
  */
-class SearchAdditionalFormData implements ArgumentInterface
+class AdditionalSearchFormData implements ArgumentInterface
 {
     /**
      * Return search query params

app/code/Magento/Search/view/frontend/layout/default.xml

@@ -11,7 +11,7 @@
             <block class="Magento\Framework\View\Element\Template" name="top.search" as="topSearch" template="Magento_Search::form.mini.phtml">
                 <arguments>
                     <argument name="configProvider" xsi:type="object">Magento\Search\ViewModel\ConfigProvider</argument>
-                    <argument name="searchAdditionalFormData" xsi:type="object">Magento\Search\ViewModel\SearchAdditionalFormData</argument>
+                    <argument name="searchAdditionalFormData" xsi:type="object">Magento\Search\ViewModel\AdditionalSearchFormData</argument>
                 </arguments>
             </block>
         </referenceContainer>

app/code/Magento/Search/view/frontend/templates/form.mini.phtml

@@ -10,8 +10,8 @@
 /** @var $escaper \Magento\Framework\Escaper */
 /** @var $configProvider \Magento\Search\ViewModel\ConfigProvider */
 $configProvider = $block->getData('configProvider');
-/** @var $versionManager \Magento\Search\ViewModel\SearchAdditionalFormData */
-$searchAdditionalFormParams = $block->getData('searchAdditionalFormData');
+/** @var $versionManager \Magento\Search\ViewModel\AdditionalSearchFormData */
+$additionalSearchFormData = $block->getData('additionalSearchFormData');
 /** @var $helper \Magento\Search\Helper\Data */
 $helper = $configProvider->getSearchHelperData();
 $allowedSuggestion = $configProvider->isSuggestionsAllowed();
@@ -22,7 +22,7 @@ $quickSearchUrl = $allowedSuggestion ? $escaper->escapeUrl($helper->getSuggestUr
     <div class="block block-content">
         <form class="form minisearch" id="search_mini_form"
               action="<?= $escaper->escapeUrl($helper->getResultUrl()) ?>" method="get">
-            <?php  if (!empty($queryParams = $searchAdditionalFormParams->getFormData())): ?>
+            <?php  if (!empty($queryParams = $additionalSearchFormData->getFormData())): ?>
                 <?php foreach ($queryParams as $param): ?>
                     <input type="hidden" name="<?= $escaper->escapeHtmlAttr($param['name']) ?>"
                            value="<?= $escaper->escapeHtmlAttr($param['value']) ?>"/>

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

@@ -73,7 +73,7 @@ public function testEscapeSearchText(string $searchValue, string $expectedOutput
         /** @var Result $searchResultBlock */
         $searchResultBlock = $this->layout->createBlock(Result::class);
         /** @var Template $searchBlock */
-        $searchQueryParams = $this->getMockBuilder(\Magento\Search\ViewModel\SearchAdditionalFormData::class)
+        $searchQueryParams = $this->getMockBuilder(\Magento\Search\ViewModel\AdditionalSearchFormData::class)
             ->disableOriginalConstructor()
             ->setMethods(['getFormData'])
             ->getMock();
@@ -83,7 +83,7 @@ public function testEscapeSearchText(string $searchValue, string $expectedOutput
         $searchBlock = $this->layout->createBlock(Template::class);
         $searchBlock->setData([
             'configProvider' => $this->configProvider,
-            'searchAdditionalFormData' => $searchQueryParams,
+            'additionalSearchFormData' => $searchQueryParams,
         ]);
         $searchBlock->setTemplate('Magento_Search::form.mini.phtml');
         /** @var RequestInterface $request */