🔃 [EngCom] Public Pull Requests - 2.2-develop

Accepted Public Pull Requests:
 - #12810: Stop the profiler when returning early in \Magento\Eav\Model\Config::getAttribute (by @nicka101)
 - #12738: #12719: Use full name in welcome message (by @xpoback)
 - #12739: #6113: Validate range-words in Form component (UI Component) (by @zamoroka)
 - #12758: #5035 Cannot subscribe to events with a number in name (by @Mobecls)
 - #12759: Fix Back to Sign in url on confirmation form (by @StasKozar)
 - #12732: Fix issue when tracking link returns 404 page in admin panel (by @ihor-sviziev)
 - #12630: Add customer login url from Customer Url model to checkout config so … (by @quisse)
 - magento-engcom/magento2ce#1022: 6965:  \Magento\Directory\Model\PriceCurrency::format() fails without conversion rate (by @nmalevanec)
 - #12826: Fix PhpDoc to show correct parameter types (by @FreekVandeursen)


Fixed GitHub Issues:
 - #12719: Welcome message is shown with customer's first and last names after confirming account (reported by @alena-marchenko) has been fixed in #12738 by @xpoback in 2.2-develop branch
   Related commits:
     1. 6b9c39c

 - #6113: Validate range-words in Form component (UI Component) (reported by @robinhuy) has been fixed in #12739 by @zamoroka in 2.2-develop branch
   Related commits:
     1. 465e14b
     2. 8bc807f
     3. e9dcb03

 - #5035: I can not to subscribe on change of all sections in Stores ->Configuration using event admin_system_config_changed_section (reported by @katesuykovskaya) has been fixed in #12758 by @Mobecls in 2.2-develop branch
   Related commits:
     1. 937b26d
     2. 85fa671

 - #12715: Storefront Back to Sign in button does not work as expected (reported by @alena-marchenko) has been fixed in #12759 by @StasKozar in 2.2-develop branch
   Related commits:
     1. 946382c
     2. faee0fc

 - #12206: Tracking link returns 404 page in admin panel (reported by @catstantin) has been fixed in #12732 by @ihor-sviziev in 2.2-develop branch
   Related commits:
     1. ecf27be
     2. 5e4bf42

 - #12627: Referer is not added to login url in checkout config (reported by @quisse) has been fixed in #12630 by @quisse in 2.2-develop branch
   Related commits:
     1. 6f7219f
     2. 2602e7e
     3. 115ba8e
     4. 97f77e6
     5. bb3932c
     6. 8986107
     7. 5c87fb0
     8. 4350858

 - #6965: \Magento\Directory\Model\PriceCurrency::format() fails without conversion rate (reported by @Vinai) has been fixed in magento-engcom/magento2ce#1022 by @nmalevanec in 2.2-develop branch
   Related commits:
     1. 2c4fa07
     2. ed5ffed

Author: Oleksii Korshenko

app/code/Magento/Customer/Controller/Account/Confirmation.php

@@ -6,8 +6,10 @@
  */
 namespace Magento\Customer\Controller\Account;
 
+use Magento\Customer\Model\Url;
 use Magento\Framework\App\Action\Context;
 use Magento\Customer\Model\Session;
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\View\Result\PageFactory;
 use Magento\Store\Model\StoreManagerInterface;
 use Magento\Customer\Api\AccountManagementInterface;
@@ -35,24 +37,32 @@ class Confirmation extends \Magento\Customer\Controller\AbstractAccount
      */
     protected $resultPageFactory;
 
+    /**
+     * @var Url
+     */
+    private $customerUrl;
+
     /**
      * @param Context $context
      * @param Session $customerSession
      * @param PageFactory $resultPageFactory
      * @param StoreManagerInterface $storeManager
      * @param AccountManagementInterface $customerAccountManagement
+     * @param Url $customerUrl
      */
     public function __construct(
         Context $context,
         Session $customerSession,
         PageFactory $resultPageFactory,
         StoreManagerInterface $storeManager,
-        AccountManagementInterface $customerAccountManagement
+        AccountManagementInterface $customerAccountManagement,
+        Url $customerUrl = null
     ) {
         $this->session = $customerSession;
         $this->resultPageFactory = $resultPageFactory;
         $this->storeManager = $storeManager;
         $this->customerAccountManagement = $customerAccountManagement;
+        $this->customerUrl = $customerUrl ?: ObjectManager::getInstance()->get(Url::class);
         parent::__construct($context);
     }
 
@@ -98,6 +108,8 @@ public function execute()
         $resultPage = $this->resultPageFactory->create();
         $resultPage->getLayout()->getBlock('accountConfirmation')->setEmail(
             $this->getRequest()->getParam('email', $email)
+        )->setLoginUrl(
+            $this->customerUrl->getLoginUrl()
         );
         return $resultPage;
     }

app/code/Magento/Customer/Model/Checkout/ConfigProvider.php

@@ -7,6 +7,7 @@
 
 use Magento\Checkout\Model\ConfigProviderInterface;
 use Magento\Customer\Model\Url;
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\UrlInterface;
 use Magento\Store\Model\StoreManagerInterface;
 use Magento\Framework\App\Config\ScopeConfigInterface;
@@ -22,6 +23,7 @@ class ConfigProvider implements ConfigProviderInterface
 
     /**
      * @var UrlInterface
+     * @deprecated
      */
     protected $urlBuilder;
 
@@ -30,19 +32,28 @@ class ConfigProvider implements ConfigProviderInterface
      */
     protected $scopeConfig;
 
+    /**
+     * @var Url
+     */
+    private $customerUrl;
+
     /**
      * @param UrlInterface $urlBuilder
      * @param StoreManagerInterface $storeManager
      * @param ScopeConfigInterface $scopeConfig
+     * @param Url|null $customerUrl
      */
     public function __construct(
         UrlInterface $urlBuilder,
         StoreManagerInterface $storeManager,
-        ScopeConfigInterface $scopeConfig
+        ScopeConfigInterface $scopeConfig,
+        Url $customerUrl = null
     ) {
         $this->urlBuilder = $urlBuilder;
         $this->storeManager = $storeManager;
         $this->scopeConfig = $scopeConfig;
+        $this->customerUrl = $customerUrl ?? ObjectManager::getInstance()
+                ->get(Url::class);
     }
 
     /**
@@ -78,7 +89,7 @@ protected function isAutocompleteEnabled()
      */
     protected function getLoginUrl()
     {
-        return $this->urlBuilder->getUrl(Url::ROUTE_ACCOUNT_LOGIN);
+        return $this->customerUrl->getLoginUrl();
     }
 
     /**

app/code/Magento/Customer/Test/Unit/Controller/Account/ConfirmationTest.php

@@ -0,0 +1,116 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Customer\Test\Unit\Controller\Account;
+
+use Magento\Customer\Controller\Account\Confirmation;
+use Magento\Framework\App\Request\Http;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+
+class ConfirmationTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var Confirmation
+     */
+    private $model;
+    
+    /**
+     * @var \Magento\Customer\Model\Session|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $customerSessionMock;
+
+    /**
+     * @var \Magento\Framework\App\Action\Context|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $contextMock;
+
+    /**
+     * @var \Magento\Framework\View\Result\PageFactory|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $resultPageFactoryMock;
+
+    /**
+     * @var \Magento\Customer\Model\Url|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $customerUrlMock;
+
+    /**
+     * @var \Magento\Framework\App\Request\Http|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $requestMock;
+
+    public function setUp()
+    {
+        $this->customerSessionMock = $this->getMockBuilder(\Magento\Customer\Model\Session::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['isLoggedIn'])
+            ->getMock();
+        $this->contextMock = $this->getMockBuilder(\Magento\Framework\App\Action\Context::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getRequest'])
+            ->getMock();
+        $this->requestMock = $this->getMockBuilder(Http::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getPost', 'getParam'])
+            ->getMock();
+        $this->contextMock->expects($this->any())
+            ->method('getRequest')
+            ->willReturn($this->requestMock);
+        
+        $this->resultPageFactoryMock = $this->getMockBuilder(\Magento\Framework\View\Result\PageFactory::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['create'])
+            ->getMock();
+        $this->customerUrlMock = $this->getMockBuilder(\Magento\Customer\Model\Url::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getLoginUrl'])
+            ->getMock();
+        $this->model = (new ObjectManagerHelper($this))->getObject(
+            Confirmation::class,
+            [
+                'context' => $this->contextMock,
+                'customerSession' => $this->customerSessionMock,
+                'resultPageFactory' => $this->resultPageFactoryMock,
+                'customerUrl' => $this->customerUrlMock,
+            ]
+        );
+    }
+
+    public function testGetLoginUrl()
+    {
+        $this->customerSessionMock->expects($this->once())
+            ->method('isLoggedIn')
+            ->willReturn(false);
+        
+        $this->requestMock->expects($this->once())->method('getPost')->with('email')->willReturn(null);
+
+        $resultPageMock = $this->getMockBuilder(\Magento\Framework\View\Result\Page::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getLayout'])
+            ->getMock();
+
+        $this->resultPageFactoryMock->expects($this->once())->method('create')->willReturn($resultPageMock);
+
+        $layoutMock = $this->getMockBuilder(\Magento\Framework\View\Layout::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getBlock'])
+            ->getMock();
+
+        $resultPageMock->expects($this->once())->method('getLayout')->willReturn($layoutMock);
+
+        $blockMock = $this->getMockBuilder(\Magento\Framework\View\Element\Template::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['setEmail', 'setLoginUrl'])
+            ->getMock();
+
+        $layoutMock->expects($this->once())->method('getBlock')->with('accountConfirmation')->willReturn($blockMock);
+
+        $blockMock->expects($this->once())->method('setEmail')->willReturnSelf();
+        $blockMock->expects($this->once())->method('setLoginUrl')->willReturnSelf();
+
+        $this->model->execute();
+    }
+}

app/code/Magento/Customer/Test/Unit/Model/Checkout/ConfigProviderTest.php

@@ -41,6 +41,11 @@ class ConfigProviderTest extends \PHPUnit\Framework\TestCase
      */
     protected $store;
 
+    /**
+     * @var Url|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $customerUrl;
+
     protected function setUp()
     {
         $this->storeManager = $this->getMockForAbstractClass(
@@ -49,12 +54,14 @@ protected function setUp()
             '',
             false
         );
+
         $this->urlBuilder = $this->getMockForAbstractClass(
             \Magento\Framework\UrlInterface::class,
             [],
             '',
             false
         );
+
         $this->scopeConfig = $this->getMockForAbstractClass(
             \Magento\Framework\App\Config\ScopeConfigInterface::class,
             [],
@@ -71,10 +78,13 @@ protected function setUp()
             ['getBaseUrl']
         );
 
+        $this->customerUrl = $this->createMock(\Magento\Customer\Model\Url::class);
+
         $this->provider = new ConfigProvider(
             $this->urlBuilder,
             $this->storeManager,
-            $this->scopeConfig
+            $this->scopeConfig,
+            $this->customerUrl
         );
     }
 
@@ -83,9 +93,8 @@ public function testGetConfigWithoutRedirect()
         $loginUrl = 'http://url.test/customer/login';
         $baseUrl = 'http://base-url.test';
 
-        $this->urlBuilder->expects($this->exactly(2))
-            ->method('getUrl')
-            ->with(Url::ROUTE_ACCOUNT_LOGIN)
+        $this->customerUrl->expects($this->exactly(2))
+            ->method('getLoginUrl')
             ->willReturn($loginUrl);
         $this->storeManager->expects($this->once())
             ->method('getStore')
@@ -112,9 +121,8 @@ public function testGetConfig()
         $loginUrl = 'http://base-url.test/customer/login';
         $baseUrl = 'http://base-url.test';
 
-        $this->urlBuilder->expects($this->exactly(2))
-            ->method('getUrl')
-            ->with(Url::ROUTE_ACCOUNT_LOGIN)
+        $this->customerUrl->expects($this->exactly(2))
+            ->method('getLoginUrl')
             ->willReturn($loginUrl);
         $this->storeManager->expects($this->once())
             ->method('getStore')

app/code/Magento/Directory/Model/PriceCurrency.php

@@ -77,8 +77,7 @@ public function format(
         $scope = null,
         $currency = null
     ) {
-        return $this->getCurrency($scope, $currency)
-            ->formatPrecision($amount, $precision, [], $includeContainer);
+        return $this->createCurrency($scope, $currency)->formatPrecision($amount, $precision, [], $includeContainer);
     }
 
     /**
@@ -101,20 +100,7 @@ public function convertAndFormat(
      */
     public function getCurrency($scope = null, $currency = null)
     {
-        if ($currency instanceof Currency) {
-            $currentCurrency = $currency;
-        } elseif (is_string($currency)) {
-            $currency = $this->currencyFactory->create()
-                ->load($currency);
-            $baseCurrency = $this->getStore($scope)
-                ->getBaseCurrency();
-            $currentCurrency = $baseCurrency->getRate($currency) ? $currency : $baseCurrency;
-        } else {
-            $currentCurrency = $this->getStore($scope)
-                ->getCurrentCurrency();
-        }
-
-        return $currentCurrency;
+        return $this->createCurrency($scope, $currency, true);
     }
 
     /**
@@ -157,4 +143,30 @@ public function round($price)
     {
         return round($price, 2);
     }
+
+    /**
+     * Get currency considering currency rate configuration.
+     *
+     * @param null|string|bool|int|\Magento\Framework\App\ScopeInterface $scope
+     * @param \Magento\Framework\Model\AbstractModel|string|null $currency
+     * @param bool $includeRate
+     *
+     * @return Currency
+     */
+    private function createCurrency($scope, $currency, bool $includeRate = false)
+    {
+        if ($currency instanceof Currency) {
+            $currentCurrency = $currency;
+        } elseif (is_string($currency)) {
+            $currentCurrency = $this->currencyFactory->create()->load($currency);
+            if ($includeRate) {
+                $baseCurrency = $this->getStore($scope)->getBaseCurrency();
+                $currentCurrency = $baseCurrency->getRate($currentCurrency) ? $currentCurrency : $baseCurrency;
+            }
+        } else {
+            $currentCurrency = $this->getStore($scope)->getCurrentCurrency();
+        }
+
+        return $currentCurrency;
+    }
 }

app/code/Magento/Eav/Model/Config.php

@@ -503,6 +503,7 @@ public function getAttribute($entityType, $code)
         }
 
         if (isset($this->attributes[$entityTypeCode][$code])) {
+            \Magento\Framework\Profiler::stop('EAV: ' . __METHOD__);
             return $this->attributes[$entityTypeCode][$code];
         }