From bf1847501134215032b699c8e671c6bcb6bd5e22 Mon Sep 17 00:00:00 2001 From: Gabriel Caruso Date: Mon, 15 Jan 2018 17:51:29 -0200 Subject: [PATCH] Use Null Coalesce Operator --- lib/Doctrine/Common/Proxy/AbstractProxyFactory.php | 8 ++------ lib/Doctrine/Common/Proxy/ProxyGenerator.php | 4 +--- .../Common/Reflection/RuntimePublicReflectionProperty.php | 2 +- 3 files changed, 4 insertions(+), 10 deletions(-) diff --git a/lib/Doctrine/Common/Proxy/AbstractProxyFactory.php b/lib/Doctrine/Common/Proxy/AbstractProxyFactory.php index a3921aec5..38e95f1d5 100644 --- a/lib/Doctrine/Common/Proxy/AbstractProxyFactory.php +++ b/lib/Doctrine/Common/Proxy/AbstractProxyFactory.php @@ -109,9 +109,7 @@ public function __construct(ProxyGenerator $proxyGenerator, ClassMetadataFactory */ public function getProxy($className, array $identifier) { - $definition = isset($this->definitions[$className]) - ? $this->definitions[$className] - : $this->getProxyDefinition($className); + $definition = $this->definitions[$className] ?? $this->getProxyDefinition($className); $fqcn = $definition->proxyClassName; $proxy = new $fqcn($definition->initializer, $definition->cloner); @@ -171,9 +169,7 @@ public function resetUninitializedProxy(Proxy $proxy) } $className = ClassUtils::getClass($proxy); - $definition = isset($this->definitions[$className]) - ? $this->definitions[$className] - : $this->getProxyDefinition($className); + $definition = $this->definitions[$className] ?? $this->getProxyDefinition($className); $proxy->__setInitializer($definition->initializer); $proxy->__setCloner($definition->cloner); diff --git a/lib/Doctrine/Common/Proxy/ProxyGenerator.php b/lib/Doctrine/Common/Proxy/ProxyGenerator.php index 3d13b205a..a52777e52 100644 --- a/lib/Doctrine/Common/Proxy/ProxyGenerator.php +++ b/lib/Doctrine/Common/Proxy/ProxyGenerator.php @@ -251,9 +251,7 @@ public function generateProxyClass(ClassMetadata $class, $fileName = false) $placeholders = []; foreach ($placeholderMatches as $placeholder => $name) { - $placeholders[$placeholder] = isset($this->placeholders[$name]) - ? $this->placeholders[$name] - : [$this, 'generate' . $name]; + $placeholders[$placeholder] = $this->placeholders[$name] ?? [$this, 'generate' . $name]; } foreach ($placeholders as & $placeholder) { diff --git a/lib/Doctrine/Common/Reflection/RuntimePublicReflectionProperty.php b/lib/Doctrine/Common/Reflection/RuntimePublicReflectionProperty.php index 1f5387d34..cfad44834 100644 --- a/lib/Doctrine/Common/Reflection/RuntimePublicReflectionProperty.php +++ b/lib/Doctrine/Common/Reflection/RuntimePublicReflectionProperty.php @@ -26,7 +26,7 @@ public function getValue($object = null) if ($object instanceof Proxy && ! $object->__isInitialized()) { $originalInitializer = $object->__getInitializer(); $object->__setInitializer(null); - $val = isset($object->$name) ? $object->$name : null; + $val = $object->$name ?? null; $object->__setInitializer($originalInitializer); return $val;