RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-01-10 11:07:10 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1121 from deeky666/DDC-3274

Browse Source 
[DDC-3274] Improve schema validator error message for invalid bi-directional relations
This commit is contained in:
Marco Pivetta 2014-08-26 23:27:23 +02:00
commit 91fa4c9be3
2 changed files with 46 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/Doctrine/ORM/Tools/SchemaValidator.php
View File

@ -124,7 +124,7 @@ class SchemaValidator
$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['targetEntity'] . "#" . $assoc['mappedBy'] . " does not contain the required ". $assoc['targetEntity'] . "#" . $assoc['mappedBy'] . " does not contain the required ".
"'inversedBy=".$fieldName."' attribute."; "'inversedBy=\"" . $fieldName . "\"' attribute.";
} elseif ($targetMetadata->associationMappings[$assoc['mappedBy']]['inversedBy'] != $fieldName) { } elseif ($targetMetadata->associationMappings[$assoc['mappedBy']]['inversedBy'] != $fieldName) {
$ce[] = "The mappings " . $class->name . "#" . $fieldName . " and " . $ce[] = "The mappings " . $class->name . "#" . $fieldName . " and " .
$assoc['targetEntity'] . "#" . $assoc['mappedBy'] . " are ". $assoc['targetEntity'] . "#" . $assoc['mappedBy'] . " are ".

45
tests/Doctrine/Tests/ORM/Tools/SchemaValidatorTest.php
View File

@ -134,6 +134,24 @@ class SchemaValidatorTest extends \Doctrine\Tests\OrmTestCase
"The referenced column name 'id' has to be a primary key column on the target entity class 'Doctrine\Tests\ORM\Tools\DDC1649Two'." "The referenced column name 'id' has to be a primary key column on the target entity class 'Doctrine\Tests\ORM\Tools\DDC1649Two'."
), $ce); ), $ce);
} }
/**
* @group DDC-3274
*/
public function testInvalidBiDirectionalRelationMappingMissingInversedByAttribute()
{
$class = $this->em->getClassMetadata(__NAMESPACE__ . '\DDC3274One');
$ce = $this->validator->validateClass($class);
$this->assertEquals(
array(
"The field Doctrine\Tests\ORM\Tools\DDC3274One#two is on the inverse side of a bi-directional " .
"relationship, but the specified mappedBy association on the target-entity " .
"Doctrine\Tests\ORM\Tools\DDC3274Two#one does not contain the required 'inversedBy=\"two\"' attribute."
),
$ce
);
}
} }
/** /**
@ -263,3 +281,30 @@ class DDC1649Three
private $two; private $two;
} }
/**
* @Entity
*/
class DDC3274One
{
/**
* @Id @Column @GeneratedValue
*/
private $id;
/**
* @OneToMany(targetEntity="DDC3274Two", mappedBy="one")
*/
private $two;
}
/**
* @Entity
*/
class DDC3274Two
{
/**
* @Id
* @ManyToOne(targetEntity="DDC3274One")
*/
private $one;
}