Replace config PluginManager with ConfigManager in many instances

module/VuFind/src/VuFind/AjaxHandler/GetItemStatusesFactory.php

@@ -71,7 +71,7 @@ public function __invoke(
         }
         $handler = new $requestedName(
             $container->get(\VuFind\Session\Settings::class),
-            $container->get(\VuFind\Config\PluginManager::class)->get('config'),
+            $container->get(\VuFind\Config\ConfigManager::class)->getConfigObject('config'),
             $container->get(\VuFind\ILS\Connection::class),
             $container->get('ViewRenderer'),
             $container->get(\VuFind\ILS\Logic\Holds::class),

module/VuFind/src/VuFind/AjaxHandler/GetRecordCoverFactory.php

@@ -67,8 +67,7 @@ public function __invoke(
         $requestedName,
         ?array $options = null
     ) {
-        $config
-            = $container->get(\VuFind\Config\PluginManager::class)->get('config');
+        $config = $container->get(\VuFind\Config\ConfigManager::class)->getConfigObject('config');
         $useFallbacks = $config->Content->useCoverFallbacksOnFail ?? false;
         return new $requestedName(
             $container->get(\VuFind\Session\Settings::class),

module/VuFind/src/VuFind/AjaxHandler/GetResolverLinksFactory.php

@@ -73,7 +73,7 @@ public function __invoke(
             $container->get(\VuFind\Session\Settings::class),
             $container->get(\VuFind\Resolver\Driver\PluginManager::class),
             $container->get('ViewRenderer'),
-            $container->get(\VuFind\Config\PluginManager::class)->get('config')
+            $container->get(\VuFind\Config\ConfigManager::class)->getConfigObject('config')
         );
     }
 }

module/VuFind/src/VuFind/AjaxHandler/GetSearchResultsFactory.php

@@ -77,7 +77,7 @@ public function __invoke(
             $container->get(\VuFind\Auth\Manager::class)->getUserObject(),
             $container->get(\Laminas\Session\SessionManager::class)->getId(),
             $container->get(\VuFind\Search\SearchNormalizer::class),
-            $container->get(\VuFind\Config\PluginManager::class)->get('config')->toArray(),
+            $container->get(\VuFind\Config\ConfigManager::class)->getConfigArray('config'),
             $container->get(\VuFind\Search\Memory::class)
         );
         return $result;

module/VuFind/src/VuFind/AjaxHandler/IdentifierLinksLookupFactory.php

@@ -69,8 +69,7 @@ public function __invoke(
         if (!empty($options)) {
             throw new \Exception('Unexpected options passed to factory.');
         }
-        $config = $container->get(\VuFind\Config\PluginManager::class)
-            ->get('config')->toArray();
+        $config = $container->get(\VuFind\Config\ConfigManager::class)->getConfigArray('config');
         return new $requestedName(
             $container->get(\VuFind\IdentifierLinker\PluginManager::class),
             $container->get('ViewRenderer'),

module/VuFind/src/VuFind/AjaxHandler/SystemStatusFactory.php

@@ -75,7 +75,7 @@ public function __invoke(
         return new $requestedName(
             $container->get(\Laminas\Session\SessionManager::class),
             $container->get(\VuFind\Search\Results\PluginManager::class),
-            $container->get(\VuFind\Config\PluginManager::class)->get('config'),
+            $container->get(\VuFind\Config\ConfigManager::class)->getConfigObject('config'),
             $servicePluginManager->get(\VuFind\Db\Service\SessionServiceInterface::class)
         );
     }

module/VuFind/src/VuFind/Auth/EmailAuthenticatorFactory.php

@@ -73,7 +73,7 @@ public function __invoke(
             $container->get(\VuFind\Mailer\Mailer::class),
             $container->get('ViewRenderer'),
             $container->get(\VuFind\Net\UserIpReader::class),
-            $container->get(\VuFind\Config\PluginManager::class)->get('config'),
+            $container->get(\VuFind\Config\ConfigManager::class)->getConfigObject('config'),
             $container->get(\VuFind\Db\Service\PluginManager::class)
                 ->get(\VuFind\Db\Service\AuthHashServiceInterface::class)
         );

module/VuFind/src/VuFind/Auth/ILSAuthenticatorFactory.php

@@ -87,7 +87,7 @@ function (string $algo) use ($container) {
             ),
             $container->get(\VuFind\ILS\Connection::class),
             $container->get(\VuFind\Auth\EmailAuthenticator::class),
-            $container->get(\VuFind\Config\PluginManager::class)->get('config')
+            $container->get(\VuFind\Config\ConfigManager::class)->getConfigObject('config')
         );
         $dbServiceManager = $container->get(DatabaseServiceManager::class);
         $service->setAuditEventService($dbServiceManager->get(AuditEventServiceInterface::class));

module/VuFind/src/VuFind/Auth/LoginTokenManagerFactory.php

@@ -83,7 +83,7 @@ public function __invoke(
 
         $dbServiceManager = $container->get(\VuFind\Db\Service\PluginManager::class);
         return new $requestedName(
-            $container->get(\VuFind\Config\PluginManager::class)->get('config'),
+            $container->get(\VuFind\Config\ConfigManager::class)->getConfigObject('config'),
             $dbServiceManager->get(UserServiceInterface::class),
             $dbServiceManager->get(LoginTokenServiceInterface::class),
             $container->get(\VuFind\Cookie\CookieManager::class),

module/VuFind/src/VuFind/Auth/ManagerFactory.php

@@ -69,7 +69,7 @@ public function __invoke(
             throw new \Exception('Unexpected options sent to factory.');
         }
         // Load dependencies:
-        $config = $container->get(\VuFind\Config\PluginManager::class)->get('config');
+        $config = $container->get(\VuFind\Config\ConfigManager::class)->getConfigObject('config');
         $dbServiceManager = $container->get(\VuFind\Db\Service\PluginManager::class);
         $userService = $dbServiceManager->get(\VuFind\Db\Service\UserServiceInterface::class);
         $sessionManager = $container->get(\Laminas\Session\SessionManager::class);

module/VuFind/src/VuFind/Auth/OpenIDConnectFactory.php

@@ -74,7 +74,7 @@ public function __invoke(
             'OpenIDConnect',
             $container->get(\Laminas\Session\SessionManager::class)
         );
-        $config = $container->get(\VuFind\Config\PluginManager::class)->get('OpenIDConnectClient')->toArray();
+        $config = $container->get(\VuFind\Config\ConfigManager::class)->getConfigArray('OpenIDConnectClient');
         $ilsAuthenticator = $container->get(\VuFind\Auth\ILSAuthenticator::class);
         return new $requestedName($session, $config, $ilsAuthenticator);
     }

module/VuFind/src/VuFind/Auth/ShibbolethFactory.php

@@ -90,11 +90,11 @@ public function __invoke(
      */
     public function getConfigurationLoader(ContainerInterface $container)
     {
-        $configManager = $container->get(\VuFind\Config\PluginManager::class);
-        $config = $configManager->get('config');
+        $configManager = $container->get(\VuFind\Config\ConfigManager::class);
+        $config = $configManager->getConfigObject('config');
         $override = $config->Shibboleth->allow_configuration_override ?? false;
         if ($override) {
-            $shibConfig = $configManager->get(self::SHIBBOLETH_CONFIG_FILE_NAME);
+            $shibConfig = $configManager->getConfigObject(self::SHIBBOLETH_CONFIG_FILE_NAME);
             return new MultiIdPConfigurationLoader($config, $shibConfig);
         }
         return new SingleIdPConfigurationLoader($config);

module/VuFind/src/VuFind/Auth/SimulatedSSOFactory.php

@@ -78,7 +78,7 @@ public function __invoke(
                 $url('simulatedsso-login', [], ['query' => ['return' => $target]])
             );
         };
-        $config = $container->get(\VuFind\Config\PluginManager::class)->get('SimulatedSSO')->toArray();
+        $config = $container->get(\VuFind\Config\ConfigManager::class)->getConfigArray('SimulatedSSO');
         return new $requestedName(
             $getUrl,
             $config,

module/VuFind/src/VuFind/Bootstrapper.php

@@ -85,8 +85,7 @@ public function __construct(MvcEvent $event)
         $app = $event->getApplication();
         $this->events = $app->getEventManager();
         $this->container = $app->getServiceManager();
-        $this->config = $this->container->get(\VuFind\Config\PluginManager::class)
-            ->get('config');
+        $this->config = $this->container->get(\VuFind\Config\ConfigManager::class)->getConfigObject('config');
     }
 
     /**

module/VuFind/src/VuFind/Cache/ManagerFactory.php

@@ -68,9 +68,10 @@ public function __invoke(
         if (!empty($options)) {
             throw new \Exception('Unexpected options sent to factory.');
         }
+        $configManager = $container->get(\VuFind\Config\ConfigManager::class);
         return new $requestedName(
-            $container->get(\VuFind\Config\PluginManager::class)->get('config'),
-            $container->get(\VuFind\Config\PluginManager::class)->get('searches'),
+            $configManager->getConfigObject('config'),
+            $configManager->getConfigObject('searches'),
             $container->get(\Laminas\Cache\Service\StorageAdapterFactory::class)
         );
     }

module/VuFind/src/VuFind/Captcha/ImageFactory.php

@@ -82,26 +82,25 @@ public function __invoke(
             'imgDir' => $cacheOptions->getCacheDir(),
         ];
 
-        $config = $container->get(\VuFind\Config\PluginManager::class)
-            ->get('config');
-
-        if (isset($config->Captcha->image_length)) {
-            $imageOptions['wordLen'] = $config->Captcha->image_length;
+        $config = $container->get(\VuFind\Config\ConfigManager::class)
+            ->getConfigArray('config')['Captcha'] ?? [];
+        if (isset($config['image_length'])) {
+            $imageOptions['wordLen'] = $config['image_length'];
         }
-        if (isset($config->Captcha->image_width)) {
-            $imageOptions['width'] = $config->Captcha->image_width;
+        if (isset($config['image_width'])) {
+            $imageOptions['width'] = $config['image_width'];
         }
-        if (isset($config->Captcha->image_height)) {
-            $imageOptions['height'] = $config->Captcha->image_height;
+        if (isset($config['image_height'])) {
+            $imageOptions['height'] = $config['image_height'];
         }
-        if (isset($config->Captcha->image_fontSize)) {
-            $imageOptions['fsize'] = $config->Captcha->image_fontSize;
+        if (isset($config['image_fontSize'])) {
+            $imageOptions['fsize'] = $config['image_fontSize'];
         }
-        if (isset($config->Captcha->image_dotNoiseLevel)) {
-            $imageOptions['dotNoiseLevel'] = $config->Captcha->image_dotNoiseLevel;
+        if (isset($config['image_dotNoiseLevel'])) {
+            $imageOptions['dotNoiseLevel'] = $config['image_dotNoiseLevel'];
         }
-        if (isset($config->Captcha->image_lineNoiseLevel)) {
-            $imageOptions['lineNoiseLevel'] = $config->Captcha->image_lineNoiseLevel;
+        if (isset($config['image_lineNoiseLevel'])) {
+            $imageOptions['lineNoiseLevel'] = $config['image_lineNoiseLevel'];
         }
 
         $baseUrl = rtrim(

module/VuFind/src/VuFind/Captcha/IntervalFactory.php

@@ -75,7 +75,7 @@ public function __invoke(
         );
         return new $requestedName(
             $sessionStorage,
-            $container->get(\VuFind\Config\PluginManager::class)->get('config')
+            $container->get(\VuFind\Config\ConfigManager::class)->getConfigObject('config')
         );
     }
 }

module/VuFind/src/VuFind/CartFactory.php

@@ -68,18 +68,13 @@ public function __invoke(
         if (!empty($options)) {
             throw new \Exception('Unexpected options sent to factory.');
         }
-        $config = $container->get(\VuFind\Config\PluginManager::class)
-            ->get('config');
-        $active = isset($config->Site->showBookBag)
-            ? (bool)$config->Site->showBookBag : false;
-        $size = $config->Site->bookBagMaxSize ?? 100;
-        $activeInSearch = $config->Site->bookbagTogglesInSearch ?? true;
+        $config = $container->get(\VuFind\Config\ConfigManager::class)->getConfigObject('config')['Site'];
         return new $requestedName(
             $container->get(\VuFind\Record\Loader::class),
             $container->get(\VuFind\Cookie\CookieManager::class),
-            $size,
-            $active,
-            $activeInSearch
+            $config['bookBagMaxSize'] ?? 100,
+            $config['showBookBag'] ?? false,
+            $config['bookbagTogglesInSearch'] ?? true
         );
     }
 }

module/VuFind/src/VuFind/ChannelProvider/ChannelLoaderFactory.php

@@ -70,7 +70,7 @@ public function __invoke(
             throw new \Exception('Unexpected options sent to factory!');
         }
         return new $requestedName(
-            $container->get(\VuFind\Config\PluginManager::class)->get('channels'),
+            $container->get(\VuFind\Config\ConfigManager::class)->getConfigObject('channels'),
             $container->get(\VuFind\Cache\Manager::class),
             $container->get(\VuFind\ChannelProvider\PluginManager::class),
             $container->get(\VuFind\Search\SearchRunner::class),

module/VuFind/src/VuFind/Config/AccountCapabilitiesFactory.php

@@ -69,7 +69,7 @@ public function __invoke(
             throw new \Exception('Unexpected options sent to factory.');
         }
         return new $requestedName(
-            $container->get(\VuFind\Config\PluginManager::class)->get('config'),
+            $container->get(\VuFind\Config\ConfigManager::class)->getConfigObject('config'),
             // Pass a callback to return the auth manager to prevent circular dependencies
             // (we need the auth manager to determine some capabilities, but some of its
             // dependencies may need to make capability checks as well).

module/VuFind/src/VuFind/Connection/LibGuidesFactory.php

@@ -70,8 +70,7 @@ public function __invoke(
         if (!empty($options)) {
             throw new \Exception('Unexpected options sent to factory.');
         }
-        $config = $container->get(\VuFind\Config\PluginManager::class)
-            ->get('LibGuidesAPI');
+        $config = $container->get(\VuFind\Config\ConfigManager::class)->getConfigObject('LibGuidesAPI');
         if (!isset($config->General->client_id)) {
             throw new \Exception('client_id key missing from configuration.');
         }

module/VuFind/src/VuFind/Connection/RelaisFactory.php

@@ -68,8 +68,7 @@ public function __invoke(
         if (!empty($options)) {
             throw new \Exception('Unexpected options sent to factory.');
         }
-        $config = $container->get(\VuFind\Config\PluginManager::class)
-            ->get('config');
+        $config = $container->get(\VuFind\Config\ConfigManager::class)->getConfigObject('config');
         $url = $config->Relais->authenticateurl ?? null;
         $client = $container->get(\VuFindHttp\HttpService::class)
             ->createClient($url);

module/VuFind/src/VuFind/Content/AbstractSyndeticsFactory.php

@@ -70,8 +70,7 @@ public function __invoke(
         if ($options !== null) {
             throw new \Exception('Unexpected options sent to factory!');
         }
-        $config = $container->get(\VuFind\Config\PluginManager::class)
-            ->get('config');
+        $config = $container->get(\VuFind\Config\ConfigManager::class)->getConfigArray('config');
 
         // Special case: if the class name ends in Plus, we need to strip off
         // the "Plus" and instead configure the base Syndetics class into "plus"
@@ -81,9 +80,9 @@ public function __invoke(
             ? substr($requestedName, 0, strlen($requestedName) - 4) : $requestedName;
 
         return new $className(
-            isset($config->Syndetics->use_ssl) && $config->Syndetics->use_ssl,
+            isset($config['Syndetics']['use_ssl']) && $config['Syndetics']['use_ssl'],
             $plus,
-            $config->Syndetics->timeout ?? 10
+            $config['Syndetics']['timeout'] ?? 10
         );
     }
 }

module/VuFind/src/VuFind/Content/Covers/BooksiteFactory.php

@@ -69,12 +69,11 @@ public function __invoke(
         if (!empty($options)) {
             throw new \Exception('Unexpected options passed to factory.');
         }
-        $config = $container->get(\VuFind\Config\PluginManager::class)
-            ->get('config');
-        $url = $config->Booksite->url ?? 'https://api.booksite.com';
-        if (!isset($config->Booksite->key)) {
+        $config = $container->get(\VuFind\Config\ConfigManager::class)->getConfigArray('config');
+        $url = $config['Booksite']['url'] ?? 'https://api.booksite.com';
+        if (!isset($config['Booksite']['key'])) {
             throw new \Exception("Booksite 'key' not set in VuFind config");
         }
-        return new $requestedName($url, $config->Booksite->key);
+        return new $requestedName($url, $config['Booksite']['key']);
     }
 }

module/VuFind/src/VuFind/Content/Covers/BrowZineFactory.php

@@ -69,7 +69,7 @@ public function __invoke(
         if (!empty($options)) {
             throw new \Exception('Unexpected options passed to factory.');
         }
-        $config = $container->get(\VuFind\Config\PluginManager::class)->get('BrowZine')?->toArray() ?? [];
+        $config = $container->get(\VuFind\Config\ConfigManager::class)->getConfigArray('BrowZine');
         $defaultIgnoreList = ['https://assets.thirdiron.com/default-journal-cover.png'];
         $ignoreList = $config['Covers']['ignored_images'] ?? $defaultIgnoreList;
         return new $requestedName($container->get(\VuFindSearch\Service::class), $ignoreList);

module/VuFind/src/VuFind/Content/Covers/BuchhandelFactory.php

@@ -69,14 +69,13 @@ public function __invoke(
         if (!empty($options)) {
             throw new \Exception('Unexpected options passed to factory.');
         }
-        $config = $container->get(\VuFind\Config\PluginManager::class)
-            ->get('config');
-        $url = isset($config->Buchhandel->url)
-            ? trim($config->Buchhandel->url, '/') . '/'
+        $config = $container->get(\VuFind\Config\ConfigManager::class)->getConfigArray('config');
+        $url = isset($config['Buchhandel']['url'])
+            ? trim($config['Buchhandel']['url'], '/') . '/'
             : 'https://api.vlb.de/api/v1/cover/';
-        if (!isset($config->Buchhandel->token)) {
+        if (!isset($config['Buchhandel']['token'])) {
             throw new \Exception("Buchhandel.de 'token' not set in VuFind config");
         }
-        return new $requestedName($url, $config->Buchhandel->token);
+        return new $requestedName($url, $config['Buchhandel']['token']);
     }
 }

module/VuFind/src/VuFind/Content/Covers/ContentCafeFactory.php

@@ -69,8 +69,7 @@ public function __invoke(
         if (!empty($options)) {
             throw new \Exception('Unexpected options passed to factory.');
         }
-        $config = $container->get(\VuFind\Config\PluginManager::class)
-            ->get('config');
+        $config = $container->get(\VuFind\Config\ConfigManager::class)->getConfigObject('config');
         $finalConfig = $config->Contentcafe ?? new \VuFind\Config\Config([]);
         return new $requestedName($finalConfig);
     }

module/VuFind/src/VuFind/Content/Covers/KohaFactory.php

@@ -69,11 +69,10 @@ public function __invoke(
         if (!empty($options)) {
             throw new \Exception('Unexpected options passed to factory.');
         }
-        $config = $container->get(\VuFind\Config\PluginManager::class)
-            ->get('config');
-        if (empty($config->Content->koha_cover_url)) {
+        $config = $container->get(\VuFind\Config\ConfigManager::class)->getConfigArray('config');
+        if (empty($config['Content']['koha_cover_url'])) {
             throw new \Exception('Koha cover URL must be provided.');
         }
-        return new $requestedName($config->Content->koha_cover_url);
+        return new $requestedName($config['Content']['koha_cover_url']);
     }
 }

module/VuFind/src/VuFind/Content/Covers/OrbFactory.php

@@ -69,16 +69,15 @@ public function __invoke(
         if (!empty($options)) {
             throw new \Exception('Unexpected options passed to factory.');
         }
-        $configPluginManager = $container->get(\VuFind\Config\PluginManager::class);
-        $config = $configPluginManager->get('config');
-        $url = $config->Orb->url ?? 'api.base-orb.fr/v1';
-        if (!isset($config->Orb->user)) {
+        $config = $container->get(\VuFind\Config\ConfigManager::class)->getConfigArray('config');
+        $url = $config['Orb']['url'] ?? 'api.base-orb.fr/v1';
+        if (!isset($config['Orb']['user'])) {
             throw new \Exception("Orb 'user' not set in VuFind config");
         }
-        if (!isset($config->Orb->key)) {
+        if (!isset($config['Orb']['key'])) {
             throw new \Exception("Orb 'key' not set in VuFind config");
         }
-        $orb = new $requestedName($url, $config->Orb->user, $config->Orb->key);
+        $orb = new $requestedName($url, $config['Orb']['user'], $config['Orb']['key']);
         $cachingDownloader = $container->get(\VuFind\Http\CachingDownloader::class);
         $orb->setCachingDownloader($cachingDownloader);
         return $orb;

module/VuFind/src/VuFind/Content/Covers/SyndeticsFactory.php

@@ -69,8 +69,7 @@ public function __invoke(
         if (!empty($options)) {
             throw new \Exception('Unexpected options passed to factory.');
         }
-        $config = $container->get(\VuFind\Config\PluginManager::class)
-            ->get('config');
+        $config = $container->get(\VuFind\Config\ConfigManager::class)->getConfigObject('config');
         $syndetics = new $requestedName($config->Syndetics ?? null);
         $cachingDownloader = $container->get(\VuFind\Http\CachingDownloader::class);
         $syndetics->setCachingDownloader($cachingDownloader);