Merge pull request #1948 from bozana/11260-3_5_0

pkp/pkp-lib#11260 fix return type in getRepresentationDao(), remove flushCache(), fix context abbrev in publication URN

Author: bozana

classes/core/Application.php

@@ -21,11 +21,11 @@
 
 use APP\payment\omp\OMPPaymentManager;
 use APP\press\PressDAO;
-use APP\publicationFormat\PublicationFormatDAO;
 use APP\search\MonographSearchDAO;
 use APP\search\MonographSearchIndex;
 use PKP\context\Context;
 use PKP\core\PKPApplication;
+use PKP\db\DAO;
 use PKP\db\DAORegistry;
 use PKP\facades\Locale;
 use PKP\submission\RepresentationDAOInterface;
@@ -166,10 +166,8 @@ public static function getContextDAO(): PressDAO
 
     /**
      * Get the representation DAO.
-     *
-     * @return PublicationFormatDAO|RepresentationDAOInterface
      */
-    public static function getRepresentationDAO(): RepresentationDAOInterface
+    public static function getRepresentationDAO(): DAO|RepresentationDAOInterface
     {
         return DAORegistry::getDAO('PublicationFormatDAO');
     }

classes/monograph/ChapterDAO.php

@@ -342,7 +342,6 @@ public function changePubId($pubObjectId, $pubIdType, $pubId)
      */
     public function deletePubId(int $pubObjectId, string $pubIdType): int
     {
-        $this->flushCache();
         return DB::table('submission_chapter_settings')
             ->where('setting_name', '=', "pub-id::{$pubIdType}")
             ->where('chapter_id', '=', $pubObjectId)

classes/publicationFormat/PublicationFormatDAO.php

@@ -516,7 +516,6 @@ public function changePubId($pubObjectId, $pubIdType, $pubId)
      */
     public function deletePubId(int $pubObjectId, string $pubIdType): int
     {
-        $this->flushCache();
         return DB::table('publication_format_settings')
             ->where('setting_name', '=', "pub-id::{$pubIdType}")
             ->where('publication_format_id', '=', $pubObjectId)
@@ -529,7 +528,6 @@ public function deletePubId(int $pubObjectId, string $pubIdType): int
     public function deleteAllPubIds(int $contextId, string $pubIdType): int
     {
         $formats = $this->getByContextId($contextId);
-        $this->flushCache();
         $affectedRows = 0;
         while ($format = $formats->next()) {
             $affectedRows += $this->deletePubId($format->getId(), $pubIdType);

lib/pkp

@@ -24,6 +24,7 @@
 use APP\plugins\pubIds\urn\classes\form\URNSettingsForm;
 use APP\publicationFormat\PublicationFormat;
 use APP\template\TemplateManager;
+use Illuminate\Support\Str;
 use PKP\components\forms\FormComponent;
 use PKP\components\forms\publication\PKPPublicationIdentifiersForm;
 use PKP\linkAction\LinkAction;
@@ -326,7 +327,7 @@ public function addPublicationFormFields(string $hookName, FormComponent $form):
                 'value' => $form->publication->getData('pub-id::other::urn'),
                 'prefix' => $prefix,
                 'pattern' => $pattern,
-                'contextInitials' => $form->submissionContext->getData('acronym', $form->submissionContext->getData('primaryLocale')) ?? '',
+                'contextInitials' => preg_replace('/[^-._;()\/A-Za-z0-9]/', '', Str::lower($form->submissionContext->getData('acronym', $form->submissionContext->getData('primaryLocale')) ?? '')),
                 'isPForPress' => true,
                 'submissionId' => $form->publication->getData('submissionId'),
                 'assignIdLabel' => __('plugins.pubIds.urn.editor.urn.assignUrn'),