pkp/pkp-lib#10292 Controlled vocab dao to eloquent model

pkp · Aug 20, 2024 · e78a892 · e78a892
1 parent 45373b2
commit e78a892
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 10 deletions.
diff --git a/classes/ArticleFront.php b/classes/ArticleFront.php
@@ -12,19 +12,19 @@
 
 namespace APP\plugins\generic\jatsTemplate\classes;
 
-use APP\core\Application;
-use APP\facades\Repo;
 use APP\issue\Issue;
+use APP\facades\Repo;
+use PKP\core\PKPString;
 use APP\journal\Journal;
 use APP\section\Section;
-use APP\submission\Submission;
-use APP\publication\Publication;
+use PKP\core\PKPRequest;
+use APP\core\Application;
 use PKP\core\PKPApplication;
-use PKP\core\PKPString;
-use PKP\db\DAORegistry;
+use APP\submission\Submission;
 use PKP\plugins\PluginRegistry;
+use APP\publication\Publication;
 use PKP\submissionFile\SubmissionFile;
-use PKP\core\PKPRequest;
+use PKP\submission\SubmissionKeywordVocab;
 
 class ArticleFront extends \DOMDocument
 {
@@ -284,8 +284,7 @@ function createArticleMeta(Submission $submission, Journal $journal, Section $se
             ->appendChild($this->createElement('self-uri'))
             ->setAttribute('xlink:href', $url);
 
-        $submissionKeywordDao = DAORegistry::getDAO('SubmissionKeywordDAO');
-        foreach ($submissionKeywordDao->getKeywords($publication->getId(), $journal->getSupportedSubmissionLocales()) as $locale => $keywords) {
+        foreach (SubmissionKeywordVocab::getKeywords($publication->getId(), $journal->getSupportedSubmissionLocales()) as $locale => $keywords) {
             if (empty($keywords)) continue;
 
             $kwdGroupElement = $articleMetaElement

diff --git a/tests/functional/ArticleTest.php b/tests/functional/ArticleTest.php
@@ -36,7 +36,7 @@ class ArticleTest extends PKPTestCase
      */
     protected function getMockedDAOs(): array
     {
-        return [...parent::getMockedDAOs(), 'OAIDAO', 'SubmissionSubjectDAO', 'SubmissionKeywordDAO'];
+        return [...parent::getMockedDAOs(), 'OAIDAO'];
     }
 
     /**