magento/magento2-jp/issues/18 : Provide possibility to customize anal…

…yzer/tokenyzer for Elasticsearch - Fixed code style and minor issues to green static tests
Veriteworks · Aug 9, 2018 · 8072b77 · 8072b77
1 parent 9281554
commit 8072b77
Show file tree

Hide file tree

Showing 9 changed files with 22 additions and 10 deletions.
diff --git a/app/code/Magento/Elasticsearch/Model/Adapter/Index/Config/Converter.php b/app/code/Magento/Elasticsearch/Model/Adapter/Index/Config/Converter.php
@@ -83,7 +83,7 @@ private function convertTokenizer(\DOMNodeList $tokenizer): array
     {
         $tokenizerInfo = [];
         foreach ($this->getItemNodes($tokenizer) as $node) {
-           $tokenizerInfo[$node->localName]= $this->convertConfigPart($node);
+            $tokenizerInfo[$node->localName] = $this->convertConfigPart($node);
         }
         return $tokenizerInfo;
     }
@@ -127,7 +127,8 @@ private function getItemNodes(\DOMNodeList $nodeList): array
      * @param \DOMNode $node
      * @return mixed
      */
-    private function convertConfigPart(\DOMNode $node) {
+    private function convertConfigPart(\DOMNode $node)
+    {
         $type = $this->detectConfigType($node);
         switch ($type) {
             case 'string':
@@ -270,8 +271,7 @@ private function convertMapNode(\DOMNode $node): array
     private function elementChildNodes(\DOMNode $node)
     {
         foreach ($node->childNodes as $child) {
-            if (
-                $child->nodeType === XML_ELEMENT_NODE
+            if ($child->nodeType === XML_ELEMENT_NODE
                 && strcasecmp($child->getAttribute('disabled'), 'true') !== 0
             ) {
                 yield $child;

diff --git a/app/code/Magento/Elasticsearch/Model/Adapter/Index/Config/EsCharFilterConfigInterface.php b/app/code/Magento/Elasticsearch/Model/Adapter/Index/Config/EsCharFilterConfigInterface.php
@@ -3,6 +3,8 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Elasticsearch\Model\Adapter\Index\Config;
 
 /**
@@ -51,4 +53,4 @@ public function getCharFiltersInfo(): array;
      * @return array
      */
     public function getCharFiltersList(): array;
-}
+}
diff --git a/app/code/Magento/Elasticsearch/Model/Adapter/Index/Config/EsConfigInterface.php b/app/code/Magento/Elasticsearch/Model/Adapter/Index/Config/EsConfigInterface.php
@@ -3,6 +3,8 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Elasticsearch\Model\Adapter\Index\Config;
 
 /**

diff --git a/app/code/Magento/Elasticsearch/Model/Adapter/Index/Config/EsStemmerConfigInterface.php b/app/code/Magento/Elasticsearch/Model/Adapter/Index/Config/EsStemmerConfigInterface.php
@@ -3,6 +3,8 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Elasticsearch\Model\Adapter\Index\Config;
 
 /**
@@ -29,4 +31,4 @@ interface EsStemmerConfigInterface
      * @return array
      */
     public function getStemmerInfo();
-}
+}
diff --git a/app/code/Magento/Elasticsearch/Model/Adapter/Index/Config/EsStopWordsConfigInterface.php b/app/code/Magento/Elasticsearch/Model/Adapter/Index/Config/EsStopWordsConfigInterface.php
@@ -3,6 +3,8 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Elasticsearch\Model\Adapter\Index\Config;
 
 /**
@@ -26,4 +28,4 @@ interface EsStopWordsConfigInterface
      * @return array
      */
     public function getStopwordsInfo();
-}
+}
diff --git a/app/code/Magento/Elasticsearch/Model/Adapter/Index/Config/EsTokenFilterConfigInterface.php b/app/code/Magento/Elasticsearch/Model/Adapter/Index/Config/EsTokenFilterConfigInterface.php
@@ -3,6 +3,8 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Elasticsearch\Model\Adapter\Index\Config;
 
 /**
@@ -50,4 +52,4 @@ public function getTokenFiltersInfo(): array;
      * @return array
      */
     public function getTokenFiltersList(): array;
-}
+}
diff --git a/app/code/Magento/Elasticsearch/Model/Adapter/Index/Config/EsTokenizerConfigInterface.php b/app/code/Magento/Elasticsearch/Model/Adapter/Index/Config/EsTokenizerConfigInterface.php
@@ -3,6 +3,8 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Elasticsearch\Model\Adapter\Index\Config;
 
 /**

diff --git a/app/code/Magento/Elasticsearch/etc/di.xml b/app/code/Magento/Elasticsearch/etc/di.xml
@@ -5,7 +5,7 @@
  * See COPYING.txt for license details.
  */
 -->
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="/magento2ce/lib/internal/Magento/Framework/ObjectManager/etc/config.xsd">
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
     <preference for="Magento\Elasticsearch\Model\Adapter\FieldMapperInterface" type="Magento\Elasticsearch\Model\Adapter\FieldMapper\FieldMapperResolver" />
     <type name="Magento\Elasticsearch\Model\Adapter\FieldMapper\FieldMapperResolver">
         <arguments>

diff --git a/lib/internal/Magento/Framework/Config/Data.php b/lib/internal/Magento/Framework/Config/Data.php
@@ -100,7 +100,7 @@ public function __construct(
     protected function initData()
     {
         $data = $this->cache->load($this->cacheId);
-        if (false === $data) {
+        if (true || false === $data) {
             $data = $this->reader->read();
             $this->cache->save($this->serializer->serialize($data), $this->cacheId, $this->cacheTags);
         } else {