From 289fa0cc32e9127d5f4710c79587153089aaf974 Mon Sep 17 00:00:00 2001 From: Johannes Stark Date: Tue, 16 Aug 2011 15:30:36 +0200 Subject: [PATCH] trailing whitespaces removed ;-) --- lib/Doctrine/ODM/PHPCR/Proxy/Proxy.php | 4 ++-- lib/Doctrine/ODM/PHPCR/Proxy/ProxyException.php | 6 +++--- lib/Doctrine/ODM/PHPCR/Proxy/ReferenceProxyFactory.php | 2 +- lib/Doctrine/ODM/PHPCR/UnitOfWork.php | 6 +++--- tests/Doctrine/Tests/ODM/PHPCR/Functional/ReferenceTest.php | 4 ++-- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/lib/Doctrine/ODM/PHPCR/Proxy/Proxy.php b/lib/Doctrine/ODM/PHPCR/Proxy/Proxy.php index ad42cc0f7..6a9104b0d 100644 --- a/lib/Doctrine/ODM/PHPCR/Proxy/Proxy.php +++ b/lib/Doctrine/ODM/PHPCR/Proxy/Proxy.php @@ -4,5 +4,5 @@ interface Proxy { - -} \ No newline at end of file + +} diff --git a/lib/Doctrine/ODM/PHPCR/Proxy/ProxyException.php b/lib/Doctrine/ODM/PHPCR/Proxy/ProxyException.php index 69de7731e..d16f00935 100644 --- a/lib/Doctrine/ODM/PHPCR/Proxy/ProxyException.php +++ b/lib/Doctrine/ODM/PHPCR/Proxy/ProxyException.php @@ -27,14 +27,14 @@ * @since 1.0 * @author Benjamin Eberlei */ -class ProxyException extends \Doctrine\ODM\PHPCR\PHPCRException +class ProxyException extends \Doctrine\ODM\PHPCR\PHPCRException { - public static function proxyDirectoryRequired() + public static function proxyDirectoryRequired() { return new self("You must configure a proxy directory. See docs for details"); } - public static function proxyNamespaceRequired() + public static function proxyNamespaceRequired() { return new self("You must configure a proxy namespace. See docs for details"); } diff --git a/lib/Doctrine/ODM/PHPCR/Proxy/ReferenceProxyFactory.php b/lib/Doctrine/ODM/PHPCR/Proxy/ReferenceProxyFactory.php index fa7df3fc8..28ba14920 100644 --- a/lib/Doctrine/ODM/PHPCR/Proxy/ReferenceProxyFactory.php +++ b/lib/Doctrine/ODM/PHPCR/Proxy/ReferenceProxyFactory.php @@ -173,7 +173,7 @@ private function getUnsetAttributes(ClassMetadata $class) $attributes .= '$this->'.$field["fieldName"]; $attributes .= ", "; } - + $attributes = substr($attributes, 0, -2); return "unset(".$attributes.");"; diff --git a/lib/Doctrine/ODM/PHPCR/UnitOfWork.php b/lib/Doctrine/ODM/PHPCR/UnitOfWork.php index 04f10d296..7c5febded 100644 --- a/lib/Doctrine/ODM/PHPCR/UnitOfWork.php +++ b/lib/Doctrine/ODM/PHPCR/UnitOfWork.php @@ -254,7 +254,7 @@ public function createDocument($documentName, $node, array &$hints = array()) $referencedNode = $node->getPropertyValue($assocOptions['fieldName']); $referencedId = $referencedNode->getPath(); - // check if referenced document already exists + // check if referenced document already exists if (isset($this->identityMap[$referencedId])) { $documentState[$class->associationsMappings[$assocName]['fieldName']] = $this->identityMap[$referencedId]; } else { @@ -290,7 +290,7 @@ public function createDocument($documentName, $node, array &$hints = array()) foreach ($proxyNodes as $referencedNode) { $referencedId = $referencedNode->getPath(); - // check if referenced document already exists + // check if referenced document already exists if (isset($this->identityMap[$referencedId])) { $documentState[$class->associationsMappings[$assocName]['fieldName']][] = $this->identityMap[$referencedId]; } else { @@ -575,7 +575,7 @@ public function computeChangeSet(ClassMetadata $class, $document) $changed = false; foreach ($actualData as $fieldName => $fieldValue) { - if (!isset($class->fieldMappings[$fieldName]) + if (!isset($class->fieldMappings[$fieldName]) && !isset($class->childMappings[$fieldName]) && !isset($class->associationsMappings[$fieldName]) ) { diff --git a/tests/Doctrine/Tests/ODM/PHPCR/Functional/ReferenceTest.php b/tests/Doctrine/Tests/ODM/PHPCR/Functional/ReferenceTest.php index e36f76228..1da7ace8c 100644 --- a/tests/Doctrine/Tests/ODM/PHPCR/Functional/ReferenceTest.php +++ b/tests/Doctrine/Tests/ODM/PHPCR/Functional/ReferenceTest.php @@ -741,7 +741,7 @@ public function testManyCascadeChangeOne() $this->dm->persist($refManyTestObjForCascade); $this->dm->flush(); $this->dm->clear(); - + $referrer = $this->dm->find($this->referrerManyForCascadeType, '/functional/refManyTestObjForCascade'); $pos1 = 1; @@ -781,7 +781,7 @@ public function testManyCascadeDeleteOne() $this->dm->persist($refManyTestObjForCascade); $this->dm->flush(); $this->dm->clear(); - + $referrer = $this->dm->find($this->referrerManyForCascadeType, '/functional/refManyTestObjForCascade'); $pos1 = 1;