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

#11260 fix return type in getRepresentationDao()

Author: bozana

classes/core/PKPApplication.php

@@ -30,6 +30,7 @@
 use Illuminate\Support\Facades\DB;
 use PKP\config\Config;
 use PKP\context\Context;
+use PKP\db\DAO;
 use PKP\db\DAORegistry;
 use PKP\facades\Locale;
 use PKP\plugins\Hook;
@@ -52,7 +53,7 @@ public static function getContextDAO(): \PKP\context\ContextDAO;
      *
      * @hook PKPApplication::execute::catch ['throwable' => $t]
      */
-    public static function getRepresentationDAO(): RepresentationDAOInterface;
+    public static function getRepresentationDAO(): DAO|RepresentationDAOInterface;
 
     /**
      * Get a SubmissionSearchIndex instance.

classes/submission/Representation.php

@@ -20,7 +20,7 @@
 use APP\facades\Repo;
 
 /**
- * @extends \PKP\core\DataObject<DAO|RepresentationDAOInterface>
+ * @extends \PKP\core\DataObject
  */
 class Representation extends \PKP\core\DataObject
 {
@@ -172,7 +172,7 @@ public function getContextId()
     /**
      * @copydoc \PKP\core\DataObject::getDAO()
      */
-    public function getDAO(): \PKP\galley\DAO
+    public function getDAO(): \PKP\db\DAO|\PKP\core\EntityDAO
     {
         return Application::getRepresentationDAO();
     }

classes/submission/RepresentationDAOInterface.php

@@ -1,6 +1,7 @@
 <?php
+
 /**
- * @file classes/galley/DAO.php
+ * @file classes/submission/RepresentationDAOInterface.php
  *
  * Copyright (c) 2014-2021 Simon Fraser University
  * Copyright (c) 2000-2021 John Willinsky