RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-01-26 10:01:45 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1132 from Ocramius/hotfix/DDC-3272-entity-generator-mapped-superclass-casing

Browse Source 
DDC-3272 entity generator mapped superclass casing
This commit is contained in:
Steve Müller 2014-09-10 18:27:51 +02:00
commit b249aa9f65
2 changed files with 43 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -875,15 +875,13 @@ public function __construct()
} }
} }
if ($metadata->isMappedSuperclass) { $customRepository = $metadata->customRepositoryClassName
$lines[] = ' * @' . $this->annotationsPrefix . 'MappedSuperClass'; ? '(repositoryClass="' . $metadata->customRepositoryClassName . '")'
} else { : '';
$lines[] = ' * @' . $this->annotationsPrefix . 'Entity';
}
if ($metadata->customRepositoryClassName) { $lines[] = ' * @' . $this->annotationsPrefix
$lines[count($lines) - 1] .= '(repositoryClass="' . $metadata->customRepositoryClassName . '")'; . ($metadata->isMappedSuperclass ? 'MappedSuperclass' : 'Entity')
} . $customRepository;
if (isset($metadata->lifecycleCallbacks) && $metadata->lifecycleCallbacks) { if (isset($metadata->lifecycleCallbacks) && $metadata->lifecycleCallbacks) {
$lines[] = ' * @' . $this->annotationsPrefix . 'HasLifecycleCallbacks'; $lines[] = ' * @' . $this->annotationsPrefix . 'HasLifecycleCallbacks';

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

@ -2,15 +2,18 @@
namespace Doctrine\Tests\ORM\Tools; namespace Doctrine\Tests\ORM\Tools;
use Doctrine\ORM\Tools\SchemaTool; use Doctrine\Common\Annotations\AnnotationReader;
use Doctrine\ORM\Tools\EntityGenerator; use Doctrine\Common\Persistence\Mapping\RuntimeReflectionService;
use Doctrine\ORM\Tools\Export\ClassMetadataExporter; use Doctrine\ORM\Mapping\ClassMetadata;
use Doctrine\ORM\Mapping\ClassMetadataInfo;
use Doctrine\ORM\Mapping\ClassMetadataFactory; use Doctrine\ORM\Mapping\ClassMetadataFactory;
use Doctrine\Tests\Models\DDC2372\DDC2372User; use Doctrine\ORM\Mapping\ClassMetadataInfo;
use Doctrine\ORM\Mapping\Driver\AnnotationDriver;
use Doctrine\ORM\Tools\EntityGenerator;
use Doctrine\Tests\Models\DDC2372\DDC2372Admin; use Doctrine\Tests\Models\DDC2372\DDC2372Admin;
use Doctrine\Tests\Models\DDC2372\DDC2372User;
use Doctrine\Tests\OrmTestCase;
class EntityGeneratorTest extends \Doctrine\Tests\OrmTestCase class EntityGeneratorTest extends OrmTestCase
{ {
/** /**
@ -245,8 +248,8 @@ class EntityGeneratorTest extends \Doctrine\Tests\OrmTestCase
$book = $this->newInstance($metadata); $book = $this->newInstance($metadata);
$cm = new \Doctrine\ORM\Mapping\ClassMetadata($metadata->name); $cm = new ClassMetadata($metadata->name);
$cm->initializeReflection(new \Doctrine\Common\Persistence\Mapping\RuntimeReflectionService); $cm->initializeReflection(new RuntimeReflectionService);
$driver = $this->createAnnotationDriver(); $driver = $this->createAnnotationDriver();
$driver->loadMetadataForClass($cm->name, $cm); $driver->loadMetadataForClass($cm->name, $cm);
@ -266,13 +269,13 @@ class EntityGeneratorTest extends \Doctrine\Tests\OrmTestCase
$this->_generator->setAnnotationPrefix('ORM\\'); $this->_generator->setAnnotationPrefix('ORM\\');
$metadata = $this->generateBookEntityFixture(); $metadata = $this->generateBookEntityFixture();
$reader = new \Doctrine\Common\Annotations\AnnotationReader(); $reader = new AnnotationReader();
$driver = new \Doctrine\ORM\Mapping\Driver\AnnotationDriver($reader, array()); $driver = new AnnotationDriver($reader, array());
$book = $this->newInstance($metadata); $book = $this->newInstance($metadata);
$cm = new \Doctrine\ORM\Mapping\ClassMetadata($metadata->name); $cm = new ClassMetadata($metadata->name);
$cm->initializeReflection(new \Doctrine\Common\Persistence\Mapping\RuntimeReflectionService); $cm->initializeReflection(new RuntimeReflectionService);
$driver->loadMetadataForClass($cm->name, $cm); $driver->loadMetadataForClass($cm->name, $cm);
@ -284,6 +287,28 @@ class EntityGeneratorTest extends \Doctrine\Tests\OrmTestCase
$this->assertEquals($cm->customRepositoryClassName, $metadata->customRepositoryClassName); $this->assertEquals($cm->customRepositoryClassName, $metadata->customRepositoryClassName);
} }
/**
* @group DDC-3272
*/
public function testMappedSuperclassAnnotationGeneration()
{
$metadata = new ClassMetadataInfo($this->_namespace . '\EntityGeneratorBook');
$metadata->namespace = $this->_namespace;
$metadata->isMappedSuperclass = true;
$this->_generator->setAnnotationPrefix('ORM\\');
$this->_generator->writeEntityClass($metadata, $this->_tmpDir);
$this->newInstance($metadata); // force instantiation (causes autoloading to kick in)
$driver = new AnnotationDriver(new AnnotationReader(), array());
$cm = new ClassMetadata($metadata->name);
$cm->initializeReflection(new RuntimeReflectionService);
$driver->loadMetadataForClass($cm->name, $cm);
$this->assertTrue($cm->isMappedSuperclass);
}
/** /**
* @dataProvider getParseTokensInEntityFileData * @dataProvider getParseTokensInEntityFileData
*/ */