RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2024-12-13 14:56:01 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #506 from FabioBatSilva/DDC-2121

Browse Source 
Fix DDC-2121
This commit is contained in:
Guilherme Blanco 2012-11-05 16:27:34 -08:00
commit 262c3eea6b
2 changed files with 26 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -915,9 +915,14 @@ public function __construct()
$var = sprintf('%sMethodTemplate', $type); $var = sprintf('%sMethodTemplate', $type);
$template = self::$$var; $template = self::$$var;
$methodTypeHint = null;
$types = Type::getTypesMap(); $types = Type::getTypesMap();
$variableType = $typeHint ? $this->getType($typeHint) . ' ' : null; $variableType = $typeHint ? $this->getType($typeHint) . ' ' : null;
$methodTypeHint = $typeHint && ! isset($types[$typeHint]) ? '\\' . $typeHint . ' ' : null;
if ($typeHint && ! isset($types[$typeHint])) {
$variableType = '\\' . ltrim($variableType, '\\');
$methodTypeHint = '\\' . $typeHint . ' ';
}
$replacements = array( $replacements = array(
'<description>' => ucfirst($type) . ' ' . $fieldName, '<description>' => ucfirst($type) . ' ' . $fieldName,
@ -997,9 +1002,9 @@ public function __construct()
$lines[] = $this->spaces . '/**'; $lines[] = $this->spaces . '/**';
if ($associationMapping['type'] & ClassMetadataInfo::TO_MANY) { if ($associationMapping['type'] & ClassMetadataInfo::TO_MANY) {
$lines[] = $this->spaces . ' * @var \Doctrine\Common\Collections\ArrayCollection'; $lines[] = $this->spaces . ' * @var \Doctrine\Common\Collections\Collection';
} else { } else {
$lines[] = $this->spaces . ' * @var ' . $associationMapping['targetEntity']; $lines[] = $this->spaces . ' * @var \\' . ltrim($associationMapping['targetEntity'], '\\');
} }
if ($this->generateAnnotations) { if ($this->generateAnnotations) {

18
tests/Doctrine/Tests/ORM/Tools/EntityGeneratorTest.php
View File

@ -167,6 +167,24 @@ class EntityGeneratorTest extends \Doctrine\Tests\OrmTestCase
$this->assertTrue($reflClass->getMethod('getTest')->isPublic(), "Check for public visibility of method 'getTest' failed."); $this->assertTrue($reflClass->getMethod('getTest')->isPublic(), "Check for public visibility of method 'getTest' failed.");
} }
/**
* @group DDC-2121
*/
public function testMethodDocBlockShouldStartWithBackSlash()
{
$metadata = $this->generateBookEntityFixture();
$book = $this->newInstance($metadata);
$this->assertPhpDocVarType('\Doctrine\Common\Collections\Collection', new \ReflectionProperty($book, 'comments'));
$this->assertPhpDocReturnType('\Doctrine\Common\Collections\Collection', new \ReflectionMethod($book, 'getComments'));
$this->assertPhpDocParamType('\Doctrine\Tests\ORM\Tools\EntityGeneratorComment', new \ReflectionMethod($book, 'addComment'));
$this->assertPhpDocParamType('\Doctrine\Tests\ORM\Tools\EntityGeneratorComment', new \ReflectionMethod($book, 'removeComment'));
$this->assertPhpDocVarType('\Doctrine\Tests\ORM\Tools\EntityGeneratorAuthor', new \ReflectionProperty($book, 'author'));
$this->assertPhpDocReturnType('\Doctrine\Tests\ORM\Tools\EntityGeneratorAuthor', new \ReflectionMethod($book, 'getAuthor'));
$this->assertPhpDocParamType('\Doctrine\Tests\ORM\Tools\EntityGeneratorAuthor', new \ReflectionMethod($book, 'setAuthor'));
}
public function testEntityExtendsStdClass() public function testEntityExtendsStdClass()
{ {
$this->_generator->setClassToExtend('stdClass'); $this->_generator->setClassToExtend('stdClass');