diff --git a/classes/author/Author.php b/classes/author/Author.php index f5477550f2..af68d7b9a2 100644 --- a/classes/author/Author.php +++ b/classes/author/Author.php @@ -21,8 +21,3 @@ class Author extends \PKP\author\Author { } - -if (!PKP_STRICT_MODE) { - // Required for import/export toolset - class_alias('\APP\author\Author', '\Author'); -} diff --git a/classes/core/Application.php b/classes/core/Application.php index 9da36f1095..6293534e8c 100644 --- a/classes/core/Application.php +++ b/classes/core/Application.php @@ -41,17 +41,14 @@ class Application extends PKPApplication public function __construct() { parent::__construct(); - if (!PKP_STRICT_MODE) { - foreach ([ + + if (!app()->getApplicationStrictModeStatus()) { + app()->registerGlobalConstants(static::class, [ 'REQUIRES_XSL', 'ASSOC_TYPE_PREPRINT', 'ASSOC_TYPE_GALLEY', 'ASSOC_TYPE_SERVER', - ] as $constantName) { - if (!defined($constantName)) { - define($constantName, constant('self::' . $constantName)); - } - } + ]); } // Add application locales diff --git a/classes/publication/Publication.php b/classes/publication/Publication.php index af9660d9cc..633bb29c5b 100644 --- a/classes/publication/Publication.php +++ b/classes/publication/Publication.php @@ -53,7 +53,3 @@ public function getLocalizedCoverImageUrl(int $contextId) ]); } } - -if (!PKP_STRICT_MODE) { - class_alias('\APP\publication\Publication', '\Publication'); -} diff --git a/classes/submission/Submission.php b/classes/submission/Submission.php index 97d409369e..b66a769759 100644 --- a/classes/submission/Submission.php +++ b/classes/submission/Submission.php @@ -148,7 +148,3 @@ public function getTotalGalleyViews(): int ->value('metric'); } } - -if (!PKP_STRICT_MODE) { - class_alias('\APP\submission\Submission', '\Submission'); -} diff --git a/controllers/grid/pubIds/PubIdExportRepresentationsListGridCellProvider.php b/controllers/grid/pubIds/PubIdExportRepresentationsListGridCellProvider.php index cb61a29334..a7fd0d1d25 100644 --- a/controllers/grid/pubIds/PubIdExportRepresentationsListGridCellProvider.php +++ b/controllers/grid/pubIds/PubIdExportRepresentationsListGridCellProvider.php @@ -17,6 +17,7 @@ namespace APP\controllers\grid\pubIds; use APP\facades\Repo; +use PKP\galley\Galley; use APP\plugins\PubObjectsExportPlugin; use PKP\controllers\grid\DataObjectGridCellProvider; use PKP\controllers\grid\GridHandler; @@ -59,7 +60,7 @@ public function getCellActions($request, $row, $column, $position = GridHandler: { $galley = $row->getData(); $columnId = $column->getId(); - assert(is_a($galley, 'Galley') && !empty($columnId)); + assert(is_a($galley, Galley::class) && !empty($columnId)); $publication = Repo::publication()->get($galley->getData('publicationId')); $submission = Repo::submission()->get($publication->getData('submissionId')); @@ -112,7 +113,7 @@ public function getTemplateVarsFromRowColumn($row, $column) { $submissionGalley = $row->getData(); $columnId = $column->getId(); - assert(is_a($submissionGalley, 'Galley') && !empty($columnId)); + assert(is_a($submissionGalley, Galley::class) && !empty($columnId)); switch ($columnId) { case 'id': diff --git a/dbscripts/xml/upgrade.xml b/dbscripts/xml/upgrade.xml index 963c73931c..091db70d07 100644 --- a/dbscripts/xml/upgrade.xml +++ b/dbscripts/xml/upgrade.xml @@ -183,6 +183,7 @@ + diff --git a/lib/pkp b/lib/pkp index 4f1269bb12..07ff21a5a4 160000 --- a/lib/pkp +++ b/lib/pkp @@ -1 +1 @@ -Subproject commit 4f1269bb1225ef5f078fb709abe40a9669f86f3c +Subproject commit 07ff21a5a46de9c2907b2bc27ea9dd9e74ec14df diff --git a/plugins/blocks/browse b/plugins/blocks/browse index 1247a12f0a..43adaa1057 160000 --- a/plugins/blocks/browse +++ b/plugins/blocks/browse @@ -1 +1 @@ -Subproject commit 1247a12f0ac3e5bba6b40d42a8cd811af0d3153e +Subproject commit 43adaa105759b90fa71f8780988c165b3ae35bb0 diff --git a/plugins/generic/crossref b/plugins/generic/crossref index 36b2aeb582..b67714b60a 160000 --- a/plugins/generic/crossref +++ b/plugins/generic/crossref @@ -1 +1 @@ -Subproject commit 36b2aeb582b127bfdd6a7ae742cb054efdf94ecf +Subproject commit b67714b60a1980bacc595e1222ad54c436cccecb diff --git a/plugins/generic/customBlockManager b/plugins/generic/customBlockManager index 5eaa2d9720..4d2688db24 160000 --- a/plugins/generic/customBlockManager +++ b/plugins/generic/customBlockManager @@ -1 +1 @@ -Subproject commit 5eaa2d97207ec7e109546a616855114243b9f82a +Subproject commit 4d2688db24e42a4b524dd75c88ad1299b5ccf9c2 diff --git a/plugins/generic/googleAnalytics b/plugins/generic/googleAnalytics index 4939f4ff41..24aa15891b 160000 --- a/plugins/generic/googleAnalytics +++ b/plugins/generic/googleAnalytics @@ -1 +1 @@ -Subproject commit 4939f4ff41a49ef29ce90c1f17d415f59b142574 +Subproject commit 24aa15891bd42dd646ffd6028ced3c76d169ef2f diff --git a/plugins/generic/googleScholar b/plugins/generic/googleScholar index 1b6d3986e6..212d94dcd2 160000 --- a/plugins/generic/googleScholar +++ b/plugins/generic/googleScholar @@ -1 +1 @@ -Subproject commit 1b6d3986e6ee24e4c038324571ec14b5ccf41b3d +Subproject commit 212d94dcd285bddf46af7567a97edf02fdbac6db diff --git a/plugins/generic/tinymce b/plugins/generic/tinymce index eaae7b1181..8474574ecb 160000 --- a/plugins/generic/tinymce +++ b/plugins/generic/tinymce @@ -1 +1 @@ -Subproject commit eaae7b11810fe5101003e58d78f20576dfe930ee +Subproject commit 8474574ecbcc111cf0114b3a1ce79c863ce67f58 diff --git a/plugins/generic/webFeed b/plugins/generic/webFeed index 593a49e58e..281b50b0cc 160000 --- a/plugins/generic/webFeed +++ b/plugins/generic/webFeed @@ -1 +1 @@ -Subproject commit 593a49e58ec9add1cec3e96a2b0fd6315eae5d87 +Subproject commit 281b50b0cc1f80e0fce0395ff7a4d9e0bd73c438 diff --git a/plugins/importexport/native/filter/NativeXmlPreprintGalleyFilter.php b/plugins/importexport/native/filter/NativeXmlPreprintGalleyFilter.php index 9130832cd6..9ce1f33963 100644 --- a/plugins/importexport/native/filter/NativeXmlPreprintGalleyFilter.php +++ b/plugins/importexport/native/filter/NativeXmlPreprintGalleyFilter.php @@ -17,6 +17,7 @@ namespace APP\plugins\importexport\native\filter; use APP\core\Application; +use APP\submission\Submission; use APP\facades\Repo; use DOMElement; use PKP\galley\Galley; @@ -58,7 +59,7 @@ public function handleElement($node) $deployment = $this->getDeployment(); $context = $deployment->getContext(); $submission = $deployment->getSubmission(); - assert(is_a($submission, 'Submission')); + assert(is_a($submission, Submission::class)); $submissionFileRefNodes = $node->getElementsByTagName('submission_file_ref'); assert($submissionFileRefNodes->length <= 1); diff --git a/plugins/importexport/native/filter/filterConfig.xml b/plugins/importexport/native/filter/filterConfig.xml index e9b1cc68a8..66c2c8ed76 100644 --- a/plugins/importexport/native/filter/filterConfig.xml +++ b/plugins/importexport/native/filter/filterConfig.xml @@ -17,7 +17,7 @@ symbolic="preprint=>native-xml" displayName="plugins.importexport.native.displayName" description="plugins.importexport.native.description" - inputType="class::classes.submission.Submission[]" + inputType="class::APP\submission\Submission[]" outputType="xml::schema(plugins/importexport/native/native.xsd)" /> + outputType="class::APP\submission\Submission[]" /> + outputType="class::APP\author\Author[]" /> + outputType="class::PKP\submissionFile\SubmissionFile[]" /> + outputType="class::PKP\galley\Galley[]" /> + outputType="class::APP\publication\Publication[]" /> diff --git a/plugins/metadata/dc11/filter/filterConfig.xml b/plugins/metadata/dc11/filter/filterConfig.xml index 14f50a9488..14919ca130 100644 --- a/plugins/metadata/dc11/filter/filterConfig.xml +++ b/plugins/metadata/dc11/filter/filterConfig.xml @@ -17,7 +17,7 @@ symbolic="preprint=>dc11" displayName="plugins.metadata.dc11.preprintAdapter.displayName" description="plugins.metadata.dc11.preprintAdapter.description" - inputType="class::classes.submission.Submission" + inputType="class::APP\submission\Submission" outputType="metadata::APP\plugins\metadata\dc11\schema\Dc11Schema(PREPRINT)" />