RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-04-03 13:23:37 +03:00
Code Issues Projects Releases Wiki Activity

[DDC-1215] Fix EntityGenerator inheritance regenerating properties and methods

Browse source
This commit is contained in:
Benjamin Eberlei 2011-07-26 22:59:55 +02:00
parent 2e3d2398d9
commit 598ab36968
1 changed files with 16 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
lib/Doctrine/ORM/Tools/EntityGenerator.php
View file

@ -462,6 +462,14 @@ public function <methodName>()
private function _hasProperty($property, ClassMetadataInfo $metadata) private function _hasProperty($property, ClassMetadataInfo $metadata)
{ {
if ($this->_extendsClass()) {
// don't generate property if its already on the base class.
$reflClass = new \ReflectionClass($this->_getClassToExtend());
if ($reflClass->hasProperty($property)) {
return true;
}
}
return ( return (
isset($this->_staticReflection[$metadata->name]) && isset($this->_staticReflection[$metadata->name]) &&
in_array($property, $this->_staticReflection[$metadata->name]['properties']) in_array($property, $this->_staticReflection[$metadata->name]['properties'])
@ -470,6 +478,14 @@ public function <methodName>()
private function _hasMethod($method, ClassMetadataInfo $metadata) private function _hasMethod($method, ClassMetadataInfo $metadata)
{ {
if ($this->_extendsClass()) {
// don't generate method if its already on the base class.
$reflClass = new \ReflectionClass($this->_getClassToExtend());
if ($reflClass->hasMethod($method)) {
return true;
}
}
return ( return (
isset($this->_staticReflection[$metadata->name]) && isset($this->_staticReflection[$metadata->name]) &&
in_array($method, $this->_staticReflection[$metadata->name]['methods']) in_array($method, $this->_staticReflection[$metadata->name]['methods'])