Merge remote-tracking branch 'origin/2.4-develop' into MC-25109

Author: yelahin-serhiy

app/code/Magento/Customer/Block/Account/Dashboard.php

@@ -7,27 +7,35 @@
 
 use Magento\Customer\Api\AccountManagementInterface;
 use Magento\Customer\Api\CustomerRepositoryInterface;
+use Magento\Customer\Api\Data\AddressInterface;
+use Magento\Customer\Api\Data\CustomerInterface;
+use Magento\Customer\Model\Session;
+use Magento\Framework\Phrase;
+use Magento\Framework\View\Element\Template;
+use Magento\Framework\View\Element\Template\Context;
+use Magento\Newsletter\Model\Subscriber;
+use Magento\Newsletter\Model\SubscriberFactory;
 
 /**
  * Customer dashboard block
  *
  * @api
  * @since 100.0.2
  */
-class Dashboard extends \Magento\Framework\View\Element\Template
+class Dashboard extends Template
 {
     /**
-     * @var \Magento\Newsletter\Model\Subscriber
+     * @var Subscriber
      */
     protected $subscription;
 
     /**
-     * @var \Magento\Customer\Model\Session
+     * @var Session
      */
     protected $customerSession;
 
     /**
-     * @var \Magento\Newsletter\Model\SubscriberFactory
+     * @var SubscriberFactory
      */
     protected $subscriberFactory;
 
@@ -42,19 +50,17 @@ class Dashboard extends \Magento\Framework\View\Element\Template
     protected $customerAccountManagement;
 
     /**
-     * Constructor
-     *
-     * @param \Magento\Framework\View\Element\Template\Context $context
-     * @param \Magento\Customer\Model\Session $customerSession
-     * @param \Magento\Newsletter\Model\SubscriberFactory $subscriberFactory
+     * @param Context $context
+     * @param Session $customerSession
+     * @param SubscriberFactory $subscriberFactory
      * @param CustomerRepositoryInterface $customerRepository
      * @param AccountManagementInterface $customerAccountManagement
      * @param array $data
      */
     public function __construct(
-        \Magento\Framework\View\Element\Template\Context $context,
-        \Magento\Customer\Model\Session $customerSession,
-        \Magento\Newsletter\Model\SubscriberFactory $subscriberFactory,
+        Context $context,
+        Session $customerSession,
+        SubscriberFactory $subscriberFactory,
         CustomerRepositoryInterface $customerRepository,
         AccountManagementInterface $customerAccountManagement,
         array $data = []
@@ -69,7 +75,7 @@ public function __construct(
     /**
      * Return the Customer given the customer Id stored in the session.
      *
-     * @return \Magento\Customer\Api\Data\CustomerInterface
+     * @return CustomerInterface
      */
     public function getCustomer()
     {
@@ -99,7 +105,7 @@ public function getAddressesUrl()
     /**
      * Retrieve the Url for editing the specified address.
      *
-     * @param \Magento\Customer\Api\Data\AddressInterface $address
+     * @param AddressInterface $address
      * @return string
      */
     public function getAddressEditUrl($address)
@@ -146,13 +152,14 @@ public function getWishlistUrl()
     /**
      * Retrieve the subscription object (i.e. the subscriber).
      *
-     * @return \Magento\Newsletter\Model\Subscriber
+     * @return Subscriber
      */
     public function getSubscriptionObject()
     {
         if ($this->subscription === null) {
-            $this->subscription =
-                $this->_createSubscriber()->loadByCustomerId($this->customerSession->getCustomerId());
+            $websiteId = (int)$this->_storeManager->getWebsite()->getId();
+            $this->subscription = $this->_createSubscriber();
+            $this->subscription->loadByCustomer((int)$this->getCustomer()->getId(), $websiteId);
         }
 
         return $this->subscription;
@@ -171,7 +178,7 @@ public function getManageNewsletterUrl()
     /**
      * Retrieve subscription text, either subscribed or not.
      *
-     * @return \Magento\Framework\Phrase
+     * @return Phrase
      */
     public function getSubscriptionText()
     {
@@ -185,7 +192,7 @@ public function getSubscriptionText()
     /**
      * Retrieve the customer's primary addresses (i.e. default billing and shipping).
      *
-     * @return \Magento\Customer\Api\Data\AddressInterface[]|bool
+     * @return AddressInterface[]|bool
      */
     public function getPrimaryAddresses()
     {
@@ -230,7 +237,7 @@ public function getBackUrl()
     /**
      * Create an instance of a subscriber.
      *
-     * @return \Magento\Newsletter\Model\Subscriber
+     * @return Subscriber
      */
     protected function _createSubscriber()
     {

app/code/Magento/Customer/Block/Account/Dashboard/Info.php

@@ -5,52 +5,60 @@
  */
 namespace Magento\Customer\Block\Account\Dashboard;
 
+use Magento\Customer\Api\Data\CustomerInterface;
+use Magento\Customer\Block\Form\Register;
+use Magento\Customer\Helper\Session\CurrentCustomer;
+use Magento\Customer\Helper\View;
 use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Framework\View\Element\Template;
+use Magento\Framework\View\Element\Template\Context;
+use Magento\Newsletter\Model\Subscriber;
+use Magento\Newsletter\Model\SubscriberFactory;
 
 /**
  * Dashboard Customer Info
  *
  * @api
  * @since 100.0.2
  */
-class Info extends \Magento\Framework\View\Element\Template
+class Info extends Template
 {
     /**
      * Cached subscription object
      *
-     * @var \Magento\Newsletter\Model\Subscriber
+     * @var Subscriber
      */
     protected $_subscription;
 
     /**
-     * @var \Magento\Newsletter\Model\SubscriberFactory
+     * @var SubscriberFactory
      */
     protected $_subscriberFactory;
 
     /**
-     * @var \Magento\Customer\Helper\View
+     * @var View
      */
     protected $_helperView;
 
     /**
-     * @var \Magento\Customer\Helper\Session\CurrentCustomer
+     * @var CurrentCustomer
      */
     protected $currentCustomer;
 
     /**
      * Constructor
      *
-     * @param \Magento\Framework\View\Element\Template\Context $context
-     * @param \Magento\Customer\Helper\Session\CurrentCustomer $currentCustomer
-     * @param \Magento\Newsletter\Model\SubscriberFactory $subscriberFactory
-     * @param \Magento\Customer\Helper\View $helperView
+     * @param Context $context
+     * @param CurrentCustomer $currentCustomer
+     * @param SubscriberFactory $subscriberFactory
+     * @param View $helperView
      * @param array $data
      */
     public function __construct(
-        \Magento\Framework\View\Element\Template\Context $context,
-        \Magento\Customer\Helper\Session\CurrentCustomer $currentCustomer,
-        \Magento\Newsletter\Model\SubscriberFactory $subscriberFactory,
-        \Magento\Customer\Helper\View $helperView,
+        Context $context,
+        CurrentCustomer $currentCustomer,
+        SubscriberFactory $subscriberFactory,
+        View $helperView,
         array $data = []
     ) {
         $this->currentCustomer = $currentCustomer;
@@ -62,7 +70,7 @@ public function __construct(
     /**
      * Returns the Magento Customer Model for this block
      *
-     * @return \Magento\Customer\Api\Data\CustomerInterface|null
+     * @return CustomerInterface|null
      */
     public function getCustomer()
     {
@@ -84,6 +92,8 @@ public function getName()
     }
 
     /**
+     * Get the url to change password
+     *
      * @return string
      */
     public function getChangePasswordUrl()
@@ -94,15 +104,16 @@ public function getChangePasswordUrl()
     /**
      * Get Customer Subscription Object Information
      *
-     * @return \Magento\Newsletter\Model\Subscriber
+     * @return Subscriber
      */
     public function getSubscriptionObject()
     {
         if (!$this->_subscription) {
             $this->_subscription = $this->_createSubscriber();
             $customer = $this->getCustomer();
             if ($customer) {
-                $this->_subscription->loadByCustomerId($customer->getId());
+                $websiteId = (int)$this->_storeManager->getWebsite()->getId();
+                $this->_subscription->loadByCustomer((int)$customer->getId(), $websiteId);
             }
         }
         return $this->_subscription;
@@ -128,20 +139,22 @@ public function getIsSubscribed()
     public function isNewsletterEnabled()
     {
         return $this->getLayout()
-            ->getBlockSingleton(\Magento\Customer\Block\Form\Register::class)
+            ->getBlockSingleton(Register::class)
             ->isNewsletterEnabled();
     }
 
     /**
-     * @return \Magento\Newsletter\Model\Subscriber
+     * Create new instance of Subscriber
+     *
+     * @return Subscriber
      */
     protected function _createSubscriber()
     {
         return $this->_subscriberFactory->create();
     }
 
     /**
-     * @return string
+     * @inheritdoc
      */
     protected function _toHtml()
     {