lib/internal/Magento/Framework/Session/SidResolverInterface has been removed. The Unused deprecated class lib/internal/Magento/Framework/Session/SidResolver that implements this interface has been removed

Author: vlmed

app/code/Magento/Backend/Block/Context.php

@@ -37,7 +37,6 @@ class Context extends \Magento\Framework\View\Element\Context
      * @param \Magento\Framework\App\CacheInterface $cache
      * @param \Magento\Framework\View\DesignInterface $design
      * @param \Magento\Framework\Session\SessionManagerInterface $session
-     * @param \Magento\Framework\Session\SidResolverInterface $sidResolver
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
      * @param \Magento\Framework\View\Asset\Repository $assetRepo
      * @param \Magento\Framework\View\ConfigInterface $viewConfig
@@ -60,7 +59,6 @@ public function __construct(
         \Magento\Framework\App\CacheInterface $cache,
         \Magento\Framework\View\DesignInterface $design,
         \Magento\Framework\Session\SessionManagerInterface $session,
-        \Magento\Framework\Session\SidResolverInterface $sidResolver,
         \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
         \Magento\Framework\View\Asset\Repository $assetRepo,
         \Magento\Framework\View\ConfigInterface $viewConfig,
@@ -82,7 +80,6 @@ public function __construct(
             $cache,
             $design,
             $session,
-            $sidResolver,
             $scopeConfig,
             $assetRepo,
             $viewConfig,

app/code/Magento/Backend/Block/Template/Context.php

@@ -64,7 +64,6 @@ class Context extends \Magento\Framework\View\Element\Template\Context
      * @param \Magento\Framework\App\CacheInterface $cache
      * @param \Magento\Framework\View\DesignInterface $design
      * @param \Magento\Framework\Session\Generic $session
-     * @param \Magento\Framework\Session\SidResolverInterface $sidResolver
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
      * @param \Magento\Framework\View\Asset\Repository $assetRepo
      * @param \Magento\Framework\View\ConfigInterface $viewConfig
@@ -99,7 +98,6 @@ public function __construct(
         \Magento\Framework\App\CacheInterface $cache,
         \Magento\Framework\View\DesignInterface $design,
         \Magento\Framework\Session\Generic $session,
-        \Magento\Framework\Session\SidResolverInterface $sidResolver,
         \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
         \Magento\Framework\View\Asset\Repository $assetRepo,
         \Magento\Framework\View\ConfigInterface $viewConfig,
@@ -137,7 +135,6 @@ public function __construct(
             $cache,
             $design,
             $session,
-            $sidResolver,
             $scopeConfig,
             $assetRepo,
             $viewConfig,

app/code/Magento/Backend/Block/Widget/Context.php

@@ -47,7 +47,6 @@ class Context extends \Magento\Backend\Block\Template\Context
      * @param \Magento\Framework\App\CacheInterface $cache
      * @param \Magento\Framework\View\DesignInterface $design
      * @param \Magento\Framework\Session\Generic $session
-     * @param \Magento\Framework\Session\SidResolverInterface $sidResolver
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
      * @param \Magento\Framework\View\Asset\Repository $assetRepo
      * @param \Magento\Framework\View\ConfigInterface $viewConfig
@@ -84,7 +83,6 @@ public function __construct(
         \Magento\Framework\App\CacheInterface $cache,
         \Magento\Framework\View\DesignInterface $design,
         \Magento\Framework\Session\Generic $session,
-        \Magento\Framework\Session\SidResolverInterface $sidResolver,
         \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
         \Magento\Framework\View\Asset\Repository $assetRepo,
         \Magento\Framework\View\ConfigInterface $viewConfig,
@@ -119,7 +117,6 @@ public function __construct(
             $cache,
             $design,
             $session,
-            $sidResolver,
             $scopeConfig,
             $assetRepo,
             $viewConfig,

app/code/Magento/Backend/Model/Auth/Session.php

@@ -67,7 +67,6 @@ class Session extends \Magento\Framework\Session\SessionManager implements \Mage
 
     /**
      * @param \Magento\Framework\App\Request\Http $request
-     * @param \Magento\Framework\Session\SidResolverInterface $sidResolver
      * @param \Magento\Framework\Session\Config\ConfigInterface $sessionConfig
      * @param \Magento\Framework\Session\SaveHandlerInterface $saveHandler
      * @param \Magento\Framework\Session\ValidatorInterface $validator
@@ -84,7 +83,6 @@ class Session extends \Magento\Framework\Session\SessionManager implements \Mage
      */
     public function __construct(
         \Magento\Framework\App\Request\Http $request,
-        \Magento\Framework\Session\SidResolverInterface $sidResolver,
         \Magento\Framework\Session\Config\ConfigInterface $sessionConfig,
         \Magento\Framework\Session\SaveHandlerInterface $saveHandler,
         \Magento\Framework\Session\ValidatorInterface $validator,
@@ -103,7 +101,6 @@ public function __construct(
         $this->messageManager = $messageManager ?? ObjectManager::getInstance()->get(ManagerInterface::class);
         parent::__construct(
             $request,
-            $sidResolver,
             $sessionConfig,
             $saveHandler,
             $validator,

app/code/Magento/Backend/Model/Session/Quote.php

@@ -84,7 +84,6 @@ class Quote extends \Magento\Framework\Session\SessionManager
 
     /**
      * @param \Magento\Framework\App\Request\Http $request
-     * @param \Magento\Framework\Session\SidResolverInterface $sidResolver
      * @param \Magento\Framework\Session\Config\ConfigInterface $sessionConfig
      * @param \Magento\Framework\Session\SaveHandlerInterface $saveHandler
      * @param \Magento\Framework\Session\ValidatorInterface $validator
@@ -102,7 +101,6 @@ class Quote extends \Magento\Framework\Session\SessionManager
      */
     public function __construct(
         \Magento\Framework\App\Request\Http $request,
-        \Magento\Framework\Session\SidResolverInterface $sidResolver,
         \Magento\Framework\Session\Config\ConfigInterface $sessionConfig,
         \Magento\Framework\Session\SaveHandlerInterface $saveHandler,
         \Magento\Framework\Session\ValidatorInterface $validator,
@@ -125,7 +123,6 @@ public function __construct(
         $this->quoteFactory = $quoteFactory;
         parent::__construct(
             $request,
-            $sidResolver,
             $sessionConfig,
             $saveHandler,
             $validator,
@@ -154,7 +151,7 @@ public function getQuote()
                     $this->_quote->setCustomerGroupId($customerGroupId);
                     $this->_quote->setIsActive(false);
                     $this->_quote->setStoreId($this->getStoreId());
-                    
+
                     $this->quoteRepository->save($this->_quote);
                     $this->setQuoteId($this->_quote->getId());
                     $this->_quote = $this->quoteRepository->get($this->getQuoteId(), [$this->getStoreId()]);

app/code/Magento/Backend/Model/Url.php

@@ -90,7 +90,6 @@ class Url extends \Magento\Framework\Url implements \Magento\Backend\Model\UrlIn
      * @param \Magento\Framework\Url\SecurityInfoInterface $urlSecurityInfo
      * @param \Magento\Framework\Url\ScopeResolverInterface $scopeResolver
      * @param \Magento\Framework\Session\Generic $session
-     * @param \Magento\Framework\Session\SidResolverInterface $sidResolver
      * @param \Magento\Framework\Url\RouteParamsResolverFactory $routeParamsResolverFactory
      * @param \Magento\Framework\Url\QueryParamsResolverInterface $queryParamsResolver
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
@@ -114,7 +113,6 @@ public function __construct(
         \Magento\Framework\Url\SecurityInfoInterface $urlSecurityInfo,
         \Magento\Framework\Url\ScopeResolverInterface $scopeResolver,
         \Magento\Framework\Session\Generic $session,
-        \Magento\Framework\Session\SidResolverInterface $sidResolver,
         \Magento\Framework\Url\RouteParamsResolverFactory $routeParamsResolverFactory,
         \Magento\Framework\Url\QueryParamsResolverInterface $queryParamsResolver,
         \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
@@ -139,7 +137,6 @@ public function __construct(
             $urlSecurityInfo,
             $scopeResolver,
             $session,
-            $sidResolver,
             $routeParamsResolverFactory,
             $queryParamsResolver,
             $scopeConfig,

app/code/Magento/Backend/Test/Unit/Model/Session/QuoteTest.php

@@ -17,7 +17,6 @@
 use Magento\Framework\App\State;
 use Magento\Framework\Session\Config\ConfigInterface;
 use Magento\Framework\Session\SaveHandlerInterface;
-use Magento\Framework\Session\SidResolverInterface;
 use Magento\Framework\Session\Storage;
 use Magento\Framework\Session\StorageInterface;
 use Magento\Framework\Session\ValidatorInterface;
@@ -83,11 +82,6 @@ class QuoteTest extends TestCase
      */
     protected $sessionConfigMock;
 
-    /**
-     * @var SidResolverInterface|MockObject
-     */
-    protected $sidResolverMock;
-
     /**
      * @var Http|MockObject
      */
@@ -163,12 +157,6 @@ protected function setUp(): void
         $this->quoteRepositoryMock = $this->getMockForAbstractClass(CartRepositoryInterface::class);
 
         $this->requestMock = $this->createMock(Http::class);
-        $this->sidResolverMock = $this->getMockForAbstractClass(
-            SidResolverInterface::class,
-            [],
-            '',
-            false
-        );
         $this->sessionConfigMock = $this->getMockForAbstractClass(
             ConfigInterface::class,
             [],
@@ -208,7 +196,6 @@ protected function setUp(): void
             ->setConstructorArgs(
                 [
                     'request' => $this->requestMock,
-                    'sidResolver' => $this->sidResolverMock,
                     'sessionConfig' => $this->sessionConfigMock,
                     'saveHandler' => $this->saveHandlerMock,
                     'validator' => $this->validatorMock,

app/code/Magento/Catalog/Block/Product/Context.php

@@ -95,8 +95,6 @@ class Context extends \Magento\Framework\View\Element\Template\Context
      * @param \Magento\Framework\UrlInterface $urlBuilder
      * @param \Magento\Framework\App\CacheInterface $cache
      * @param \Magento\Framework\View\DesignInterface $design
-     * @param \Magento\Framework\Session\SessionManagerInterface $session
-     * @param \Magento\Framework\Session\SidResolverInterface $sidResolver
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
      * @param \Magento\Framework\View\Asset\Repository $assetRepo
      * @param \Magento\Framework\View\ConfigInterface $viewConfig
@@ -138,7 +136,6 @@ public function __construct(
         \Magento\Framework\App\CacheInterface $cache,
         \Magento\Framework\View\DesignInterface $design,
         \Magento\Framework\Session\SessionManagerInterface $session,
-        \Magento\Framework\Session\SidResolverInterface $sidResolver,
         \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
         \Magento\Framework\View\Asset\Repository $assetRepo,
         \Magento\Framework\View\ConfigInterface $viewConfig,
@@ -190,7 +187,6 @@ public function __construct(
             $cache,
             $design,
             $session,
-            $sidResolver,
             $scopeConfig,
             $assetRepo,
             $viewConfig,

app/code/Magento/Catalog/Model/Product/Url.php

@@ -36,11 +36,6 @@ class Url extends \Magento\Framework\DataObject
      */
     protected $storeManager;
 
-    /**
-     * @var \Magento\Framework\Session\SidResolverInterface
-     */
-    protected $sidResolver;
-
     /**
      * @var \Magento\UrlRewrite\Model\UrlFinderInterface
      */
@@ -55,7 +50,6 @@ class Url extends \Magento\Framework\DataObject
      * @param \Magento\Framework\UrlFactory $urlFactory
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Framework\Filter\FilterManager $filter
-     * @param \Magento\Framework\Session\SidResolverInterface $sidResolver
      * @param UrlFinderInterface $urlFinder
      * @param array $data
      * @param ScopeConfigInterface|null $scopeConfig
@@ -64,7 +58,6 @@ public function __construct(
         \Magento\Framework\UrlFactory $urlFactory,
         \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Framework\Filter\FilterManager $filter,
-        \Magento\Framework\Session\SidResolverInterface $sidResolver,
         UrlFinderInterface $urlFinder,
         array $data = [],
         ScopeConfigInterface $scopeConfig = null
@@ -73,7 +66,6 @@ public function __construct(
         $this->urlFactory = $urlFactory;
         $this->storeManager = $storeManager;
         $this->filter = $filter;
-        $this->sidResolver = $sidResolver;
         $this->urlFinder = $urlFinder;
         $this->scopeConfig = $scopeConfig ?:
             \Magento\Framework\App\ObjectManager::getInstance()->get(ScopeConfigInterface::class);

app/code/Magento/Catalog/Test/Unit/Model/Product/UrlTest.php

@@ -12,7 +12,6 @@
 use Magento\Catalog\Model\Product\Url;
 use Magento\Catalog\Model\Product\Url as ProductUrl;
 use Magento\Framework\Filter\FilterManager;
-use Magento\Framework\Session\SidResolverInterface;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\Framework\UrlFactory;
 use Magento\Store\Model\Store;
@@ -48,11 +47,6 @@ class UrlTest extends TestCase
      */
     protected $url;
 
-    /**
-     * @var SidResolverInterface|MockObject
-     */
-    protected $sidResolver;
-
     protected function setUp(): void
     {
         $this->filter = $this->getMockBuilder(
@@ -74,8 +68,6 @@ protected function setUp(): void
                 ['setScope', 'getUrl']
             )->getMock();
 
-        $this->sidResolver = $this->getMockForAbstractClass(SidResolverInterface::class);
-
         $store = $this->createPartialMock(Store::class, ['getId']);
         $store->expects($this->any())->method('getId')->willReturn(1);
         $storeManager = $this->getMockForAbstractClass(StoreManagerInterface::class);
@@ -95,7 +87,6 @@ protected function setUp(): void
                 'catalogCategory' => $this->catalogCategory,
                 'storeManager' => $storeManager,
                 'urlFactory' => $urlFactory,
-                'sidResolver' => $this->sidResolver,
             ]
         );
     }
@@ -186,10 +177,6 @@ public function testGetUrl(
                 break;
             case 'getProductUrl':
                 $this->assertEquals($requestPathProduct, $this->model->getProductUrl($product, null));
-                $this->sidResolver
-                    ->expects($this->never())
-                    ->method('getUseSessionInUrl')
-                    ->willReturn(true);
                 break;
         }
     }