ACPT-987

Added support for multiple files for skip and filter lists

Author: JacobBrownAustin

dev/tests/integration/testsuite/Magento/GraphQl/App/State/Comparator.php

@@ -148,7 +148,11 @@ private function filterProperties($properties, $propertiesToFilterList): array
     private function getSkipList($operationName): array
     {
         if ($this->skipList === null) {
-            $this->skipList = include __DIR__ . '/../../_files/state-skip-list.php';
+            $skipListList = [];
+            foreach (glob(__DIR__ . '/../../_files/state-skip-list*.php') as $skipListFile) {
+                $skipListList[] = include($skipListFile);
+            }
+            $this->skipList = array_merge_recursive(...$skipListList);
         }
         return array_merge($this->skipList['*'], $this->skipList[$operationName] ?? []);
     }
@@ -161,7 +165,11 @@ private function getSkipList($operationName): array
     private function getFilterList(): array
     {
         if ($this->filterList === null) {
-            $this->filterList = include __DIR__ . '/../../_files/state-filter-list.php';
+            $filterListList = [];
+            foreach (glob(__DIR__ . '/../../_files/state-filter-list*.php') as $filterListFile) {
+                $filterListList[] = include($filterListFile);
+            }
+            $this->filterList = array_merge_recursive(...$filterListList);
         }
         return $this->filterList;
     }

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

@@ -66,7 +66,6 @@
         Magento\Framework\View\Template\Html\Minifier::class => ['filesystem' => null],
         Magento\Store\Model\Config\Processor\Fallback::class => ['scopes' => null],
         'viewFileFallbackResolver' => ['rulePool' => null],
-        Magento\Staging\Model\Preview\RouteParamsPreprocessor::class => ['request' => null],
         Magento\Framework\View\Asset\Source::class => ['filesystem' => null],
         Magento\Store\Model\StoreResolver::class => ['request' => null],
         Magento\Framework\Url\Decoder::class => ['urlBuilder' => null],
@@ -77,9 +76,7 @@
             '_request' => null,
             '_urlBuilder' => null,
         ],
-        Magento\Staging\Model\Url\BaseUrlModifier::class => ['request' => null, 'state' => null],
         Magento\Framework\Event\Config::class => ['_dataContainer' => null],
-        Magento\Staging\Plugin\Store\Model\StoreResolver::class => ['request' => null],
         Magento\TestFramework\Store\StoreManager::class => ['decoratedStoreManager' => null],
         Magento\Eav\Model\ResourceModel\Entity\Attribute::class => ['_eavEntityType' => null],
         Magento\Eav\Model\Entity\AttributeLoader::class => ['defaultAttributes' => null, 'config' => null],
@@ -90,8 +87,6 @@
         Magento\Framework\Model\Context::class => ['_cacheManager' => null, '_appState' => null],
         Magento\Framework\App\Cache\TypeList::class => ['_cache' => null],
         Magento\GraphQlCache\Model\CacheId\CacheIdCalculator::class => ['contextFactory' => null],
-        Magento\VersionsCmsUrlRewriteGraphQl\Plugin\UrlRewriteGraphQl\Model\UrlRewrite\HierarchyNodeUrlLocator::class
-            => ['contextFactory' => null],
         Magento\Store\Model\Config\Placeholder::class => ['request' => null],
         Magento\Framework\Config\Scope::class => ['_areaList' => null],  // These were added because we switched to ...
         Magento\TestFramework\App\State::class => ['_areaCode' => null], //                                         .

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

@@ -40,7 +40,7 @@
         Magento\Framework\Url\QueryParamsResolver::class => null,
         Magento\Framework\Event\Config\Data::class => null,  // TODO: Make sure this is reset when config is reset from poison pill
         Magento\Framework\App\AreaList::class => null,
-        customRemoteFilesystem::class => null,
+        'customRemoteFilesystem' => null,
         Magento\Store\App\Config\Type\Scopes::class => null,
         Magento\Framework\Module\Dir\Reader::class => null,
         Magento\Framework\App\Language\Dictionary::class => null,
@@ -49,10 +49,8 @@
         Magento\Framework\App\Cache\Type\Config::class => null,
         Magento\Framework\Interception\PluginListGenerator::class => null,
         Magento\TestFramework\App\Config::class => null,
-        Magento\ApplicationServer\App\RequestProxy::class => null,
         Magento\TestFramework\Request::class => null,
         Magento\Framework\View\FileSystem::class => null,
-        Magento\ApplicationServer\App\CookieManager::class => null,
         Magento\Framework\App\Config\FileResolver::class => null,
         Magento\Framework\Module\Manager::class => null,
         Magento\Framework\Logger\LoggerProxy::class => null,