Skip to content

Fix validating pages at paths #66

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
mlocati wants to merge 1 commit into from
Closed

Fix validating pages at paths #66

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 8 additions & 3 deletions src/PortlandLabs/Concrete5/MigrationTool/Batch/Validator/Page/Content/PageItemValidator.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@ public function itemExists(ItemInterface $item, Batch $batch)
if (is_object($item->getContentObject())) {
return true;
}

$itemPath = $this->normalizePath($item->getReference());
foreach ($batch->getPages() as $page) {
if ($page->getBatchPath() == $item->getReference()) {
if ($this->normalizePath($page->getBatchPath()) === $itemPath) {
return true;
}
if ($page->getOriginalPath() == $item->getReference()) {
if ($this->normalizePath($page->getOriginalPath()) === $itemPath) {
return true;
}
}
Expand All @@ -32,4 +32,9 @@ public function addMissingItemMessage(ItemInterface $item, MessageCollection $me
new Message(t('Referenced page at path %s cannot be found in the site or in the current content batch.', $item->getReference()), Message::E_WARNING)
);
}

private function normalizePath(?string $path): string
{
return '/' . ltrim($path ?? '', '/');
}
}