Refactor Config and JsConfigs View Helper to use autowiring (#5081)

Author: sambhavp96

module/VuFind/src/VuFind/View/Helper/Root/Config.php

@@ -30,6 +30,7 @@
 namespace VuFind\View\Helper\Root;
 
 use VuFind\Config\ConfigManagerInterface;
+use VuFind\ServiceManager\Factory\Autowire;
 
 /**
  * Config view helper
@@ -40,7 +41,7 @@
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     https://vufind.org/wiki/development Wiki
  */
-class Config extends \Laminas\View\Helper\AbstractHelper
+class Config
 {
     /**
      * Display date format
@@ -61,8 +62,10 @@ class Config extends \Laminas\View\Helper\AbstractHelper
      *
      * @param ConfigManagerInterface $configManager Configuration manager
      */
-    public function __construct(protected ConfigManagerInterface $configManager)
-    {
+    public function __construct(
+        #[Autowire]
+        protected ConfigManagerInterface $configManager
+    ) {
     }
 
     /**
@@ -197,4 +200,14 @@ public function displayLoanType(): bool
         return (bool)($this->get('config')->Catalog
             ->display_loan_type_in_holdings ?? false);
     }
+
+    /**
+     * Return this helper instance (for method chaining).
+     *
+     * @return Config
+     */
+    public function __invoke()
+    {
+        return $this;
+    }
 }

module/VuFind/src/VuFind/View/Helper/Root/ConfigFactory.php

@@ -29,8 +29,6 @@
 
 namespace VuFind\View\Helper\Root;
 
-use Laminas\View\Helper\AbstractHelper;
-
 /**
  * JsConfigs helper for passing configs to Javascript
  *
@@ -40,7 +38,7 @@
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     https://vufind.org/wiki/development Wiki
  */
-class JsConfigs extends AbstractHelper
+class JsConfigs
 {
     /**
      * Config
@@ -74,4 +72,14 @@ public function getJSON(): string
         }
         return json_encode($this->config);
     }
+
+    /**
+     * Return this helper instance.
+     *
+     * @return JsConfigs
+     */
+    public function __invoke()
+    {
+        return $this;
+    }
 }

module/VuFind/src/VuFind/View/Helper/Root/JsConfigs.php

@@ -298,7 +298,9 @@ protected function getFormatter($additionalConfig = [], $additionalSpecs = [])
         // Inject the view object into all of the helpers:
         $formatter->setView($view);
         foreach ($helpers as $helper) {
-            $helper->setView($view);
+            if (method_exists($helper, 'setView')) {
+                $helper->setView($view);
+            }
         }
 
         return $formatter;

module/VuFind/tests/unit-tests/src/VuFindTest/View/Helper/Root/RecordDataFormatterTest.php

@@ -21,7 +21,6 @@
             'VuFind\View\Helper\Root\Citation' => 'VuFind\View\Helper\Root\CitationFactory',
             'VuFind\View\Helper\Root\CleanHtml' => 'VuFind\View\Helper\Root\CleanHtmlFactory',
             'VuFind\View\Helper\Root\Component' => 'Laminas\ServiceManager\Factory\InvokableFactory',
-            'VuFind\View\Helper\Root\Config' => 'VuFind\View\Helper\Root\ConfigFactory',
             'VuFind\View\Helper\Root\CookieConsent' => 'VuFind\View\Helper\Root\CookieConsentFactory',
             'VuFind\View\Helper\Root\CookieManager' => 'VuFind\View\Helper\Root\CookieManagerFactory',
             'VuFind\View\Helper\Root\ContentBlock' => 'Laminas\ServiceManager\Factory\InvokableFactory',
@@ -47,7 +46,6 @@
             'VuFind\View\Helper\Root\Icon' => 'VuFind\View\Helper\Root\IconFactory',
             'VuFind\View\Helper\Root\IdentifierLinker' => 'VuFind\View\Helper\Root\IdentifierLinkerFactory',
             'VuFind\View\Helper\Root\Ils' => 'VuFind\View\Helper\Root\IlsFactory',
-            'VuFind\View\Helper\Root\JsConfigs' => 'Laminas\ServiceManager\Factory\InvokableFactory',
             'VuFind\View\Helper\Root\JsIcons' => 'VuFind\View\Helper\Root\JsIconsFactory',
             'VuFind\View\Helper\Root\JsTranslations' => 'VuFind\View\Helper\Root\JsTranslationsFactory',
             'VuFind\View\Helper\Root\KeepAlive' => 'VuFind\View\Helper\Root\KeepAliveFactory',