From 74df4c39dca87031b6e8505ba670ceabe8ae2ea5 Mon Sep 17 00:00:00 2001 From: Benjamin Eberlei Date: Sat, 15 May 2010 20:54:22 +0200 Subject: [PATCH] DDC-592 - Fix Validator notices when mappedBy or inversedBy properties dont exist --- lib/Doctrine/ORM/Tools/SchemaValidator.php | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/lib/Doctrine/ORM/Tools/SchemaValidator.php b/lib/Doctrine/ORM/Tools/SchemaValidator.php index 0a13aa898..3df2e3497 100644 --- a/lib/Doctrine/ORM/Tools/SchemaValidator.php +++ b/lib/Doctrine/ORM/Tools/SchemaValidator.php @@ -93,9 +93,7 @@ class SchemaValidator if (!$targetMetadata->hasAssociation($assoc->mappedBy)) { $ce[] = "The association " . $class->name . "#" . $fieldName . " refers to the owning side ". "field " . $assoc->targetEntityName . "#" . $assoc->mappedBy . " which does not exist."; - } - - if ($targetMetadata->associationMappings[$assoc->mappedBy]->inversedBy == null) { + } else if ($targetMetadata->associationMappings[$assoc->mappedBy]->inversedBy == null) { $ce[] = "The field " . $class->name . "#" . $fieldName . " is on the inverse side of a ". "bi-directional relationship, but the specified mappedBy association on the target-entity ". $assoc->targetEntityName . "#" . $assoc->mappedBy . " does not contain the required ". @@ -115,11 +113,8 @@ class SchemaValidator if (!$targetMetadata->hasAssociation($assoc->inversedBy)) { $ce[] = "The association " . $class->name . "#" . $fieldName . " refers to the inverse side ". "field " . $assoc->targetEntityName . "#" . $assoc->inversedBy . " which does not exist."; - } - - if (isset($targetMetadata->associationMappings[$assoc->mappedBy]) && - $targetMetadata->associationMappings[$assoc->mappedBy]->mappedBy == null) { - $ce[] = "The field " . $class->name . "#" . $fieldName . " is on the inverse side of a ". + } else if ($targetMetadata->associationMappings[$assoc->inversedBy]->mappedBy == null) { + $ce[] = "The field " . $class->name . "#" . $fieldName . " is on the owning side of a ". "bi-directional relationship, but the specified mappedBy association on the target-entity ". $assoc->targetEntityName . "#" . $assoc->mappedBy . " does not contain the required ". "'inversedBy' attribute."; @@ -175,8 +170,6 @@ class SchemaValidator } } } - } else { - } if ($ce) {