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

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

* pkp/pkp-lib#10292 removed extended vocab classes

OAIMetadataFormat_JATS.php

@@ -16,12 +16,13 @@
 namespace APP\plugins\oaiMetadataFormats\oaiJats;
 
 use APP\facades\Repo;
-use PKP\oai\OAIMetadataFormat;
-use PKP\db\DAORegistry;
-use PKP\submissionFile\SubmissionFile;
 use APP\core\Application;
 use APP\issue\IssueAction;
 use DOMDocument;
+use PKP\controlledVocab\ControlledVocab;
+use PKP\oai\OAIMetadataFormat;
+use PKP\db\DAORegistry;
+use PKP\submissionFile\SubmissionFile;
 use DOMXPath;
 use PKP\plugins\PluginRegistry;
 use PKP\plugins\Hook;
@@ -310,12 +311,19 @@ protected function _mungeMetadata($doc, $journal, $article, $section, $issue) {
 
 		// Set the article keywords.
 		$keywordGroupNode = $xpath->query('//article/front/article-meta/kwd-group')->item(0);
-		/** @var SubmissionKeywordDAO $submissionKeywordDao */
-		$submissionKeywordDao = DAORegistry::getDAO('SubmissionKeywordDAO');
+
 		while (($kwdGroupNodes = $articleMetaNode->getElementsByTagName('kwd-group'))->length !== 0) {
 			$articleMetaNode->removeChild($kwdGroupNodes->item(0));
 		}
-		foreach ($submissionKeywordDao->getKeywords($publication->getId()) as $locale => $keywords) {
+
+		$keywordVocabs = Repo::controlledVocab()->getBySymbolic(
+			ControlledVocab::CONTROLLED_VOCAB_SUBMISSION_KEYWORD,
+			Application::ASSOC_TYPE_PUBLICATION,
+			$publication->getId(),
+			$journal->getSupportedLocales()
+		);
+
+		foreach ($keywordVocabs as $locale => $keywords) {
 			if (empty($keywords)) continue;
 
 			$kwdGroupNode = $this->_addChildInOrder($articleMetaNode, $doc->createElement('kwd-group'));