RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-03-20 06:53:55 +03:00
Code Issues Projects Releases Wiki Activity

Revert "only use already existing reflections"

Browse Source 
This reverts commit bb5bdcf0f4ccd6fc83692490ec70a697c90573fb.
This commit is contained in:
Adam Prager 2013-03-26 21:17:59 +01:00
parent bb5bdcf0f4
commit 8e3e2e770a
1 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
lib/Doctrine/ORM/Tools/EntityGenerator.php
View File

@ -710,13 +710,11 @@ public function __construct()
}
// check traits for existing property
if (isset($this->staticReflection[$metadata->name])) {
$reflClass = $this->staticReflection[$metadata->name];
$reflClass = new \ReflectionClass($metadata->name);
foreach ($reflClass->getTraits() as $trait) {
if ($trait->hasProperty($property)) {
return true;
}
foreach ($reflClass->getTraits() as $trait) {
if ($trait->hasProperty($property)) {
return true;
}
}
@ -744,13 +742,11 @@ public function __construct()
}
// check traits for existing method
if (isset($this->staticReflection[$metadata->name])) {
$reflClass = $this->staticReflection[$metadata->name];
$reflClass = new \ReflectionClass($metadata->name);
foreach ($reflClass->getTraits() as $trait) {
if ($trait->hasMethod($method)) {
return true;
}
foreach ($reflClass->getTraits() as $trait) {
if ($trait->hasMethod($method)) {
return true;
}
}