Reinitialize Class Instances so that they pick up config changes

Author: Willem Wigman

src/Plugin/CategoryLayoutPlugin.php

@@ -90,7 +90,6 @@ public function afterFetchAvailableFiles(
         CategoryInterface $category): array
     {
         $handles = $this->getLayoutProcessor()->getAvailableHandles();
-
         return array_merge(
             $result,
             array_filter(

tests/Integration/AbstractFrontendControllerTest.php

@@ -59,7 +59,6 @@ abstract class AbstractFrontendControllerTest extends AbstractController
      */
     protected function setUp(): void
     {
-        Bootstrap::getInstance()->reinitialize();
         $this->objectManager = Bootstrap::getObjectManager();
         $this->layout = $this->objectManager->get(LayoutInterface::class);
         $this->configWriter = $this->objectManager->get(Writer::class);
@@ -74,6 +73,10 @@ protected function enableTestModuleInConfig()
     {
         $this->moduleStatus = $this->objectManager->create(ModuleStatus::class);
         $this->moduleStatus->setIsEnabled(true, ['IntegerNet_GlobalCustomLayoutTest']);
+
+        $this->objectManager->removeSharedInstance(\Magento\Framework\Module\Manager::class);
+        $this->objectManager->removeSharedInstance(\Magento\Framework\Module\ModuleList::class);
+        $this->objectManager->removeSharedInstance(\Magento\Framework\View\Model\Layout\Merge::class);
     }
 
     /**