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

minor fixes

Browse source
This commit is contained in:
Adam Prager 2013-04-04 20:07:21 +02:00
parent b3414e3c1a
commit 3b7b457d35
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -759,12 +759,12 @@ public function __construct()
*/ */
protected function getTraits(ClassMetadataInfo $metadata) protected function getTraits(ClassMetadataInfo $metadata)
{ {
if ($metadata->reflClass != null || class_exists($metadata->name)) { if ($metadata->reflClass !== null || class_exists($metadata->name)) {
$reflClass = $metadata->reflClass == null $reflClass = $metadata->reflClass === null
? new \ReflectionClass($metadata->name) ? new \ReflectionClass($metadata->name)
: $metadata->reflClass; : $metadata->reflClass;
if (method_exists($reflClass, 'getTraits')) { if (PHP_VERSION_ID >= 50400) {
return $reflClass->getTraits(); return $reflClass->getTraits();
} }
} }

2
tests/Doctrine/Tests/ORM/Tools/EntityGeneratorTest.php
View file

@ -458,7 +458,7 @@ class EntityGeneratorTest extends \Doctrine\Tests\OrmTestCase
*/ */
public function testTraitPropertiesAndMethodsAreNotDuplicated() public function testTraitPropertiesAndMethodsAreNotDuplicated()
{ {
if (function_exists('trait_exists')) { if (PHP_VERSION_ID >= 50400) {
$cmf = new ClassMetadataFactory(); $cmf = new ClassMetadataFactory();
$em = $this->_getTestEntityManager(); $em = $this->_getTestEntityManager();
$cmf->setEntityManager($em); $cmf->setEntityManager($em);