Skip to content

references by uuid #734

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

Open
wants to merge 5 commits into
base: 2.0.x
Choose a base branch
from
Open

references by uuid #734

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
256f9af
use uuid build reference and register document by uuid
ElectricMaxxx Jan 17, 2017
b6853e7
try to introduce uuid -> path mapping with documents managed by uuid
ElectricMaxxx Jan 17, 2017
4b612d6
change method name
ElectricMaxxx Jan 17, 2017
461fee3
fix test driven node existence
ElectricMaxxx Jan 18, 2017
ea7923c
add one test to the crud tests
ElectricMaxxx Jan 19, 2017
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
47 changes: 22 additions & 25 deletions lib/Doctrine/ODM/PHPCR/DocumentManager.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -280,30 +280,29 @@ public function getClassMetadata($className)
*/
public function find($className, $id)
{
try {
if (UUIDHelper::isUUID($id)) {
try {
$id = $this->session->getNodeByIdentifier($id)->getPath();
} catch (ItemNotFoundException $e) {
return null;
}
} elseif (strpos($id, '/') !== 0) {
$id = '/'.$id;
}
if (!UUIDHelper::isUUID($id) && strpos($id, '/') !== 0) {
$id = '/'.$id;
}

$document = $this->unitOfWork->getDocumentById($id);
if ($document) {
try {
$this->unitOfWork->validateClassName($document, $className);
// try to get a manage document
$document = $this->unitOfWork->getDocumentByPathOrUuid($id);
if ($document) {
try {
$this->unitOfWork->validateClassName($document, $className);

return $document;
} catch (ClassMismatchException $e) {
return null;
}
return $document;
} catch (ClassMismatchException $e) {
return null;
}
$node = $this->session->getNode($id);
}

// get the node
try {
$node = $this->unitOfWork->getNodeByPathOrUuid($id);
} catch (PathNotFoundException $e) {
return null;
} catch (ItemNotFoundException $e) {
return null;
}

$hints = array('fallback' => true);
Expand Down Expand Up @@ -368,7 +367,7 @@ public function findTranslation($className, $id, $locale, $fallback = true)
$id = '/'.$id;
}

$document = $this->unitOfWork->getDocumentById($id);
$document = $this->unitOfWork->getDocumentByPathOrUuid($id);

if ($document) {
$this->unitOfWork->validateClassName($document, $className);
Expand Down Expand Up @@ -917,13 +916,11 @@ public function initializeObject($document)
*/
public function getNodeForDocument($document)
{
if (!is_object($document)) {
throw new InvalidArgumentException('Parameter $document needs to be an object, '.gettype($document).' given');
if (null === $identifier = $this->unitOfWork->getDocumentId($document)) {
throw new InvalidArgumentException('This document is not managed by this manager.');
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why do we remove this validation?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

sprintf('Document of class "%s" is not managed', get_class($document))

}

$path = $this->unitOfWork->getDocumentId($document);

return $this->session->getNode($path);
return $this->unitOfWork->getNodeByPathOrUuid($identifier);
}

/**
Expand Down
Loading