Merge branch '4.x' of https://github.com/craftcms/cms into 5.x

craftcms · Nov 21, 2024 · 21f8b98 · 21f8b98
2 parents d303c47 + fe74e18
commit 21f8b98
Showing 1 changed file with 9 additions and 4 deletions.
diff --git a/tests/fixtures/SitesFixture.php b/tests/fixtures/SitesFixture.php
@@ -9,7 +9,6 @@
 
 use Craft;
 use craft\records\Site;
-use craft\services\Sites;
 use craft\test\ActiveFixture;
 
 /**
@@ -37,9 +36,15 @@ class SitesFixture extends ActiveFixture
     public function load(): void
     {
         parent::load();
+        Craft::$app->getSites()->refreshSites();
+    }
 
-        // Because the Sites() class memoizes on initialization we need to set() a new sites class
-        // with the updated fixture data
-        Craft::$app->set('sites', new Sites());
+    /**
+     * @inheritdoc
+     */
+    public function unload(): void
+    {
+        parent::unload();
+        Craft::$app->getSites()->refreshSites();
     }
 }