Merge branch 'fix/#6626-skip-proxy-generation-for-embeddable-classes'
Close #6626 Close #6625
This commit is contained in:
commit
9005c5afdd
@ -91,7 +91,9 @@ class ProxyFactory extends AbstractProxyFactory
|
|||||||
protected function skipClass(ClassMetadata $metadata)
|
protected function skipClass(ClassMetadata $metadata)
|
||||||
{
|
{
|
||||||
/* @var $metadata \Doctrine\ORM\Mapping\ClassMetadataInfo */
|
/* @var $metadata \Doctrine\ORM\Mapping\ClassMetadataInfo */
|
||||||
return $metadata->isMappedSuperclass || $metadata->getReflectionClass()->isAbstract();
|
return $metadata->isMappedSuperclass
|
||||||
|
|| $metadata->isEmbeddedClass
|
||||||
|
|| $metadata->getReflectionClass()->isAbstract();
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -75,6 +75,33 @@ class ProxyFactoryTest extends OrmTestCase
|
|||||||
$proxy->getDescription();
|
$proxy->getDescription();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function testSkipMappedSuperClassesOnGeneration(): void
|
||||||
|
{
|
||||||
|
$cm = new ClassMetadata(\stdClass::class);
|
||||||
|
$cm->isMappedSuperclass = true;
|
||||||
|
|
||||||
|
self::assertSame(
|
||||||
|
0,
|
||||||
|
$this->proxyFactory->generateProxyClasses([$cm]),
|
||||||
|
'No proxies generated.'
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @group 6625
|
||||||
|
*/
|
||||||
|
public function testSkipEmbeddableClassesOnGeneration(): void
|
||||||
|
{
|
||||||
|
$cm = new ClassMetadata(\stdClass::class);
|
||||||
|
$cm->isEmbeddedClass = true;
|
||||||
|
|
||||||
|
self::assertSame(
|
||||||
|
0,
|
||||||
|
$this->proxyFactory->generateProxyClasses([$cm]),
|
||||||
|
'No proxies generated.'
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @group DDC-1771
|
* @group DDC-1771
|
||||||
*/
|
*/
|
||||||
|
Loading…
x
Reference in New Issue
Block a user