Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions classes/author/Author.php
Original file line number Diff line number Diff line change
Expand Up @@ -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');
}
11 changes: 4 additions & 7 deletions classes/core/Application.php
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 0 additions & 4 deletions classes/publication/Publication.php
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,3 @@ public function getLocalizedCoverImageUrl(int $contextId)
]);
}
}

if (!PKP_STRICT_MODE) {
class_alias('\APP\publication\Publication', '\Publication');
}
4 changes: 0 additions & 4 deletions classes/submission/Submission.php
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,3 @@ public function getTotalGalleyViews(): int
->value('metric');
}
}

if (!PKP_STRICT_MODE) {
class_alias('\APP\submission\Submission', '\Submission');
}
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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'));
Expand Down Expand Up @@ -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':
Expand Down
1 change: 1 addition & 0 deletions dbscripts/xml/upgrade.xml
Original file line number Diff line number Diff line change
Expand Up @@ -183,6 +183,7 @@
<migration class="PKP\migration\upgrade\v3_6_0\I11913_AssociatePublicationsWithReviewRounds"/>
<migration class="PKP\migration\upgrade\v3_6_0\I857_ContributorRolesTypes"/>
<migration class="PKP\migration\upgrade\v3_6_0\I12046_AssignMachineReadableRecommendationType"/>
<migration class="PKP\migration\upgrade\v3_6_0\I11583_ClassNamespaceFromDotNotationClassPath"/>
<code function="rebuildSearchIndex" />
<note file="docs/release-notes/README-3.6.0" />
</upgrade>
Expand Down
2 changes: 1 addition & 1 deletion lib/pkp
Submodule pkp updated 41 files
+0 −4 classes/citation/Citation.php
+0 −4 classes/citation/filter/CitationListTokenizerFilter.php
+0 −1 classes/core/DataObject.php
+21 −26 classes/core/PKPApplication.php
+0 −3 classes/core/PKPComponentRouter.php
+53 −0 classes/core/PKPContainer.php
+11 −0 classes/core/ValidationServiceProvider.php
+1 −5 classes/filter/ClassTypeDescription.php
+2 −1 classes/filter/CompositeFilter.php
+4 −3 classes/filter/Filter.php
+4 −9 classes/filter/FilterDAO.php
+0 −4 classes/filter/FilterGroup.php
+0 −4 classes/filter/PrimitiveTypeDescription.php
+0 −4 classes/filter/TypeDescription.php
+11 −13 classes/filter/TypeDescriptionFactory.php
+0 −4 classes/galley/Galley.php
+11 −5 classes/i18n/Locale.php
+3 −12 classes/install/Installer.php
+1 −1 classes/install/PKPInstall.php
+6 −6 classes/metadata/MetadataDataObjectAdapter.php
+3 −8 classes/metadata/MetadataDescription.php
+6 −5 classes/metadata/MetadataTypeDescription.php
+104 −0 classes/migration/upgrade/v3_6_0/I11583_ClassNamespaceFromDotNotationClassPath.php
+20 −27 classes/plugins/PluginRegistry.php
+2 −2 classes/submission/maps/Schema.php
+0 −4 classes/submissionFile/SubmissionFile.php
+0 −4 classes/validation/ValidatorTypeDescription.php
+0 −4 classes/xslt/XMLTypeDescription.php
+1 −1 controllers/grid/queries/form/QueryForm.php
+0 −120 includes/functions.php
+99 −0 tests/classes/core/StrictModeTest.php
+2 −1 tests/classes/filter/ClassTypeDescriptionTest.php
+2 −1 tests/classes/filter/FilterDAOTest.php
+9 −6 tests/classes/filter/FilterTest.php
+8 −5 tests/classes/filter/PersistableFilterTest.php
+0 −4 tests/classes/filter/TestClass1.php
+0 −4 tests/classes/filter/TestClass2.php
+7 −3 tests/classes/filter/TypeDescriptionFactoryTest.php
+2 −1 tests/classes/metadata/MetadataDescriptionTest.php
+1 −5 tests/classes/metadata/TestSchema.php
+4 −0 tests/phpunit-bootstrap.php
2 changes: 1 addition & 1 deletion plugins/blocks/browse
Submodule browse updated 1 files
+2 −5 BrowseBlockPlugin.php
2 changes: 1 addition & 1 deletion plugins/generic/crossref
2 changes: 1 addition & 1 deletion plugins/generic/googleScholar
2 changes: 1 addition & 1 deletion plugins/generic/tinymce
Submodule tinymce updated 1 files
+0 −4 TinyMCEPlugin.php
2 changes: 1 addition & 1 deletion plugins/generic/webFeed
Submodule webFeed updated 1 files
+0 −4 WebFeedPlugin.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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);
Expand Down
20 changes: 10 additions & 10 deletions plugins/importexport/native/filter/filterConfig.xml
Original file line number Diff line number Diff line change
Expand Up @@ -17,71 +17,71 @@
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)" />
<!-- Native XML preprint input -->
<filterGroup
symbolic="native-xml=>preprint"
displayName="plugins.importexport.native.displayName"
description="plugins.importexport.native.description"
inputType="xml::schema(plugins/importexport/native/native.xsd)"
outputType="class::classes.submission.Submission[]" />
outputType="class::APP\submission\Submission[]" />
<!-- Native XML author output -->
<filterGroup
symbolic="author=>native-xml"
displayName="plugins.importexport.native.displayName"
description="plugins.importexport.native.description"
inputType="class::classes.author.Author[]"
inputType="class::APP\author\Author[]"
outputType="xml::schema(plugins/importexport/native/native.xsd)" />
<!-- Native XML author input -->
<filterGroup
symbolic="native-xml=>author"
displayName="plugins.importexport.native.displayName"
description="plugins.importexport.native.description"
inputType="xml::schema(plugins/importexport/native/native.xsd)"
outputType="class::classes.author.Author[]" />
outputType="class::APP\author\Author[]" />
<!-- preprint file native XML output -->
<filterGroup
symbolic="SubmissionFile=>native-xml"
displayName="plugins.importexport.native.displayName"
description="plugins.importexport.native.description"
inputType="class::lib.pkp.classes.submissionFile.SubmissionFile"
inputType="class::PKP\submissionFile\SubmissionFile"
outputType="xml::schema(plugins/importexport/native/native.xsd)" />
<!-- preprint file native XML input -->
<filterGroup
symbolic="native-xml=>SubmissionFile"
displayName="plugins.importexport.native.displayName"
description="plugins.importexport.native.description"
inputType="xml::schema(plugins/importexport/native/native.xsd)"
outputType="class::lib.pkp.classes.submissionFile.SubmissionFile[]" />
outputType="class::PKP\submissionFile\SubmissionFile[]" />
<!-- preprint Galley native XML output -->
<filterGroup
symbolic="preprint-galley=>native-xml"
displayName="plugins.importexport.native.displayName"
description="plugins.importexport.native.description"
inputType="class::lib.pkp.classes.galley.Galley"
inputType="class::PKP\galley\Galley"
outputType="xml::schema(plugins/importexport/native/native.xsd)" />
<!-- preprint Galley native XML input -->
<filterGroup
symbolic="native-xml=>PreprintGalley"
displayName="plugins.importexport.native.displayName"
description="plugins.importexport.native.description"
inputType="xml::schema(plugins/importexport/native/native.xsd)"
outputType="class::lib.pkp.classes.galley.Galley[]" />
outputType="class::PKP\galley\Galley[]" />
<!-- Publication native XML input -->
<filterGroup
symbolic="publication=>native-xml"
displayName="plugins.importexport.native.displayName"
description="plugins.importexport.native.description"
inputType="class::classes.publication.Publication"
inputType="class::APP\publication\Publication"
outputType="xml::schema(plugins/importexport/native/native.xsd)" />
<!-- Publication native XML input -->
<filterGroup
symbolic="native-xml=>Publication"
displayName="plugins.importexport.native.displayName"
description="plugins.importexport.native.description"
inputType="xml::schema(plugins/importexport/native/native.xsd)"
outputType="class::classes.publication.Publication[]" />
outputType="class::APP\publication\Publication[]" />
</filterGroups>
<filters>
<!-- Native XML preprint output -->
Expand Down
2 changes: 1 addition & 1 deletion plugins/metadata/dc11/filter/filterConfig.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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)" />
</filterGroups>
<filters>
Expand Down