Fix deprecated code

Author: thomas-kl1

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

@@ -50,18 +50,21 @@ class WebsiteRepository implements \Magento\Store\Api\WebsiteRepositoryInterface
     /**
      * @var Config
      */
-    private $appConfig;
+    private Config $appConfig;
 
     /**
      * @param WebsiteFactory $factory
      * @param CollectionFactory $websiteCollectionFactory
+     * @param Config|null $appConfig
      */
     public function __construct(
         WebsiteFactory $factory,
-        CollectionFactory $websiteCollectionFactory
+        CollectionFactory $websiteCollectionFactory,
+        ?Config $appConfig = null
     ) {
         $this->factory = $factory;
         $this->websiteCollectionFactory = $websiteCollectionFactory;
+        $this->appConfig = $appConfig ?? ObjectManager::getInstance()->get(Config::class);
     }
 
     /**
@@ -73,7 +76,7 @@ public function get($code)
             return $this->entities[$code];
         }
 
-        $websiteData = $this->getAppConfig()->get('scopes', "websites/$code", []);
+        $websiteData = $this->appConfig->get('scopes', "websites/$code", []);
         $website = $this->factory->create([
             'data' => $websiteData
         ]);
@@ -97,7 +100,7 @@ public function getById($id)
             return $this->entitiesById[$id];
         }
 
-        $websiteData = $this->getAppConfig()->get('scopes', "websites/$id", []);
+        $websiteData = $this->appConfig->get('scopes', "websites/$id", []);
         $website = $this->factory->create([
             'data' => $websiteData
         ]);
@@ -118,7 +121,7 @@ public function getById($id)
     public function getList()
     {
         if (!$this->allLoaded) {
-            $websites = $this->getAppConfig()->get('scopes', 'websites', []);
+            $websites = $this->appConfig->get('scopes', 'websites', []);
             foreach ($websites as $data) {
                 $website = $this->factory->create([
                     'data' => $data
@@ -169,13 +172,11 @@ public function clean()
      * Retrieve application config.
      *
      * @deprecated 100.1.3 Should be lazy loaded with a proxy via the DI.
+     * @see self::$appConfig
      * @return Config
      */
-    private function getAppConfig()
+    private function getAppConfig(): Config
     {
-        if (!$this->appConfig) {
-            $this->appConfig = ObjectManager::getInstance()->get(Config::class);
-        }
         return $this->appConfig;
     }
 
@@ -186,7 +187,7 @@ private function getAppConfig()
      */
     private function initDefaultWebsite()
     {
-        $websites = (array) $this->getAppConfig()->get('scopes', 'websites', []);
+        $websites = (array)$this->appConfig->get('scopes', 'websites', []);
         foreach ($websites as $data) {
             if (isset($data['is_default']) && $data['is_default'] == 1) {
                 if ($this->default) {