Skip to content

Commit 305fb77

Browse files
duhonduhon
authored
Merge pull request #4290 from magento-helix/MC-17167
[MC-17167] Fix BIC for Context classes
2 parents ee6afa3 + 139ccd5 commit 305fb77

File tree

6 files changed

+24
-23
lines changed

6 files changed

+24
-23
lines changed

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,8 @@ class Context extends \Magento\Framework\View\Element\Context
4747
* @param \Magento\Framework\Filter\FilterManager $filterManager
4848
* @param \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate
4949
* @param \Magento\Framework\Translate\Inline\StateInterface $inlineTranslation
50-
* @param LockGuardedCacheLoader $lockQuery
5150
* @param \Magento\Framework\AuthorizationInterface $authorization
51+
* @param LockGuardedCacheLoader|null $lockQuery
5252
*
5353
* @SuppressWarnings(PHPMD.ExcessiveParameterList)
5454
*/
@@ -70,8 +70,8 @@ public function __construct(
7070
\Magento\Framework\Filter\FilterManager $filterManager,
7171
\Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate,
7272
\Magento\Framework\Translate\Inline\StateInterface $inlineTranslation,
73-
LockGuardedCacheLoader $lockQuery,
74-
\Magento\Framework\AuthorizationInterface $authorization
73+
\Magento\Framework\AuthorizationInterface $authorization,
74+
LockGuardedCacheLoader $lockQuery = null
7575
) {
7676
$this->_authorization = $authorization;
7777
parent::__construct(

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,6 @@ class Context extends \Magento\Framework\View\Element\Template\Context
7474
* @param \Magento\Framework\Filter\FilterManager $filterManager
7575
* @param \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate
7676
* @param \Magento\Framework\Translate\Inline\StateInterface $inlineTranslation
77-
* @param LockGuardedCacheLoader $lockQuery
7877
* @param \Magento\Framework\Filesystem $filesystem
7978
* @param \Magento\Framework\View\FileSystem $viewFileSystem
8079
* @param \Magento\Framework\View\TemplateEnginePool $enginePool
@@ -88,6 +87,7 @@ class Context extends \Magento\Framework\View\Element\Template\Context
8887
* @param \Magento\Framework\Math\Random $mathRandom
8988
* @param \Magento\Framework\Data\Form\FormKey $formKey
9089
* @param \Magento\Framework\Code\NameBuilder $nameBuilder
90+
* @param LockGuardedCacheLoader|null $lockQuery
9191
*
9292
* @SuppressWarnings(PHPMD.ExcessiveParameterList)
9393
*/
@@ -109,7 +109,6 @@ public function __construct(
109109
\Magento\Framework\Filter\FilterManager $filterManager,
110110
\Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate,
111111
\Magento\Framework\Translate\Inline\StateInterface $inlineTranslation,
112-
LockGuardedCacheLoader $lockQuery,
113112
\Magento\Framework\Filesystem $filesystem,
114113
\Magento\Framework\View\FileSystem $viewFileSystem,
115114
\Magento\Framework\View\TemplateEnginePool $enginePool,
@@ -122,7 +121,8 @@ public function __construct(
122121
\Magento\Backend\Model\Session $backendSession,
123122
\Magento\Framework\Math\Random $mathRandom,
124123
\Magento\Framework\Data\Form\FormKey $formKey,
125-
\Magento\Framework\Code\NameBuilder $nameBuilder
124+
\Magento\Framework\Code\NameBuilder $nameBuilder,
125+
LockGuardedCacheLoader $lockQuery = null
126126
) {
127127
$this->_authorization = $authorization;
128128
$this->_backendSession = $backendSession;
@@ -147,15 +147,15 @@ public function __construct(
147147
$filterManager,
148148
$localeDate,
149149
$inlineTranslation,
150-
$lockQuery,
151150
$filesystem,
152151
$viewFileSystem,
153152
$enginePool,
154153
$appState,
155154
$storeManager,
156155
$pageConfig,
157156
$resolver,
158-
$validator
157+
$validator,
158+
$lockQuery
159159
);
160160
}
161161

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,6 @@ class Context extends \Magento\Backend\Block\Template\Context
5757
* @param \Magento\Framework\Filter\FilterManager $filterManager
5858
* @param \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate
5959
* @param \Magento\Framework\Translate\Inline\StateInterface $inlineTranslation
60-
* @param LockGuardedCacheLoader $lockQuery
6160
* @param \Magento\Framework\Filesystem $filesystem
6261
* @param \Magento\Framework\View\FileSystem $viewFileSystem
6362
* @param \Magento\Framework\View\TemplateEnginePool $enginePool
@@ -73,6 +72,7 @@ class Context extends \Magento\Backend\Block\Template\Context
7372
* @param \Magento\Framework\Code\NameBuilder $nameBuilder
7473
* @param \Magento\Backend\Block\Widget\Button\ButtonList $buttonList
7574
* @param Button\ToolbarInterface $toolbar
75+
* @param LockGuardedCacheLoader|null $lockQuery
7676
*
7777
* @SuppressWarnings(PHPMD.ExcessiveParameterList)
7878
*/
@@ -94,7 +94,6 @@ public function __construct(
9494
\Magento\Framework\Filter\FilterManager $filterManager,
9595
\Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate,
9696
\Magento\Framework\Translate\Inline\StateInterface $inlineTranslation,
97-
LockGuardedCacheLoader $lockQuery,
9897
\Magento\Framework\Filesystem $filesystem,
9998
\Magento\Framework\View\FileSystem $viewFileSystem,
10099
\Magento\Framework\View\TemplateEnginePool $enginePool,
@@ -109,7 +108,8 @@ public function __construct(
109108
\Magento\Framework\Data\Form\FormKey $formKey,
110109
\Magento\Framework\Code\NameBuilder $nameBuilder,
111110
Button\ButtonList $buttonList,
112-
Button\ToolbarInterface $toolbar
111+
Button\ToolbarInterface $toolbar,
112+
LockGuardedCacheLoader $lockQuery = null
113113
) {
114114
parent::__construct(
115115
$request,
@@ -129,7 +129,6 @@ public function __construct(
129129
$filterManager,
130130
$localeDate,
131131
$inlineTranslation,
132-
$lockQuery,
133132
$filesystem,
134133
$viewFileSystem,
135134
$enginePool,
@@ -142,7 +141,8 @@ public function __construct(
142141
$backendSession,
143142
$mathRandom,
144143
$formKey,
145-
$nameBuilder
144+
$nameBuilder,
145+
$lockQuery
146146
);
147147

148148
$this->buttonList = $buttonList;

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,6 @@ class Context extends \Magento\Framework\View\Element\Template\Context
106106
* @param \Magento\Framework\Filter\FilterManager $filterManager
107107
* @param \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate
108108
* @param \Magento\Framework\Translate\Inline\StateInterface $inlineTranslation
109-
* @param LockGuardedCacheLoader $lockQuery
110109
* @param \Magento\Framework\Filesystem $filesystem
111110
* @param \Magento\Framework\View\FileSystem $viewFileSystem
112111
* @param \Magento\Framework\View\TemplateEnginePool $enginePool
@@ -127,6 +126,7 @@ class Context extends \Magento\Framework\View\Element\Template\Context
127126
* @param ImageBuilder $imageBuilder
128127
* @param ReviewRendererInterface $reviewRenderer
129128
* @param \Magento\CatalogInventory\Api\StockRegistryInterface $stockRegistry
129+
* @param LockGuardedCacheLoader|null $lockQuery
130130
*
131131
* @SuppressWarnings(PHPMD.ExcessiveParameterList)
132132
*/
@@ -148,7 +148,6 @@ public function __construct(
148148
\Magento\Framework\Filter\FilterManager $filterManager,
149149
\Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate,
150150
\Magento\Framework\Translate\Inline\StateInterface $inlineTranslation,
151-
LockGuardedCacheLoader $lockQuery,
152151
\Magento\Framework\Filesystem $filesystem,
153152
\Magento\Framework\View\FileSystem $viewFileSystem,
154153
\Magento\Framework\View\TemplateEnginePool $enginePool,
@@ -168,7 +167,8 @@ public function __construct(
168167
\Magento\Catalog\Helper\Image $imageHelper,
169168
\Magento\Catalog\Block\Product\ImageBuilder $imageBuilder,
170169
ReviewRendererInterface $reviewRenderer,
171-
\Magento\CatalogInventory\Api\StockRegistryInterface $stockRegistry
170+
\Magento\CatalogInventory\Api\StockRegistryInterface $stockRegistry,
171+
LockGuardedCacheLoader $lockQuery = null
172172
) {
173173
$this->imageHelper = $imageHelper;
174174
$this->imageBuilder = $imageBuilder;
@@ -200,15 +200,15 @@ public function __construct(
200200
$filterManager,
201201
$localeDate,
202202
$inlineTranslation,
203-
$lockQuery,
204203
$filesystem,
205204
$viewFileSystem,
206205
$enginePool,
207206
$appState,
208207
$storeManager,
209208
$pageConfig,
210209
$resolver,
211-
$validator
210+
$validator,
211+
$lockQuery
212212
);
213213
}
214214

‎lib/internal/Magento/Framework/View/Element/Context.php

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
namespace Magento\Framework\View\Element;
77

88
use Magento\Framework\Cache\LockGuardedCacheLoader;
9+
use Magento\Framework\App\ObjectManager;
910

1011
/**
1112
* Constructor modification point for Magento\Framework\View\Element\AbstractBlock.
@@ -182,7 +183,7 @@ public function __construct(
182183
\Magento\Framework\Filter\FilterManager $filterManager,
183184
\Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate,
184185
\Magento\Framework\Translate\Inline\StateInterface $inlineTranslation,
185-
LockGuardedCacheLoader $lockQuery
186+
LockGuardedCacheLoader $lockQuery = null
186187
) {
187188
$this->_request = $request;
188189
$this->_layout = $layout;
@@ -201,7 +202,7 @@ public function __construct(
201202
$this->_filterManager = $filterManager;
202203
$this->_localeDate = $localeDate;
203204
$this->inlineTranslation = $inlineTranslation;
204-
$this->lockQuery = $lockQuery;
205+
$this->lockQuery = $lockQuery ?: ObjectManager::getInstance()->get(LockGuardedCacheLoader::class);
205206
}
206207

207208
/**

‎lib/internal/Magento/Framework/View/Element/Template/Context.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,6 @@ class Context extends \Magento\Framework\View\Element\Context
9999
* @param \Magento\Framework\Filter\FilterManager $filterManager
100100
* @param \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate
101101
* @param \Magento\Framework\Translate\Inline\StateInterface $inlineTranslation
102-
* @param LockGuardedCacheLoader $lockQuery
103102
* @param \Magento\Framework\Filesystem $filesystem
104103
* @param \Magento\Framework\View\FileSystem $viewFileSystem
105104
* @param \Magento\Framework\View\TemplateEnginePool $enginePool
@@ -108,6 +107,7 @@ class Context extends \Magento\Framework\View\Element\Context
108107
* @param \Magento\Framework\View\Page\Config $pageConfig
109108
* @param \Magento\Framework\View\Element\Template\File\Resolver $resolver
110109
* @param \Magento\Framework\View\Element\Template\File\Validator $validator
110+
* @param LockGuardedCacheLoader|null $lockQuery
111111
*
112112
* @SuppressWarnings(PHPMD.ExcessiveParameterList)
113113
*/
@@ -129,15 +129,15 @@ public function __construct(
129129
\Magento\Framework\Filter\FilterManager $filterManager,
130130
\Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate,
131131
\Magento\Framework\Translate\Inline\StateInterface $inlineTranslation,
132-
LockGuardedCacheLoader $lockQuery,
133132
\Magento\Framework\Filesystem $filesystem,
134133
\Magento\Framework\View\FileSystem $viewFileSystem,
135134
\Magento\Framework\View\TemplateEnginePool $enginePool,
136135
\Magento\Framework\App\State $appState,
137136
\Magento\Store\Model\StoreManagerInterface $storeManager,
138137
\Magento\Framework\View\Page\Config $pageConfig,
139138
\Magento\Framework\View\Element\Template\File\Resolver $resolver,
140-
\Magento\Framework\View\Element\Template\File\Validator $validator
139+
\Magento\Framework\View\Element\Template\File\Validator $validator,
140+
LockGuardedCacheLoader $lockQuery = null
141141
) {
142142
parent::__construct(
143143
$request,

0 commit comments

Comments
 (0)