RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-02-02 13:31:45 +03:00
Code Issues Projects Releases Wiki Activity

Merge branch 'fix/#6626-skip-proxy-generation-for-embeddable-classes-2.5' into 2.5

Browse Source 
Backport #6626
Backport #6625
This commit is contained in:
Marco Pivetta 2017-08-16 15:21:29 +02:00
commit 6184343fd5
No known key found for this signature in database
GPG Key ID: 4167D3337FD9D629
2 changed files with 30 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/Doctrine/ORM/Proxy/ProxyFactory.php
View File

@ -91,7 +91,9 @@ class ProxyFactory extends AbstractProxyFactory
protected function skipClass(ClassMetadata $metadata)
{
/* @var $metadata \Doctrine\ORM\Mapping\ClassMetadataInfo */
return $metadata->isMappedSuperclass || $metadata->getReflectionClass()->isAbstract();
return $metadata->isMappedSuperclass
|| $metadata->isEmbeddedClass
|| $metadata->getReflectionClass()->isAbstract();
}
/**

27
tests/Doctrine/Tests/ORM/Proxy/ProxyFactoryTest.php
View File

@ -71,6 +71,33 @@ class ProxyFactoryTest extends \Doctrine\Tests\OrmTestCase
$proxy->getDescription();
}
public function testSkipMappedSuperClassesOnGeneration()
{
$cm = new ClassMetadata('stdClass');
$cm->isMappedSuperclass = true;
self::assertSame(
0,
$this->proxyFactory->generateProxyClasses([$cm]),
'No proxies generated.'
);
}
/**
* @group 6625
*/
public function testSkipEmbeddableClassesOnGeneration()
{
$cm = new ClassMetadata('stdClass');
$cm->isEmbeddedClass = true;
self::assertSame(
0,
$this->proxyFactory->generateProxyClasses([$cm]),
'No proxies generated.'
);
}
/**
* @group DDC-1771
*/