Refactor EscapeOrCleanHtml and Highlight View Helpers to use Autowiring (#5095)

Author: sambhavp96

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

@@ -30,7 +30,7 @@
 namespace VuFind\View\Helper\Root;
 
 use Laminas\Escaper\Escaper;
-use Laminas\View\Helper\AbstractHelper;
+use VuFind\ServiceManager\Factory\Autowire;
 use VuFind\String\PropertyStringInterface;
 
 /**
@@ -42,7 +42,7 @@
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     https://vufind.org/wiki/development Wiki
  */
-class EscapeOrCleanHtml extends AbstractHelper
+class EscapeOrCleanHtml
 {
     /**
      * Contexts that allow HTML
@@ -58,8 +58,13 @@ class EscapeOrCleanHtml extends AbstractHelper
      * @param CleanHtml $cleanHtml Clean HTML helper
      * @param array     $config    VuFind configuration
      */
-    public function __construct(protected Escaper $escaper, protected CleanHtml $cleanHtml, array $config)
-    {
+    public function __construct(
+        protected Escaper $escaper,
+        #[Autowire(container: 'ViewHelperManager')]
+        protected CleanHtml $cleanHtml,
+        #[Autowire(config: 'config')]
+        array $config
+    ) {
         $this->htmlContexts = (array)($config['Allowed_HTML_Contexts'] ?? []);
     }
 

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

@@ -29,8 +29,6 @@
 
 namespace VuFind\View\Helper\Root;
 
-use Laminas\View\Helper\AbstractHelper;
-
 use function is_array;
 
 /**
@@ -42,7 +40,7 @@
  * @license  http://opensource.org/licenses/gpl-2.0.php GNU General Public License
  * @link     https://vufind.org/wiki/development Wiki
  */
-class Highlight extends AbstractHelper
+class Highlight
 {
     /**
      * Start tag for highlighting

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

@@ -30,7 +30,6 @@
             'VuFind\View\Helper\Root\DateTime' => 'VuFind\View\Helper\Root\DateTimeFactory',
             'VuFind\View\Helper\Root\DeveloperSettings' => 'VuFind\View\Helper\Root\DeveloperSettingsFactory',
             'VuFind\View\Helper\Root\DisplayLanguageOption' => 'VuFind\View\Helper\Root\DisplayLanguageOptionFactory',
-            'VuFind\View\Helper\Root\EscapeOrCleanHtml' => 'VuFind\View\Helper\Root\EscapeOrCleanHtmlFactory',
             'VuFind\View\Helper\Root\ExplainElement' => 'Laminas\ServiceManager\Factory\InvokableFactory',
             'VuFind\View\Helper\Root\Export' => 'VuFind\View\Helper\Root\ExportFactory',
             'VuFind\View\Helper\Root\Feedback' => 'VuFind\View\Helper\Root\FeedbackFactory',
@@ -39,7 +38,6 @@
             'VuFind\View\Helper\Root\GoogleAnalytics' => 'VuFind\View\Helper\Root\GoogleAnalyticsFactory',
             'VuFind\View\Helper\Root\GoogleTagManager' => 'VuFind\View\Helper\Root\GoogleTagManagerFactory',
             'VuFind\View\Helper\Root\HelpText' => 'VuFind\View\Helper\Root\HelpTextFactory',
-            'VuFind\View\Helper\Root\Highlight' => 'Laminas\ServiceManager\Factory\InvokableFactory',
             'VuFind\View\Helper\Root\HistoryLabel' => 'VuFind\View\Helper\Root\HistoryLabelFactory',
             'VuFind\View\Helper\Root\Holdings' => 'VuFind\View\Helper\Root\HoldingsFactory',
             'VuFind\View\Helper\Root\HtmlSafeJsonEncode' => 'Laminas\ServiceManager\Factory\InvokableFactory',