Merge branch 'MC-42883' of https://github.com/magento-l3/magento2ce into L3-PR-20210908

Author: ArtemVasyliev

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

@@ -8,7 +8,6 @@
 
 namespace Magento\Customer\Controller\Account;
 
-use Magento\Customer\Api\SessionCleanerInterface;
 use Magento\Framework\App\Action\HttpPostActionInterface;
 use Magento\Framework\App\Action\HttpGetActionInterface;
 use Magento\Customer\Model\Session;
@@ -38,24 +37,15 @@ class Logout extends AbstractAccount implements HttpGetActionInterface, HttpPost
      */
     private $cookieMetadataManager;
 
-    /**
-     * @var SessionCleanerInterface
-     */
-    private $sessionCleaner;
-
     /**
      * @param Context $context
      * @param Session $customerSession
-     * @param SessionCleanerInterface|null $sessionCleaner
      */
     public function __construct(
         Context $context,
-        Session $customerSession,
-        SessionCleanerInterface $sessionCleaner = null
+        Session $customerSession
     ) {
         $this->session = $customerSession;
-        $objectManager = ObjectManager::getInstance();
-        $this->sessionCleaner = $sessionCleaner ?? $objectManager->get(SessionCleanerInterface::class);
         parent::__construct($context);
     }
 
@@ -97,7 +87,6 @@ public function execute()
         $lastCustomerId = $this->session->getId();
         $this->session->logout()->setBeforeAuthUrl($this->_redirect->getRefererUrl())
             ->setLastCustomerId($lastCustomerId);
-        $this->sessionCleaner->clearFor((int)$lastCustomerId);
         if ($this->getCookieManager()->getCookie('mage-cache-sessid')) {
             $metadata = $this->getCookieMetadataFactory()->createCookieMetadata();
             $metadata->setPath('/');

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

@@ -7,7 +7,6 @@
 
 namespace Magento\Customer\Test\Unit\Controller\Account;
 
-use Magento\Customer\Api\SessionCleanerInterface;
 use Magento\Customer\Controller\Account\Logout;
 use Magento\Customer\Model\Session;
 use Magento\Framework\App\Action\Context;
@@ -49,11 +48,6 @@ class LogoutTest extends TestCase
     /** @var RedirectInterface|MockObject */
     protected $redirect;
 
-    /**
-     * @var SessionCleanerInterface|MockObject
-     */
-    private $sessionCleanerMock;
-
     protected function setUp(): void
     {
         $this->contextMock = $this->getMockBuilder(Context::class)
@@ -63,7 +57,6 @@ protected function setUp(): void
             ->disableOriginalConstructor()
             ->setMethods(['getId', 'logout', 'setBeforeAuthUrl', 'setLastCustomerId'])
             ->getMock();
-        $this->sessionCleanerMock = $this->createMock(SessionCleanerInterface::class);
 
         $this->cookieMetadataFactory = $this->getMockBuilder(CookieMetadataFactory::class)
             ->disableOriginalConstructor()
@@ -90,7 +83,7 @@ protected function setUp(): void
             ->method('getRedirect')
             ->willReturn($this->redirect);
 
-        $this->controller = new Logout($this->contextMock, $this->sessionMock, $this->sessionCleanerMock);
+        $this->controller = new Logout($this->contextMock, $this->sessionMock);
 
         $refClass = new \ReflectionClass(Logout::class);
         $cookieMetadataManagerProperty = $refClass->getProperty('cookieMetadataManager');
@@ -124,11 +117,6 @@ public function testExecute()
             ->method('setLastCustomerId')
             ->with($customerId);
 
-        $this->sessionCleanerMock->expects($this->once())
-            ->method('clearFor')
-            ->with($customerId)
-            ->willReturnSelf();
-
         $this->cookieManager->expects($this->once())
             ->method('getCookie')
             ->with('mage-cache-sessid')