diff --git a/module/VuFind/src/VuFind/ChannelProvider/ChannelLoader.php b/module/VuFind/src/VuFind/ChannelProvider/ChannelLoader.php index 954c1ab6117..953b9ff9448 100644 --- a/module/VuFind/src/VuFind/ChannelProvider/ChannelLoader.php +++ b/module/VuFind/src/VuFind/ChannelProvider/ChannelLoader.php @@ -49,72 +49,24 @@ */ class ChannelLoader { - /** - * Cache manager - * - * @var CacheManager - */ - protected $cacheManager; - - /** - * Channel manager - * - * @var ChannelManager - */ - protected $channelManager; - - /** - * Channel configuration - * - * @var Config - */ - protected $config; - - /** - * Record loader - * - * @var RecordLoader - */ - protected $recordLoader; - - /** - * Search runner - * - * @var SearchRunner - */ - protected $searchRunner; - - /** - * Current locale (used for caching) - * - * @var string - */ - protected $locale; - /** * Constructor * - * @param Config $config Channels configuration - * @param CacheManager $cache Cache manager - * @param ChannelManager $cm Channel manager - * @param SearchRunner $runner Search runner - * @param RecordLoader $loader Record loader - * @param string $locale Current locale (used for caching) + * @param Config $config Channels configuration + * @param CacheManager $cacheManager Cache manager + * @param ChannelManager $channelManager Channel manager + * @param SearchRunner $searchRunner Search runner + * @param RecordLoader $recordLoader Record loader + * @param string $locale Current locale (used for caching) */ public function __construct( - Config $config, - CacheManager $cache, - ChannelManager $cm, - SearchRunner $runner, - RecordLoader $loader, - string $locale = '' + protected Config $config, + protected CacheManager $cacheManager, + protected ChannelManager $channelManager, + protected SearchRunner $searchRunner, + protected RecordLoader $recordLoader, + protected string $locale = '' ) { - $this->config = $config; - $this->cacheManager = $cache; - $this->channelManager = $cm; - $this->searchRunner = $runner; - $this->recordLoader = $loader; - $this->locale = $locale; } /** @@ -165,7 +117,7 @@ protected function getChannelsFromResults($providers, Results $results, $token) * if the channelProvider GET parameter is set). * * @param string $source Search backend ID - * @param array $configSection Configuration section to load ID list from + * @param string $configSection Configuration section to load ID list from * @param string $activeId Currently selected channel ID (if any; used * when making an AJAX request for a single additional channel) *