Remove unnecessary functionality from escapeOrCleanHtml (#4320)

Author: demiankatz

Diff for: module/VuFind/src/VuFind/View/Helper/Root/EscapeOrCleanHtml.php

@@ -66,22 +66,20 @@ public function __construct(protected Escaper $escaper, protected CleanHtml $cle
     /**
      * Invoke this helper: escape a value
      *
-     * @param ?string $value            Value to escape
-     * @param ?string $dataContext      Data context (for fields that allow sanitized HTML)
-     * @param ?bool   $allowHtml        Whether to allow sanitized HTML if passed a PropertyString
-     * @param string  $renderingContext Rendering context for cleaning HTML
+     * @param string|PropertyStringInterface $value            Value to escape
+     * @param ?string                        $dataContext      Data context (for fields that allow sanitized HTML)
+     * @param ?bool                          $allowHtml        Whether to allow sanitized HTML if passed a
+     * PropertyString
+     * @param string                         $renderingContext Rendering context for cleaning HTML
      *
-     * @return mixed Given a string, returns an escaped string, otherwise returns self
+     * @return mixed Returns an escaped or HTML-safe string
      */
     public function __invoke(
-        $value = null,
+        string|PropertyStringInterface $value,
         ?string $dataContext = null,
         ?bool $allowHtml = null,
         string $renderingContext = 'default'
     ) {
-        if (null === $value) {
-            return $this;
-        }
         if ($value instanceof PropertyStringInterface) {
             if (
                 ($allowHtml ?? ($dataContext && ($this->htmlContexts[$dataContext] ?? false)))

Diff for: module/VuFind/tests/unit-tests/src/VuFindTest/View/Helper/Root/EscapeOrCleanHtmlTest.php

@@ -110,17 +110,4 @@ public function testEscapeOrCleanHtml(
         $result = $escapeOrCleanHtml($input, $dataContext, $allowHtml, $renderingContext);
         $this->assertEquals($expected, $result);
     }
-
-    /**
-     * Test invoking without parameters
-     *
-     * @return void
-     */
-    public function testInvokeWithoutParameters(): void
-    {
-        $escaper = new Escaper(false);
-        $cleanHtml = $this->createCleanHtmlHelper();
-        $escapeOrCleanHtml = new EscapeOrCleanHtml($escaper, $cleanHtml, []);
-        $this->assertEquals($escapeOrCleanHtml, $escapeOrCleanHtml());
-    }
 }