Skip to content

Commit 121046a

Browse files
committed
ACPT-1184: Fix classes found by GraphQlStateTest
1 parent ade5cb6 commit 121046a

File tree

2 files changed

+8
-15
lines changed

2 files changed

+8
-15
lines changed

app/code/Magento/Store/Model/System/Store.php

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,14 @@
99
namespace Magento\Store\Model\System;
1010

1111
use Magento\Framework\Data\OptionSourceInterface;
12-
use Magento\Framework\ObjectManager\ResetAfterRequestInterface;
1312

1413
/**
1514
* Core System Store Model
1615
*
1716
* @api
1817
* @since 100.0.2
1918
*/
20-
class Store extends \Magento\Framework\DataObject implements OptionSourceInterface, ResetAfterRequestInterface
19+
class Store extends \Magento\Framework\DataObject implements OptionSourceInterface
2120
{
2221
/**
2322
* Website collection
@@ -534,11 +533,4 @@ private function retrieveOptionValues(array $structure, bool $needSpacePrefix =
534533

535534
return $values;
536535
}
537-
538-
public function _resetState(): void
539-
{
540-
$this->_websiteCollection = [];
541-
$this->_groupCollection = [];
542-
$this->_storeCollection = [];
543-
}
544536
}

dev/tests/integration/testsuite/Magento/GraphQl/_files/state-skip-list.php

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
'*' => [
3333
Magento\TestFramework\Interception\PluginList::class => null,
3434
// memory leak, wrong sql, potential issues
35-
Magento\Framework\Event\Config\Data::class => null, // TODO: reset when config is reset from poison pill
35+
Magento\Framework\Event\Config\Data::class => null,
3636
Magento\Framework\App\AreaList::class => null,
3737
'customRemoteFilesystem' => null,
3838
Magento\Store\App\Config\Type\Scopes::class => null,
@@ -66,19 +66,20 @@
6666
Magento\Framework\Locale\Resolver::class => null,
6767
Magento\Store\Model\GroupRepository::class => null,
6868
Magento\Store\Model\StoreRepository::class => null,
69-
Magento\Framework\View\Design\Fallback\RulePool::class => null, // TODO: Looks like we need to reset?
69+
Magento\Framework\View\Design\Fallback\RulePool::class => null,
7070
Magento\Framework\View\Asset\Repository::class => null,
7171
Magento\Framework\HTTP\Header::class => null,
72-
Magento\Framework\App\Route\Config::class => null, // TODO: reset when Poison Pill causes config to reset.
72+
Magento\Framework\App\Route\Config::class => null,
7373
Magento\Store\Model\System\Store::class => null,
74-
Magento\AwsS3\Driver\CredentialsCache::class => null, // TODO
74+
Magento\AwsS3\Driver\CredentialsCache::class => null,
7575
Magento\Eav\Model\Config::class => null,
76-
'AssetPreProcessorPool' => null, // TODO: see what this is
76+
'AssetPreProcessorPool' => null,
7777
Magento\GraphQl\Model\Query\ContextFactory::class => null,
7878
'viewFileMinifiedFallbackResolver' => null,
7979
Magento\Framework\View\Asset\Minification::class => null,
80+
Magento\Catalog\Model\ResourceModel\Product\Attribute\Collection::class => null,
8081
Magento\Framework\Url::class => null,
81-
Magento\Framework\HTTP\PhpEnvironment\RemoteAddress::class => null, // FIXME: caching from $request
82+
Magento\Framework\HTTP\PhpEnvironment\RemoteAddress::class => null,
8283
],
8384
'' => [
8485
],

0 commit comments

Comments
 (0)