From e0cb90d42682f38ef8bf72c9937675bc5923e8cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Steve=20M=C3=BCller?= Date: Thu, 19 Nov 2015 16:43:33 +0100 Subject: [PATCH] fix empty expression on PHP 5.4 --- lib/Doctrine/ORM/Mapping/ClassMetadataFactory.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/Doctrine/ORM/Mapping/ClassMetadataFactory.php b/lib/Doctrine/ORM/Mapping/ClassMetadataFactory.php index b8a10ed77..52bf7aa54 100644 --- a/lib/Doctrine/ORM/Mapping/ClassMetadataFactory.php +++ b/lib/Doctrine/ORM/Mapping/ClassMetadataFactory.php @@ -185,7 +185,9 @@ class ClassMetadataFactory extends AbstractClassMetadataFactory $this->addNestedEmbeddedClasses($embeddableMetadata, $class, $property); } - if (! empty($embeddableMetadata->getIdentifier())) { + $identifier = $embeddableMetadata->getIdentifier(); + + if (! empty($identifier)) { $this->inheritIdGeneratorMapping($class, $embeddableMetadata); }