File tree Expand file tree Collapse file tree 2 files changed +7
-5
lines changed
lib/internal/Magento/Framework Expand file tree Collapse file tree 2 files changed +7
-5
lines changed Original file line number Diff line number Diff line change @@ -121,6 +121,7 @@ protected function setUp()
121
121
* @param string $area
122
122
* @param bool $forceReload
123
123
* @param array $cachedData
124
+ * @return void
124
125
* @dataProvider dataProviderLoadDataCachedTranslation
125
126
*/
126
127
public function testLoadDataCachedTranslation ($ area , $ forceReload , array $ cachedData )
@@ -155,6 +156,7 @@ public function dataProviderLoadDataCachedTranslation()
155
156
/**
156
157
* @param string $area
157
158
* @param bool $forceReload
159
+ * @return void
158
160
* @dataProvider dataProviderForTestLoadData
159
161
* @SuppressWarnings(PHPMD.NPathComplexity)
160
162
*/
@@ -255,6 +257,7 @@ public function dataProviderForTestLoadData()
255
257
/**
256
258
* @param $data
257
259
* @param $result
260
+ * @return void
258
261
* @dataProvider dataProviderForTestGetData
259
262
*/
260
263
public function testGetData ($ data , $ result )
Original file line number Diff line number Diff line change @@ -171,7 +171,7 @@ public function __construct(
171
171
self ::CONFIG_LOCALE_KEY => null ,
172
172
self ::CONFIG_SCOPE_KEY => null ,
173
173
self ::CONFIG_THEME_KEY => null ,
174
- self ::CONFIG_MODULE_KEY => null
174
+ self ::CONFIG_MODULE_KEY => null ,
175
175
];
176
176
}
177
177
@@ -195,7 +195,8 @@ public function loadData($area = null, $forceReload = false)
195
195
);
196
196
197
197
if (!$ forceReload ) {
198
- if (false !== $ data = $ this ->_loadCache ()) {
198
+ $ data = $ this ->_loadCache ();
199
+ if (false !== $ data ) {
199
200
$ this ->_data = $ data ;
200
201
return $ this ;
201
202
}
@@ -459,11 +460,9 @@ public function getTheme()
459
460
/**
460
461
* Retrieve cache identifier
461
462
*
462
- * @param bool $forceReload
463
463
* @return string
464
- * @SuppressWarnings(PHPMD.UnusedFormalParameter)
465
464
*/
466
- protected function getCacheId ($ forceReload = false )
465
+ protected function getCacheId ()
467
466
{
468
467
$ _cacheId = \Magento \Framework \App \Cache \Type \Translate::TYPE_IDENTIFIER ;
469
468
$ _cacheId .= '_ ' . $ this ->_config [self ::CONFIG_LOCALE_KEY ];
You can’t perform that action at this time.
0 commit comments