RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-02-10 17:29:27 +03:00
Code Issues Projects Releases Wiki Activity

- fixed columnPrefix generator for the embedded annotation

Browse Source
This commit is contained in:
Artem Stepin 2017-06-09 22:25:19 +02:00
parent 351b6972a4
commit 799190d5e4
2 changed files with 24 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1732,7 +1732,11 @@ public function __construct(<params>)
$embedded = ['class="' . $embeddedClass['class'] . '"']; $embedded = ['class="' . $embeddedClass['class'] . '"'];
if (isset($embeddedClass['columnPrefix'])) { if (isset($embeddedClass['columnPrefix'])) {
$embedded[] = 'columnPrefix=' . var_export($embeddedClass['columnPrefix'], true); if (is_string($embeddedClass['columnPrefix'])) {
$embedded[] = 'columnPrefix="' . $embeddedClass['columnPrefix'] . '"';
} else {
$embedded[] = 'columnPrefix=' . var_export($embeddedClass['columnPrefix'], true);
}
} }
$lines[] = $this->spaces . ' * @' . $lines[] = $this->spaces . ' * @' .

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

@ -227,21 +227,34 @@ class EntityGeneratorTest extends OrmTestCase
/** /**
* @group GH-6314 * @group GH-6314
*/ */
public function testEmbeddedEntityWithColumnPrefix() public function testEmbeddedEntityWithNamedColumnPrefix()
{ {
$columnPrefix = 'GH6314Prefix_';
$testMetadata = $this->generateTestEmbeddableFixture(); $testMetadata = $this->generateTestEmbeddableFixture();
$isbnMetadata = $this->generateIsbnEmbeddableFixture(['testEmbedded' => $testMetadata], 'prefix'); $isbnMetadata = $this->generateIsbnEmbeddableFixture(['testEmbedded' => $testMetadata], $columnPrefix);
$isbnEntity = $this->newInstance($isbnMetadata); $isbnEntity = $this->newInstance($isbnMetadata);
$refClass = new \ReflectionClass($isbnEntity); $refClass = new \ReflectionClass($isbnEntity);
self::assertTrue($refClass->hasProperty('testEmbedded')); self::assertTrue($refClass->hasProperty('testEmbedded'));
$docComment = $refClass->getProperty('testEmbedded')->getDocComment();
$needle = sprintf('@Embedded(class="%s", columnPrefix="%s")', $testMetadata->name, $columnPrefix);
self::assertContains($needle, $docComment);
}
/**
* @group GH-6314
*/
public function testEmbeddedEntityWithoutColumnPrefix()
{
$testMetadata = $this->generateTestEmbeddableFixture();
$isbnMetadata = $this->generateIsbnEmbeddableFixture(['testEmbedded' => $testMetadata], false);
$isbnEntity = $this->newInstance($isbnMetadata);
$refClass = new \ReflectionClass($isbnEntity);
self::assertTrue($refClass->hasProperty('testEmbedded'));
$docComment = $refClass->getProperty('testEmbedded')->getDocComment(); $docComment = $refClass->getProperty('testEmbedded')->getDocComment();
$needle = sprintf('@Embedded(class="%s", columnPrefix=false)', $testMetadata->name);
$needle = sprintf('@Embedded(class="%s", columnPrefix=\'%s\')', $testMetadata->name,'prefix');
self::assertContains($needle, $docComment); self::assertContains($needle, $docComment);
} }
public function testGeneratedEntityClass() public function testGeneratedEntityClass()