#766 Added a function to add view helpers to a oai server.

OPUS4 · Oct 10, 2023 · 6527e7b · 6527e7b
1 parent 59b25c3
commit 6527e7b
Show file tree

Hide file tree

Showing 2 changed files with 43 additions and 1 deletion.
diff --git a/modules/oai/models/DefaultServer.php b/modules/oai/models/DefaultServer.php
@@ -1143,7 +1143,7 @@ public function getViewHelpers()
     public function setViewHelpers($viewHelpers)
     {
         if (is_string($viewHelpers)) {
-            $viewHelpers = $viewHelpers !== '' ? array_map('trim', explode(',', $viewHelpers)) : [];
+            $viewHelpers = trim($viewHelpers) !== '' ? array_map('trim', explode(',', $viewHelpers)) : [];
         }
 
         if (is_array($viewHelpers)) {
@@ -1154,6 +1154,24 @@ public function setViewHelpers($viewHelpers)
         $this->viewHelpers = $viewHelpers;
     }
 
+    /**
+     * Adds viewHelpers
+     *
+     * @param array|string $viewHelpers
+     */
+    public function addViewHelpers($viewHelpers)
+    {
+        if (is_string($viewHelpers)) {
+            $viewHelpers = trim($viewHelpers) !== '' ? array_map('trim', explode(',', $viewHelpers)) : [];
+        }
+
+        if (is_array($viewHelpers)) {
+            $previousViewHelpers = $this->viewHelpers ?? [];
+            $viewHelpers         = array_unique(array_merge($previousViewHelpers, $viewHelpers));
+            $this->viewHelpers   = $viewHelpers;
+        }
+    }
+
     /**
      * Gets the checkEmbargo option.
      *

diff --git a/tests/modules/oai/models/BaseServerTest.php b/tests/modules/oai/models/BaseServerTest.php
@@ -105,4 +105,28 @@ public function testSetDocumentTypesAllowedWithEmptyString()
         $baseServer->setDocumentTypesAllowed('');
         $this->assertEquals([], $baseServer->getDocumentTypesAllowed());
     }
+
+    public function testAddViewHelpers()
+    {
+        $baseServer = new Oai_Model_DefaultServer();
+        $baseServer->setViewHelpers('viewhelper1, viewhelper2');
+        $this->assertEquals(['viewhelper1', 'viewhelper2', 'listMetadataFormats'], $baseServer->getViewHelpers());
+
+        $baseServer->addViewHelpers('viewhelper3, viewhelper4');
+        $this->assertEquals(
+            ['viewhelper1', 'viewhelper2', 'viewhelper3', 'viewhelper4', 'listMetadataFormats'],
+            $baseServer->getViewHelpers()
+        );
+    }
+
+    public function testAddViewHelpersWithEmptyString()
+    {
+        $baseServer = new Oai_Model_DefaultServer();
+        $baseServer->setViewHelpers('viewhelper1, viewhelper2');
+        $baseServer->addViewHelpers('');
+        $this->assertEquals(
+            ['viewhelper1', 'viewhelper2', 'listMetadataFormats'],
+            $baseServer->getViewHelpers()
+        );
+    }
 }