Merge pull request #5926 from magento-tsg/2.3-develop-pr141

zakdma · web-flow · commit e27d322b237e · 2020-07-24T17:35:16.000+03:00
[TSG] Fixes for 2.3 (pr141) (2.3-develop)
diff --git a/app/code/Magento/Elasticsearch6/Block/Adminhtml/System/Config/TestConnection.php b/app/code/Magento/Elasticsearch6/Block/Adminhtml/System/Config/TestConnection.php
@@ -7,6 +7,8 @@
 
 /**
  * Elasticsearch 6.x test connection block
+ *
+ * @deprecated in favor of Elasticsearch 7.
  */
 class TestConnection extends \Magento\AdvancedSearch\Block\Adminhtml\System\Config\TestConnection
 {
diff --git a/app/code/Magento/Elasticsearch6/Model/Adapter/FieldMapper/Product/FieldProvider/FieldName/Resolver/DefaultResolver.php b/app/code/Magento/Elasticsearch6/Model/Adapter/FieldMapper/Product/FieldProvider/FieldName/Resolver/DefaultResolver.php
@@ -12,6 +12,8 @@
 
 /**
  * Default name resolver.
+ *
+ * @deprecated in favor of Elasticsearch 7.
  */
 class DefaultResolver extends Base
 {
diff --git a/app/code/Magento/Elasticsearch6/Model/Client/Elasticsearch.php b/app/code/Magento/Elasticsearch6/Model/Client/Elasticsearch.php
@@ -11,6 +11,8 @@
 
 /**
  * Elasticsearch client
+ *
+ * @deprecated in favor of Elasticsearch 7.
  */
 class Elasticsearch implements ClientInterface
 {
diff --git a/app/code/Magento/Elasticsearch6/etc/di.xml b/app/code/Magento/Elasticsearch6/etc/di.xml
@@ -17,7 +17,7 @@
     <type name="Magento\Search\Model\Adminhtml\System\Config\Source\Engine">
         <arguments>
             <argument name="engines" xsi:type="array">
-                <item name="elasticsearch6" xsi:type="string">Elasticsearch 6.0+</item>
+                <item name="elasticsearch6" xsi:type="string">Elasticsearch 6.0+ (Deprecated)</item>
             </argument>
         </arguments>
     </type>

Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,8 @@`
`7`	`7`
`8`	`8`	`/**`
`9`	`9`	`* Elasticsearch 6.x test connection block`
	`10`	`+ *`
	`11`	`+ * @deprecated in favor of Elasticsearch 7.`
`10`	`12`	`*/`
`11`	`13`	`class TestConnection extends \Magento\AdvancedSearch\Block\Adminhtml\System\Config\TestConnection`
`12`	`14`	`{`
Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,8 @@`
`12`	`12`
`13`	`13`	`/**`
`14`	`14`	`* Default name resolver.`
	`15`	`+ *`
	`16`	`+ * @deprecated in favor of Elasticsearch 7.`
`15`	`17`	`*/`
`16`	`18`	`class DefaultResolver extends Base`
`17`	`19`	`{`
Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,8 @@`
`11`	`11`
`12`	`12`	`/**`
`13`	`13`	`* Elasticsearch client`
	`14`	`+ *`
	`15`	`+ * @deprecated in favor of Elasticsearch 7.`
`14`	`16`	`*/`
`15`	`17`	`class Elasticsearch implements ClientInterface`
`16`	`18`	`{`