#21458: Fixed static tests

magento · Feb 28, 2019 · 03f3a4a · 03f3a4a
1 parent d49a776
commit 03f3a4a
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 4 deletions.
diff --git a/app/code/Magento/Elasticsearch6/Block/Adminhtml/System/Config/TestConnection.php b/app/code/Magento/Elasticsearch6/Block/Adminhtml/System/Config/TestConnection.php
@@ -12,7 +12,7 @@
 class TestConnection extends \Magento\AdvancedSearch\Block\Adminhtml\System\Config\TestConnection
 {
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     protected function _getFieldMapping()
     {

diff --git a/...h6/Model/Adapter/FieldMapper/Product/FieldProvider/FieldName/Resolver/DefaultResolver.php b/...h6/Model/Adapter/FieldMapper/Product/FieldProvider/FieldName/Resolver/DefaultResolver.php
@@ -8,11 +8,12 @@
 namespace Magento\Elasticsearch6\Model\Adapter\FieldMapper\Product\FieldProvider\FieldName\Resolver;
 
 use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\AttributeAdapter;
+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldName\Resolver\DefaultResolver as Base;
 
 /**
  * Default name resolver.
  */
-class DefaultResolver extends \Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldName\Resolver\DefaultResolver
+class DefaultResolver extends Base
 {
     /**
      * Get field name.

diff --git a/app/code/Magento/Elasticsearch6/Model/DataProvider/Suggestions.php b/app/code/Magento/Elasticsearch6/Model/DataProvider/Suggestions.php
@@ -150,7 +150,11 @@ private function getSuggestions(QueryInterface $query)
             }
             ksort($suggestions);
             $texts = array_unique(array_column($suggestions, 'text'));
-            $suggestions = array_slice(array_intersect_key(array_values($suggestions), $texts), 0, $searchSuggestionsCount);
+            $suggestions = array_slice(
+                array_intersect_key(array_values($suggestions), $texts),
+                0,
+                $searchSuggestionsCount
+            );
         }
 
         return $suggestions;
@@ -186,7 +190,7 @@ private function initQuery($query)
      * Build Suggest on searchable fields.
      *
      * @param array $searchQuery
-     * @param int   $searchSuggestionsCount
+     * @param int $searchSuggestionsCount
      *
      * @return array
      */

diff --git a/dev/tests/static/testsuite/Magento/Test/Php/_files/phpcpd/blacklist/common.txt b/dev/tests/static/testsuite/Magento/Test/Php/_files/phpcpd/blacklist/common.txt
@@ -208,3 +208,4 @@ Magento/InventoryGroupedProductIndexer/Indexer
 Magento/Customer/Model/FileUploaderDataResolver.php
 Magento/Customer/Model/Customer/DataProvider.php
 Magento/InventoryShippingAdminUi/Ui/DataProvider
+Magento/Elasticsearch/Model/Client/Elasticsearch.php