Skip to content

Commit 39c9918

Browse files
vlmedvlmed
committed
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
1 parent afc48e1 commit 39c9918

File tree

35 files changed

+32
-455
lines changed

35 files changed

+32
-455
lines changed

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

-3
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ class Context extends \Magento\Framework\View\Element\Context
3737
* @param \Magento\Framework\App\CacheInterface $cache
3838
* @param \Magento\Framework\View\DesignInterface $design
3939
* @param \Magento\Framework\Session\SessionManagerInterface $session
40-
* @param \Magento\Framework\Session\SidResolverInterface $sidResolver
4140
* @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
4241
* @param \Magento\Framework\View\Asset\Repository $assetRepo
4342
* @param \Magento\Framework\View\ConfigInterface $viewConfig
@@ -60,7 +59,6 @@ public function __construct(
6059
\Magento\Framework\App\CacheInterface $cache,
6160
\Magento\Framework\View\DesignInterface $design,
6261
\Magento\Framework\Session\SessionManagerInterface $session,
63-
\Magento\Framework\Session\SidResolverInterface $sidResolver,
6462
\Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
6563
\Magento\Framework\View\Asset\Repository $assetRepo,
6664
\Magento\Framework\View\ConfigInterface $viewConfig,
@@ -82,7 +80,6 @@ public function __construct(
8280
$cache,
8381
$design,
8482
$session,
85-
$sidResolver,
8683
$scopeConfig,
8784
$assetRepo,
8885
$viewConfig,

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

-3
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,6 @@ class Context extends \Magento\Framework\View\Element\Template\Context
6464
* @param \Magento\Framework\App\CacheInterface $cache
6565
* @param \Magento\Framework\View\DesignInterface $design
6666
* @param \Magento\Framework\Session\Generic $session
67-
* @param \Magento\Framework\Session\SidResolverInterface $sidResolver
6867
* @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
6968
* @param \Magento\Framework\View\Asset\Repository $assetRepo
7069
* @param \Magento\Framework\View\ConfigInterface $viewConfig
@@ -99,7 +98,6 @@ public function __construct(
9998
\Magento\Framework\App\CacheInterface $cache,
10099
\Magento\Framework\View\DesignInterface $design,
101100
\Magento\Framework\Session\Generic $session,
102-
\Magento\Framework\Session\SidResolverInterface $sidResolver,
103101
\Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
104102
\Magento\Framework\View\Asset\Repository $assetRepo,
105103
\Magento\Framework\View\ConfigInterface $viewConfig,
@@ -137,7 +135,6 @@ public function __construct(
137135
$cache,
138136
$design,
139137
$session,
140-
$sidResolver,
141138
$scopeConfig,
142139
$assetRepo,
143140
$viewConfig,

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

-3
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@ class Context extends \Magento\Backend\Block\Template\Context
4747
* @param \Magento\Framework\App\CacheInterface $cache
4848
* @param \Magento\Framework\View\DesignInterface $design
4949
* @param \Magento\Framework\Session\Generic $session
50-
* @param \Magento\Framework\Session\SidResolverInterface $sidResolver
5150
* @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
5251
* @param \Magento\Framework\View\Asset\Repository $assetRepo
5352
* @param \Magento\Framework\View\ConfigInterface $viewConfig
@@ -84,7 +83,6 @@ public function __construct(
8483
\Magento\Framework\App\CacheInterface $cache,
8584
\Magento\Framework\View\DesignInterface $design,
8685
\Magento\Framework\Session\Generic $session,
87-
\Magento\Framework\Session\SidResolverInterface $sidResolver,
8886
\Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
8987
\Magento\Framework\View\Asset\Repository $assetRepo,
9088
\Magento\Framework\View\ConfigInterface $viewConfig,
@@ -119,7 +117,6 @@ public function __construct(
119117
$cache,
120118
$design,
121119
$session,
122-
$sidResolver,
123120
$scopeConfig,
124121
$assetRepo,
125122
$viewConfig,

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

-3
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,6 @@ class Session extends \Magento\Framework\Session\SessionManager implements \Mage
6767

6868
/**
6969
* @param \Magento\Framework\App\Request\Http $request
70-
* @param \Magento\Framework\Session\SidResolverInterface $sidResolver
7170
* @param \Magento\Framework\Session\Config\ConfigInterface $sessionConfig
7271
* @param \Magento\Framework\Session\SaveHandlerInterface $saveHandler
7372
* @param \Magento\Framework\Session\ValidatorInterface $validator
@@ -84,7 +83,6 @@ class Session extends \Magento\Framework\Session\SessionManager implements \Mage
8483
*/
8584
public function __construct(
8685
\Magento\Framework\App\Request\Http $request,
87-
\Magento\Framework\Session\SidResolverInterface $sidResolver,
8886
\Magento\Framework\Session\Config\ConfigInterface $sessionConfig,
8987
\Magento\Framework\Session\SaveHandlerInterface $saveHandler,
9088
\Magento\Framework\Session\ValidatorInterface $validator,
@@ -103,7 +101,6 @@ public function __construct(
103101
$this->messageManager = $messageManager ?? ObjectManager::getInstance()->get(ManagerInterface::class);
104102
parent::__construct(
105103
$request,
106-
$sidResolver,
107104
$sessionConfig,
108105
$saveHandler,
109106
$validator,

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

+1-4
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,6 @@ class Quote extends \Magento\Framework\Session\SessionManager
8484

8585
/**
8686
* @param \Magento\Framework\App\Request\Http $request
87-
* @param \Magento\Framework\Session\SidResolverInterface $sidResolver
8887
* @param \Magento\Framework\Session\Config\ConfigInterface $sessionConfig
8988
* @param \Magento\Framework\Session\SaveHandlerInterface $saveHandler
9089
* @param \Magento\Framework\Session\ValidatorInterface $validator
@@ -102,7 +101,6 @@ class Quote extends \Magento\Framework\Session\SessionManager
102101
*/
103102
public function __construct(
104103
\Magento\Framework\App\Request\Http $request,
105-
\Magento\Framework\Session\SidResolverInterface $sidResolver,
106104
\Magento\Framework\Session\Config\ConfigInterface $sessionConfig,
107105
\Magento\Framework\Session\SaveHandlerInterface $saveHandler,
108106
\Magento\Framework\Session\ValidatorInterface $validator,
@@ -125,7 +123,6 @@ public function __construct(
125123
$this->quoteFactory = $quoteFactory;
126124
parent::__construct(
127125
$request,
128-
$sidResolver,
129126
$sessionConfig,
130127
$saveHandler,
131128
$validator,
@@ -154,7 +151,7 @@ public function getQuote()
154151
$this->_quote->setCustomerGroupId($customerGroupId);
155152
$this->_quote->setIsActive(false);
156153
$this->_quote->setStoreId($this->getStoreId());
157-
154+
158155
$this->quoteRepository->save($this->_quote);
159156
$this->setQuoteId($this->_quote->getId());
160157
$this->_quote = $this->quoteRepository->get($this->getQuoteId(), [$this->getStoreId()]);

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

-3
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,6 @@ class Url extends \Magento\Framework\Url implements \Magento\Backend\Model\UrlIn
9090
* @param \Magento\Framework\Url\SecurityInfoInterface $urlSecurityInfo
9191
* @param \Magento\Framework\Url\ScopeResolverInterface $scopeResolver
9292
* @param \Magento\Framework\Session\Generic $session
93-
* @param \Magento\Framework\Session\SidResolverInterface $sidResolver
9493
* @param \Magento\Framework\Url\RouteParamsResolverFactory $routeParamsResolverFactory
9594
* @param \Magento\Framework\Url\QueryParamsResolverInterface $queryParamsResolver
9695
* @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
@@ -114,7 +113,6 @@ public function __construct(
114113
\Magento\Framework\Url\SecurityInfoInterface $urlSecurityInfo,
115114
\Magento\Framework\Url\ScopeResolverInterface $scopeResolver,
116115
\Magento\Framework\Session\Generic $session,
117-
\Magento\Framework\Session\SidResolverInterface $sidResolver,
118116
\Magento\Framework\Url\RouteParamsResolverFactory $routeParamsResolverFactory,
119117
\Magento\Framework\Url\QueryParamsResolverInterface $queryParamsResolver,
120118
\Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
@@ -139,7 +137,6 @@ public function __construct(
139137
$urlSecurityInfo,
140138
$scopeResolver,
141139
$session,
142-
$sidResolver,
143140
$routeParamsResolverFactory,
144141
$queryParamsResolver,
145142
$scopeConfig,

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

-13
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
use Magento\Framework\App\State;
1818
use Magento\Framework\Session\Config\ConfigInterface;
1919
use Magento\Framework\Session\SaveHandlerInterface;
20-
use Magento\Framework\Session\SidResolverInterface;
2120
use Magento\Framework\Session\Storage;
2221
use Magento\Framework\Session\StorageInterface;
2322
use Magento\Framework\Session\ValidatorInterface;
@@ -83,11 +82,6 @@ class QuoteTest extends TestCase
8382
*/
8483
protected $sessionConfigMock;
8584

86-
/**
87-
* @var SidResolverInterface|MockObject
88-
*/
89-
protected $sidResolverMock;
90-
9185
/**
9286
* @var Http|MockObject
9387
*/
@@ -163,12 +157,6 @@ protected function setUp(): void
163157
$this->quoteRepositoryMock = $this->getMockForAbstractClass(CartRepositoryInterface::class);
164158

165159
$this->requestMock = $this->createMock(Http::class);
166-
$this->sidResolverMock = $this->getMockForAbstractClass(
167-
SidResolverInterface::class,
168-
[],
169-
'',
170-
false
171-
);
172160
$this->sessionConfigMock = $this->getMockForAbstractClass(
173161
ConfigInterface::class,
174162
[],
@@ -208,7 +196,6 @@ protected function setUp(): void
208196
->setConstructorArgs(
209197
[
210198
'request' => $this->requestMock,
211-
'sidResolver' => $this->sidResolverMock,
212199
'sessionConfig' => $this->sessionConfigMock,
213200
'saveHandler' => $this->saveHandlerMock,
214201
'validator' => $this->validatorMock,

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

-4
Original file line numberDiff line numberDiff line change
@@ -95,8 +95,6 @@ class Context extends \Magento\Framework\View\Element\Template\Context
9595
* @param \Magento\Framework\UrlInterface $urlBuilder
9696
* @param \Magento\Framework\App\CacheInterface $cache
9797
* @param \Magento\Framework\View\DesignInterface $design
98-
* @param \Magento\Framework\Session\SessionManagerInterface $session
99-
* @param \Magento\Framework\Session\SidResolverInterface $sidResolver
10098
* @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
10199
* @param \Magento\Framework\View\Asset\Repository $assetRepo
102100
* @param \Magento\Framework\View\ConfigInterface $viewConfig
@@ -138,7 +136,6 @@ public function __construct(
138136
\Magento\Framework\App\CacheInterface $cache,
139137
\Magento\Framework\View\DesignInterface $design,
140138
\Magento\Framework\Session\SessionManagerInterface $session,
141-
\Magento\Framework\Session\SidResolverInterface $sidResolver,
142139
\Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
143140
\Magento\Framework\View\Asset\Repository $assetRepo,
144141
\Magento\Framework\View\ConfigInterface $viewConfig,
@@ -190,7 +187,6 @@ public function __construct(
190187
$cache,
191188
$design,
192189
$session,
193-
$sidResolver,
194190
$scopeConfig,
195191
$assetRepo,
196192
$viewConfig,

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

-8
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,6 @@ class Url extends \Magento\Framework\DataObject
3636
*/
3737
protected $storeManager;
3838

39-
/**
40-
* @var \Magento\Framework\Session\SidResolverInterface
41-
*/
42-
protected $sidResolver;
43-
4439
/**
4540
* @var \Magento\UrlRewrite\Model\UrlFinderInterface
4641
*/
@@ -55,7 +50,6 @@ class Url extends \Magento\Framework\DataObject
5550
* @param \Magento\Framework\UrlFactory $urlFactory
5651
* @param \Magento\Store\Model\StoreManagerInterface $storeManager
5752
* @param \Magento\Framework\Filter\FilterManager $filter
58-
* @param \Magento\Framework\Session\SidResolverInterface $sidResolver
5953
* @param UrlFinderInterface $urlFinder
6054
* @param array $data
6155
* @param ScopeConfigInterface|null $scopeConfig
@@ -64,7 +58,6 @@ public function __construct(
6458
\Magento\Framework\UrlFactory $urlFactory,
6559
\Magento\Store\Model\StoreManagerInterface $storeManager,
6660
\Magento\Framework\Filter\FilterManager $filter,
67-
\Magento\Framework\Session\SidResolverInterface $sidResolver,
6861
UrlFinderInterface $urlFinder,
6962
array $data = [],
7063
ScopeConfigInterface $scopeConfig = null
@@ -73,7 +66,6 @@ public function __construct(
7366
$this->urlFactory = $urlFactory;
7467
$this->storeManager = $storeManager;
7568
$this->filter = $filter;
76-
$this->sidResolver = $sidResolver;
7769
$this->urlFinder = $urlFinder;
7870
$this->scopeConfig = $scopeConfig ?:
7971
\Magento\Framework\App\ObjectManager::getInstance()->get(ScopeConfigInterface::class);

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

-13
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
use Magento\Catalog\Model\Product\Url;
1313
use Magento\Catalog\Model\Product\Url as ProductUrl;
1414
use Magento\Framework\Filter\FilterManager;
15-
use Magento\Framework\Session\SidResolverInterface;
1615
use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
1716
use Magento\Framework\UrlFactory;
1817
use Magento\Store\Model\Store;
@@ -48,11 +47,6 @@ class UrlTest extends TestCase
4847
*/
4948
protected $url;
5049

51-
/**
52-
* @var SidResolverInterface|MockObject
53-
*/
54-
protected $sidResolver;
55-
5650
protected function setUp(): void
5751
{
5852
$this->filter = $this->getMockBuilder(
@@ -74,8 +68,6 @@ protected function setUp(): void
7468
['setScope', 'getUrl']
7569
)->getMock();
7670

77-
$this->sidResolver = $this->getMockForAbstractClass(SidResolverInterface::class);
78-
7971
$store = $this->createPartialMock(Store::class, ['getId']);
8072
$store->expects($this->any())->method('getId')->willReturn(1);
8173
$storeManager = $this->getMockForAbstractClass(StoreManagerInterface::class);
@@ -95,7 +87,6 @@ protected function setUp(): void
9587
'catalogCategory' => $this->catalogCategory,
9688
'storeManager' => $storeManager,
9789
'urlFactory' => $urlFactory,
98-
'sidResolver' => $this->sidResolver,
9990
]
10091
);
10192
}
@@ -186,10 +177,6 @@ public function testGetUrl(
186177
break;
187178
case 'getProductUrl':
188179
$this->assertEquals($requestPathProduct, $this->model->getProductUrl($product, null));
189-
$this->sidResolver
190-
->expects($this->never())
191-
->method('getUseSessionInUrl')
192-
->willReturn(true);
193180
break;
194181
}
195182
}

‎app/code/Magento/Checkout/Model/Session.php

-3
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,6 @@ class Session extends \Magento\Framework\Session\SessionManager
120120

121121
/**
122122
* @param \Magento\Framework\App\Request\Http $request
123-
* @param \Magento\Framework\Session\SidResolverInterface $sidResolver
124123
* @param \Magento\Framework\Session\Config\ConfigInterface $sessionConfig
125124
* @param \Magento\Framework\Session\SaveHandlerInterface $saveHandler
126125
* @param \Magento\Framework\Session\ValidatorInterface $validator
@@ -143,7 +142,6 @@ class Session extends \Magento\Framework\Session\SessionManager
143142
*/
144143
public function __construct(
145144
\Magento\Framework\App\Request\Http $request,
146-
\Magento\Framework\Session\SidResolverInterface $sidResolver,
147145
\Magento\Framework\Session\Config\ConfigInterface $sessionConfig,
148146
\Magento\Framework\Session\SaveHandlerInterface $saveHandler,
149147
\Magento\Framework\Session\ValidatorInterface $validator,
@@ -173,7 +171,6 @@ public function __construct(
173171
$this->quoteFactory = $quoteFactory;
174172
parent::__construct(
175173
$request,
176-
$sidResolver,
177174
$sessionConfig,
178175
$saveHandler,
179176
$validator,

‎app/code/Magento/Customer/Model/Session.php

-3
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,6 @@ class Session extends \Magento\Framework\Session\SessionManager
118118
* Session constructor.
119119
*
120120
* @param \Magento\Framework\App\Request\Http $request
121-
* @param \Magento\Framework\Session\SidResolverInterface $sidResolver
122121
* @param \Magento\Framework\Session\Config\ConfigInterface $sessionConfig
123122
* @param \Magento\Framework\Session\SaveHandlerInterface $saveHandler
124123
* @param \Magento\Framework\Session\ValidatorInterface $validator
@@ -144,7 +143,6 @@ class Session extends \Magento\Framework\Session\SessionManager
144143
*/
145144
public function __construct(
146145
\Magento\Framework\App\Request\Http $request,
147-
\Magento\Framework\Session\SidResolverInterface $sidResolver,
148146
\Magento\Framework\Session\Config\ConfigInterface $sessionConfig,
149147
\Magento\Framework\Session\SaveHandlerInterface $saveHandler,
150148
\Magento\Framework\Session\ValidatorInterface $validator,
@@ -178,7 +176,6 @@ public function __construct(
178176
$this->_httpContext = $httpContext;
179177
parent::__construct(
180178
$request,
181-
$sidResolver,
182179
$sessionConfig,
183180
$saveHandler,
184181
$validator,

‎app/code/Magento/Store/App/Response/Redirect.php

-9
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
use Magento\Framework\Encryption\UrlCoder;
2020
use Magento\Framework\Exception\NoSuchEntityException;
2121
use Magento\Framework\Session\SessionManagerInterface;
22-
use Magento\Framework\Session\SidResolverInterface;
2322
use Magento\Framework\UrlInterface;
2423
use Magento\Store\Model\ScopeInterface;
2524
use Magento\Store\Model\StoreManagerInterface;
@@ -54,11 +53,6 @@ class Redirect implements RedirectInterface
5453
*/
5554
protected $_session;
5655

57-
/**
58-
* @var SidResolverInterface
59-
*/
60-
protected $_sidResolver;
61-
6256
/**
6357
* @var bool
6458
*/
@@ -91,7 +85,6 @@ class Redirect implements RedirectInterface
9185
* @param StoreManagerInterface $storeManager
9286
* @param UrlCoder $urlCoder
9387
* @param SessionManagerInterface $session
94-
* @param SidResolverInterface $sidResolver
9588
* @param UrlInterface $urlBuilder
9689
* @param Uri|null $uri
9790
* @param bool $canUseSessionIdInParam
@@ -104,7 +97,6 @@ public function __construct(
10497
StoreManagerInterface $storeManager,
10598
UrlCoder $urlCoder,
10699
SessionManagerInterface $session,
107-
SidResolverInterface $sidResolver,
108100
UrlInterface $urlBuilder,
109101
Uri $uri = null,
110102
$canUseSessionIdInParam = true,
@@ -116,7 +108,6 @@ public function __construct(
116108
$this->_storeManager = $storeManager;
117109
$this->_urlCoder = $urlCoder;
118110
$this->_session = $session;
119-
$this->_sidResolver = $sidResolver;
120111
$this->_urlBuilder = $urlBuilder;
121112
$this->uri = $uri ?: ObjectManager::getInstance()->get(Uri::class);
122113
$this->appState = $appState ?: ObjectManager::getInstance()->get(State::class);

0 commit comments

Comments
 (0)