File tree Expand file tree Collapse file tree 3 files changed +19
-3
lines changed
app/code/Magento/Catalog/Model/Indexer/Category/Product
dev/tests/api-functional/testsuite/Magento/GraphQl/PageCache
lib/internal/Magento/Framework/App Expand file tree Collapse file tree 3 files changed +19
-3
lines changed Original file line number Diff line number Diff line change 13
13
use Magento \Framework \DB \Query \Generator as QueryGenerator ;
14
14
use Magento \Framework \DB \Select ;
15
15
use Magento \Framework \EntityManager \MetadataPool ;
16
+ use Magento \Framework \ObjectManager \ResetAfterRequestInterface ;
16
17
use Magento \Store \Api \Data \StoreInterface ;
17
18
use Magento \Store \Model \Store ;
18
19
25
26
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
26
27
* @since 100.0.2
27
28
*/
28
- abstract class AbstractAction
29
+ abstract class AbstractAction implements ResetAfterRequestInterface
29
30
{
30
31
/**
31
32
* Chunk size
@@ -156,6 +157,20 @@ public function __construct(
156
157
$ this ->tableMaintainer = $ tableMaintainer ?: ObjectManager::getInstance ()->get (TableMaintainer::class);
157
158
}
158
159
160
+ /**
161
+ * @inheritDoc
162
+ */
163
+ public function _resetState (): void
164
+ {
165
+ $ this ->nonAnchorSelects = [];
166
+ $ this ->anchorSelects = [];
167
+ $ this ->productsSelects = [];
168
+ $ this ->categoryPath = [];
169
+ $ this ->useTempTable = true ;
170
+ $ this ->tempTreeIndexTableName = null ;
171
+ $ this ->currentStore = null ;
172
+ }
173
+
159
174
/**
160
175
* Run full reindex
161
176
*
Original file line number Diff line number Diff line change @@ -230,7 +230,7 @@ public function testProductFromSpecificAndDefaultStoreWithMultiCurrency()
230
230
$ this ->assertEquals (
231
231
'EUR ' ,
232
232
$ response ['products ' ]['items ' ][0 ]['price ' ]['minimalPrice ' ]['amount ' ]['currency ' ],
233
- 'Currency code EUR in fixture ' . $ storeCodeFromFixture . ' is unexpected '
233
+ 'Currency code EUR in fixture ' . $ storeCodeFromFixture . ' is expected '
234
234
);
235
235
236
236
// test cached store + currency header in Euros
Original file line number Diff line number Diff line change @@ -40,7 +40,7 @@ class ResourceConnection implements ResetAfterRequestInterface
40
40
*
41
41
* @var array
42
42
*/
43
- protected $ mappedTableNames ;
43
+ protected $ mappedTableNames = [] ;
44
44
45
45
/**
46
46
* Resource config.
@@ -89,6 +89,7 @@ public function __construct(
89
89
*/
90
90
public function _resetState () : void
91
91
{
92
+ $ this ->mappedTableNames = [];
92
93
foreach ($ this ->connections as $ connection ) {
93
94
if ($ connection instanceof ResetAfterRequestInterface) {
94
95
$ connection ->_resetState ();
You can’t perform that action at this time.
0 commit comments