From 71218b66b9791079ff3327384e99fb1b8a981777 Mon Sep 17 00:00:00 2001 From: Marco Pivetta Date: Wed, 16 Aug 2017 15:16:00 +0200 Subject: [PATCH] #6626 #6625 minor CS fixes (removed useless assignments) --- lib/Doctrine/ORM/Proxy/ProxyFactory.php | 4 +++- .../Tests/ORM/Proxy/ProxyFactoryTest.php | 17 ++++++++++------- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/lib/Doctrine/ORM/Proxy/ProxyFactory.php b/lib/Doctrine/ORM/Proxy/ProxyFactory.php index 1ec22bfd0..16cfde931 100644 --- a/lib/Doctrine/ORM/Proxy/ProxyFactory.php +++ b/lib/Doctrine/ORM/Proxy/ProxyFactory.php @@ -91,7 +91,9 @@ class ProxyFactory extends AbstractProxyFactory protected function skipClass(ClassMetadata $metadata) { /* @var $metadata \Doctrine\ORM\Mapping\ClassMetadataInfo */ - return $metadata->isMappedSuperclass || $metadata->isEmbeddedClass || $metadata->getReflectionClass()->isAbstract(); + return $metadata->isMappedSuperclass + || $metadata->isEmbeddedClass + || $metadata->getReflectionClass()->isAbstract(); } /** diff --git a/tests/Doctrine/Tests/ORM/Proxy/ProxyFactoryTest.php b/tests/Doctrine/Tests/ORM/Proxy/ProxyFactoryTest.php index 9a575b80a..d66326faf 100644 --- a/tests/Doctrine/Tests/ORM/Proxy/ProxyFactoryTest.php +++ b/tests/Doctrine/Tests/ORM/Proxy/ProxyFactoryTest.php @@ -75,15 +75,16 @@ class ProxyFactoryTest extends OrmTestCase $proxy->getDescription(); } - public function testSkipMappedSuperClassesOnGeneration(): void { $cm = new ClassMetadata(\stdClass::class); $cm->isMappedSuperclass = true; - $num = $this->proxyFactory->generateProxyClasses([$cm]); - - self::assertSame(0, $num, 'No proxies generated.'); + self::assertSame( + 0, + $this->proxyFactory->generateProxyClasses([$cm]), + 'No proxies generated.' + ); } /** @@ -94,9 +95,11 @@ class ProxyFactoryTest extends OrmTestCase $cm = new ClassMetadata(\stdClass::class); $cm->isEmbeddedClass = true; - $num = $this->proxyFactory->generateProxyClasses([$cm]); - - self::assertSame(0, $num, 'No proxies generated.'); + self::assertSame( + 0, + $this->proxyFactory->generateProxyClasses([$cm]), + 'No proxies generated.' + ); } /**