Skip to content

D
doctrine-dbal
Commit 74df4c39 authored by Benjamin Eberlei's avatar Benjamin Eberlei
Browse files
Options

DDC-592 - Fix Validator notices when mappedBy or inversedBy properties dont exist

parent 46684ea5
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 10 deletions
lib/Doctrine/ORM/Tools/SchemaValidator.php
View file @ 74df4c39
...@@ -93,9 +93,7 @@ class SchemaValidator ...@@ -93,9 +93,7 @@ class SchemaValidator
if (!$targetMetadata->hasAssociation($assoc->mappedBy)) { if (!$targetMetadata->hasAssociation($assoc->mappedBy)) {
$ce[] = "The association " . $class->name . "#" . $fieldName . " refers to the owning side ". $ce[] = "The association " . $class->name . "#" . $fieldName . " refers to the owning side ".
"field " . $assoc->targetEntityName . "#" . $assoc->mappedBy . " which does not exist."; "field " . $assoc->targetEntityName . "#" . $assoc->mappedBy . " which does not exist.";
} } else if ($targetMetadata->associationMappings[$assoc->mappedBy]->inversedBy == null) {
if ($targetMetadata->associationMappings[$assoc->mappedBy]->inversedBy == null) {
$ce[] = "The field " . $class->name . "#" . $fieldName . " is on the inverse side of a ". $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 ". "bi-directional relationship, but the specified mappedBy association on the target-entity ".
$assoc->targetEntityName . "#" . $assoc->mappedBy . " does not contain the required ". $assoc->targetEntityName . "#" . $assoc->mappedBy . " does not contain the required ".
...@@ -115,11 +113,8 @@ class SchemaValidator ...@@ -115,11 +113,8 @@ class SchemaValidator
if (!$targetMetadata->hasAssociation($assoc->inversedBy)) { if (!$targetMetadata->hasAssociation($assoc->inversedBy)) {
$ce[] = "The association " . $class->name . "#" . $fieldName . " refers to the inverse side ". $ce[] = "The association " . $class->name . "#" . $fieldName . " refers to the inverse side ".
"field " . $assoc->targetEntityName . "#" . $assoc->inversedBy . " which does not exist."; "field " . $assoc->targetEntityName . "#" . $assoc->inversedBy . " which does not exist.";
} } else if ($targetMetadata->associationMappings[$assoc->inversedBy]->mappedBy == null) {
$ce[] = "The field " . $class->name . "#" . $fieldName . " is on the owning side of a ".
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 ".
"bi-directional relationship, but the specified mappedBy association on the target-entity ". "bi-directional relationship, but the specified mappedBy association on the target-entity ".
$assoc->targetEntityName . "#" . $assoc->mappedBy . " does not contain the required ". $assoc->targetEntityName . "#" . $assoc->mappedBy . " does not contain the required ".
"'inversedBy' attribute."; "'inversedBy' attribute.";
...@@ -175,8 +170,6 @@ class SchemaValidator ...@@ -175,8 +170,6 @@ class SchemaValidator
} }
} }
} }
} else {
} }
if ($ce) { if ($ce) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment