From 648fde89147b71b614315128f0131d8cfb6fa827 Mon Sep 17 00:00:00 2001 From: Marco Pivetta Date: Tue, 17 Mar 2015 23:16:16 +0000 Subject: [PATCH] #1316 - removing useless `null` check (redundant with `isset()`), cs cleanups --- lib/Doctrine/ORM/Mapping/DefaultQuoteStrategy.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lib/Doctrine/ORM/Mapping/DefaultQuoteStrategy.php b/lib/Doctrine/ORM/Mapping/DefaultQuoteStrategy.php index e69f6f6b2..dfbded8a4 100644 --- a/lib/Doctrine/ORM/Mapping/DefaultQuoteStrategy.php +++ b/lib/Doctrine/ORM/Mapping/DefaultQuoteStrategy.php @@ -97,10 +97,13 @@ class DefaultQuoteStrategy implements QuoteStrategy public function getJoinTableName(array $association, ClassMetadata $class, AbstractPlatform $platform) { $schema = ''; - if (isset($association['joinTable']['schema']) && null !== $association['joinTable']['schema']) { + + if (isset($association['joinTable']['schema'])) { $schema = $association['joinTable']['schema'] . '.'; } + $tableName = $association['joinTable']['name']; + if (isset($association['joinTable']['quoted'])) { $tableName = $platform->quoteIdentifier($tableName); }