Skip to content
Merged
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
10 changes: 4 additions & 6 deletions classes/publication/Repository.php
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
use Illuminate\Support\Facades\App;
use PKP\context\Context;
use PKP\core\Core;
use PKP\core\PKPString;
use PKP\doi\exceptions\DoiException;
use PKP\plugins\Hook;
use PKP\publication\Collector;
Expand Down Expand Up @@ -117,9 +116,9 @@ public function validate($publication, array $props, Submission $submission, Con
}

/** @copydoc \PKP\publication\Repository::version() */
public function version(Publication $publication, ?VersionStage $versionStage = null, bool $isMinorVersion = true): int
public function version(Publication $publication, ?VersionStage $versionStage = null, bool $isMinorVersion = true, ?int $submissionStatus = null): int
{
$newId = parent::version($publication, $versionStage, $isMinorVersion);
$newId = parent::version($publication, $versionStage, $isMinorVersion, $submissionStatus);

$context = Application::get()->getRequest()->getContext();

Expand Down Expand Up @@ -169,7 +168,7 @@ protected function setStatusOnPublish(Publication $publication)
}

/** @copydoc \PKP\publication\Repository::delete() */
public function delete(Publication $publication)
public function delete(Publication $publication, false|int|null $submissionStatus = null): null
{
$galleys = Repo::galley()->getCollector()
->filterByPublicationIds([$publication->getId()])
Expand All @@ -179,8 +178,7 @@ public function delete(Publication $publication)
Repo::galley()->delete($galley);
}


parent::delete($publication);
parent::delete($publication, $submissionStatus);
}

/**
Expand Down
3 changes: 1 addition & 2 deletions classes/submission/Repository.php
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
use APP\server\ServerDAO;
use Illuminate\Support\Collection;
use PKP\context\Context;
use PKP\core\PKPString;
use PKP\db\DAORegistry;
use PKP\doi\exceptions\DoiException;
use PKP\submission\DashboardView;
Expand Down Expand Up @@ -79,7 +78,7 @@ public function validateSubmit(Submission $submission, Context $context): array
}

/** @copydoc \PKP\submission\Repo::updateStatus() */
public function updateStatus(Submission $submission, ?int $newStatus = null, ?Section $section = null)
public function updateStatus(Submission $submission, ?int $newStatus = null, ?Section $section = null): void
{
$oldStatus = $submission->getData('status');
parent::updateStatus($submission, $newStatus);
Expand Down
2 changes: 1 addition & 1 deletion plugins/generic/webFeed
Loading