Revert AC-1883

Author: glo71317

app/code/Magento/Elasticsearch/Model/DataProvider/Base/Suggestions.php

@@ -226,7 +226,6 @@ private function addSuggestFields($searchQuery, $searchSuggestionsCount)
                         [
                             'field' => $field,
                             'min_word_length' => 3,
-                            'min_doc_freq' => 1,
                         ]
                     ],
                 ],

app/code/Magento/Newsletter/Model/Subscriber.php

@@ -53,19 +53,19 @@
  */
 class Subscriber extends AbstractModel
 {
-    const STATUS_SUBSCRIBED = 1;
-    const STATUS_NOT_ACTIVE = 2;
-    const STATUS_UNSUBSCRIBED = 3;
-    const STATUS_UNCONFIRMED = 4;
+    public const STATUS_SUBSCRIBED = 1;
+    public const STATUS_NOT_ACTIVE = 2;
+    public const STATUS_UNSUBSCRIBED = 3;
+    public const STATUS_UNCONFIRMED = 4;
 
-    const XML_PATH_CONFIRM_EMAIL_TEMPLATE = 'newsletter/subscription/confirm_email_template';
-    const XML_PATH_CONFIRM_EMAIL_IDENTITY = 'newsletter/subscription/confirm_email_identity';
-    const XML_PATH_SUCCESS_EMAIL_TEMPLATE = 'newsletter/subscription/success_email_template';
-    const XML_PATH_SUCCESS_EMAIL_IDENTITY = 'newsletter/subscription/success_email_identity';
-    const XML_PATH_UNSUBSCRIBE_EMAIL_TEMPLATE = 'newsletter/subscription/un_email_template';
-    const XML_PATH_UNSUBSCRIBE_EMAIL_IDENTITY = 'newsletter/subscription/un_email_identity';
-    const XML_PATH_CONFIRMATION_FLAG = 'newsletter/subscription/confirm';
-    const XML_PATH_ALLOW_GUEST_SUBSCRIBE_FLAG = 'newsletter/subscription/allow_guest_subscribe';
+    public const XML_PATH_CONFIRM_EMAIL_TEMPLATE = 'newsletter/subscription/confirm_email_template';
+    public const XML_PATH_CONFIRM_EMAIL_IDENTITY = 'newsletter/subscription/confirm_email_identity';
+    public const XML_PATH_SUCCESS_EMAIL_TEMPLATE = 'newsletter/subscription/success_email_template';
+    public const XML_PATH_SUCCESS_EMAIL_IDENTITY = 'newsletter/subscription/success_email_identity';
+    public const XML_PATH_UNSUBSCRIBE_EMAIL_TEMPLATE = 'newsletter/subscription/un_email_template';
+    public const XML_PATH_UNSUBSCRIBE_EMAIL_IDENTITY = 'newsletter/subscription/un_email_identity';
+    public const XML_PATH_CONFIRMATION_FLAG = 'newsletter/subscription/confirm';
+    public const XML_PATH_ALLOW_GUEST_SUBSCRIBE_FLAG = 'newsletter/subscription/allow_guest_subscribe';
 
     /**
      * Prefix of model events names
@@ -91,7 +91,6 @@ class Subscriber extends AbstractModel
     protected $_isStatusChanged = false;
 
     /**
-     * Newsletter data
      *
      * @var Data
      */
@@ -105,7 +104,6 @@ class Subscriber extends AbstractModel
     protected $_scopeConfig;
 
     /**
-     * Customer session
      *
      * @var \Magento\Customer\Model\Session
      */
@@ -118,7 +116,6 @@ class Subscriber extends AbstractModel
     private $dateTime;
 
     /**
-     * Store manager
      *
      * @var StoreManagerInterface
      */
@@ -565,8 +562,9 @@ private function sendEmail(string $emailTemplatePath, string $emailIdentityPath,
             ]
         )->setTemplateVars(
             $templateVars
-        )->setFrom(
-            $identity
+        )->setFromByScope(
+            $identity,
+            $this->getStoreId()
         )->addTo(
             $this->getEmail(),
             $this->getName()

app/code/Magento/Newsletter/Test/Unit/Model/SubscriberTest.php

@@ -115,6 +115,7 @@ protected function setUp(): void
                 'setTemplateOptions',
                 'setTemplateVars',
                 'setFrom',
+                'setFromByScope',
                 'addTo',
                 'getTransport'
             ]
@@ -133,8 +134,8 @@ protected function setUp(): void
         $this->inlineTranslation = $this->getMockForAbstractClass(StateInterface::class);
         $this->resource = $this->getMockBuilder(SubscriberResourceModel::class)
             ->addMethods(
-            ['loadByCustomer']
-        )
+                ['loadByCustomer']
+            )
             ->onlyMethods(
                 ['loadByEmail', 'getIdFieldName', 'save', 'received', 'loadBySubscriberEmail', 'loadByCustomerId']
             )
@@ -379,8 +380,8 @@ private function sendEmailCheck(string $templateConfigPath, string $identityTemp
             ->with($vars)
             ->willReturnSelf();
         $this->transportBuilder->expects($this->once())
-            ->method('setFrom')
-            ->with($identity)
+            ->method('setFromByScope')
+            ->with($identity, $this->subscriber->getStoreId())
             ->willReturnSelf();
         $this->transportBuilder->expects($this->once())
             ->method('addTo')