diff --git a/classes/author/Author.php b/classes/author/Author.php index ea6ab976e9b..e259f1a500a 100644 --- a/classes/author/Author.php +++ b/classes/author/Author.php @@ -36,8 +36,3 @@ public function getIsEditor(): bool ); } } - -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 8e38280ce4e..3c02c5ea890 100644 --- a/classes/core/Application.php +++ b/classes/core/Application.php @@ -43,21 +43,15 @@ class Application extends PKPApplication public function __construct() { parent::__construct(); - if (!PKP_STRICT_MODE) { - foreach ([ + + if (!app()->getApplicationStrictModeStatus()) { + app()->registerGlobalConstants(static::class, [ 'ASSOC_TYPE_MONOGRAPH', 'ASSOC_TYPE_PUBLICATION_FORMAT', 'ASSOC_TYPE_PRESS', 'ASSOC_TYPE_SERIES', 'ASSOC_TYPE_CHAPTER', - ] as $constantName) { - if (!defined($constantName)) { - define($constantName, constant('self::' . $constantName)); - } - } - if (!class_exists('\Application')) { - class_alias('\APP\core\Application', '\Application'); - } + ]); } // Add application locales diff --git a/classes/publication/Publication.php b/classes/publication/Publication.php index 3bed57652a5..00f503d040e 100644 --- a/classes/publication/Publication.php +++ b/classes/publication/Publication.php @@ -112,7 +112,3 @@ public function getLocalizedCoverImageThumbnailUrl(int $contextId) ]); } } - -if (!PKP_STRICT_MODE) { - class_alias('\APP\publication\Publication', '\Publication'); -} diff --git a/classes/publicationFormat/PublicationFormat.php b/classes/publicationFormat/PublicationFormat.php index e99d4976183..1ac4c409190 100644 --- a/classes/publicationFormat/PublicationFormat.php +++ b/classes/publicationFormat/PublicationFormat.php @@ -664,7 +664,3 @@ public function setStoredPubId($pubIdType, $pubId) } } } - -if (!PKP_STRICT_MODE) { - class_alias('\APP\publicationFormat\PublicationFormat', '\PublicationFormat'); -} diff --git a/classes/submission/Submission.php b/classes/submission/Submission.php index 7f1b15c210c..d4d5440c046 100644 --- a/classes/submission/Submission.php +++ b/classes/submission/Submission.php @@ -120,7 +120,3 @@ public function setEnableChapterPublicationDates($enableChapterPublicationDates) $this->setData('enableChapterPublicationDates', $enableChapterPublicationDates); } } - -if (!PKP_STRICT_MODE) { - class_alias('\APP\submission\Submission', '\Submission'); -} diff --git a/dbscripts/xml/upgrade.xml b/dbscripts/xml/upgrade.xml index dceb916e9c0..8f519d3659b 100644 --- a/dbscripts/xml/upgrade.xml +++ b/dbscripts/xml/upgrade.xml @@ -200,6 +200,7 @@ + diff --git a/lib/pkp b/lib/pkp index 638f0ad3b89..1eeca31429b 160000 --- a/lib/pkp +++ b/lib/pkp @@ -1 +1 @@ -Subproject commit 638f0ad3b89be36bd5e8d698f58f58b873dec9ff +Subproject commit 1eeca31429b1adc1936a54cf987c4bcca3908516 diff --git a/plugins/generic/customBlockManager b/plugins/generic/customBlockManager index 5eaa2d97207..4d2688db24e 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 4939f4ff41a..24aa15891bd 160000 --- a/plugins/generic/googleAnalytics +++ b/plugins/generic/googleAnalytics @@ -1 +1 @@ -Subproject commit 4939f4ff41a49ef29ce90c1f17d415f59b142574 +Subproject commit 24aa15891bd42dd646ffd6028ced3c76d169ef2f diff --git a/plugins/generic/staticPages b/plugins/generic/staticPages index d07ea7afdff..b17f96439f1 160000 --- a/plugins/generic/staticPages +++ b/plugins/generic/staticPages @@ -1 +1 @@ -Subproject commit d07ea7afdffe01cc45c07be0024ee8e908e25476 +Subproject commit b17f96439f1da4fa970bb8fd713b789d97e3b92e diff --git a/plugins/generic/tinymce b/plugins/generic/tinymce index eaae7b11810..8474574ecbc 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 593a49e58ec..281b50b0cc1 160000 --- a/plugins/generic/webFeed +++ b/plugins/generic/webFeed @@ -1 +1 @@ -Subproject commit 593a49e58ec9add1cec3e96a2b0fd6315eae5d87 +Subproject commit 281b50b0cc1f80e0fce0395ff7a4d9e0bd73c438 diff --git a/plugins/importexport/native/filter/filterConfig.xml b/plugins/importexport/native/filter/filterConfig.xml index 78e93e11038..c74887fd213 100644 --- a/plugins/importexport/native/filter/filterConfig.xml +++ b/plugins/importexport/native/filter/filterConfig.xml @@ -17,7 +17,7 @@ symbolic="monograph=>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::APP\publicationFormat\PublicationFormat[]" /> + outputType="class::PKP\submissionFile\SubmissionFile[]" /> + outputType="class::APP\publication\Publication[]" /> + outputType="class::APP\monograph\Chapter[]" /> diff --git a/plugins/metadata/dc11/filter/filterConfig.xml b/plugins/metadata/dc11/filter/filterConfig.xml index 5a1765d757e..62379e823ee 100755 --- a/plugins/metadata/dc11/filter/filterConfig.xml +++ b/plugins/metadata/dc11/filter/filterConfig.xml @@ -17,7 +17,7 @@ symbolic="publicationFormat=>dc11" displayName="plugins.metadata.dc11.publicationFormatAdapter.displayName" description="plugins.metadata.dc11.publicationFormatAdapter.description" - inputType="class::classes.publicationFormat.PublicationFormat" + inputType="class::APP\publicationFormat\PublicationFormat" outputType="metadata::APP\plugins\metadata\dc11\schema\Dc11Schema(PUBLICATION_FORMAT)" /> diff --git a/plugins/metadata/dc11/schema/Dc11Schema.php b/plugins/metadata/dc11/schema/Dc11Schema.php index cd153da2796..fd8d1f57cf3 100755 --- a/plugins/metadata/dc11/schema/Dc11Schema.php +++ b/plugins/metadata/dc11/schema/Dc11Schema.php @@ -30,7 +30,3 @@ public function __construct() parent::__construct(Application::ASSOC_TYPE_PUBLICATION_FORMAT); } } - -if (!PKP_STRICT_MODE) { - class_alias('\APP\plugins\metadata\dc11\schema\Dc11Schema', '\Dc11Schema'); -}