From eaeecc38578164aff4c9db7766bd6ec8e7b81b12 Mon Sep 17 00:00:00 2001 From: Jefersson Nathan Date: Thu, 5 Jan 2017 18:21:49 -0300 Subject: [PATCH 1/3] Remove unused arguments --- .../Persisters/Entity/AbstractEntityInheritancePersister.php | 3 +-- lib/Doctrine/ORM/Persisters/Entity/JoinedSubclassPersister.php | 2 -- lib/Doctrine/ORM/Persisters/Entity/SingleTablePersister.php | 2 -- 3 files changed, 1 insertion(+), 6 deletions(-) diff --git a/lib/Doctrine/ORM/Persisters/Entity/AbstractEntityInheritancePersister.php b/lib/Doctrine/ORM/Persisters/Entity/AbstractEntityInheritancePersister.php index aa2038ffc..6052c63e5 100644 --- a/lib/Doctrine/ORM/Persisters/Entity/AbstractEntityInheritancePersister.php +++ b/lib/Doctrine/ORM/Persisters/Entity/AbstractEntityInheritancePersister.php @@ -82,12 +82,11 @@ abstract class AbstractEntityInheritancePersister extends BasicEntityPersister /** * @param string $tableAlias * @param string $joinColumnName - * @param string $className * @param string $type * * @return string */ - protected function getSelectJoinColumnSQL($tableAlias, $joinColumnName, $className, $type) + protected function getSelectJoinColumnSQL($tableAlias, $joinColumnName, $type) { $columnAlias = $this->getSQLColumnAlias($joinColumnName); diff --git a/lib/Doctrine/ORM/Persisters/Entity/JoinedSubclassPersister.php b/lib/Doctrine/ORM/Persisters/Entity/JoinedSubclassPersister.php index e3e7d2b43..8fe679ad4 100644 --- a/lib/Doctrine/ORM/Persisters/Entity/JoinedSubclassPersister.php +++ b/lib/Doctrine/ORM/Persisters/Entity/JoinedSubclassPersister.php @@ -472,7 +472,6 @@ class JoinedSubclassPersister extends AbstractEntityInheritancePersister $columnList[] = $this->getSelectJoinColumnSQL( $tableAlias, $srcColumn, - $className, PersisterHelper::getTypeOfColumn( $mapping['sourceToTargetKeyColumns'][$srcColumn], $targetClass, @@ -521,7 +520,6 @@ class JoinedSubclassPersister extends AbstractEntityInheritancePersister $columnList[] = $this->getSelectJoinColumnSQL( $tableAlias, $srcColumn, - $className, PersisterHelper::getTypeOfColumn( $mapping['sourceToTargetKeyColumns'][$srcColumn], $targetClass, diff --git a/lib/Doctrine/ORM/Persisters/Entity/SingleTablePersister.php b/lib/Doctrine/ORM/Persisters/Entity/SingleTablePersister.php index d3eb5d8ac..ff1d29652 100644 --- a/lib/Doctrine/ORM/Persisters/Entity/SingleTablePersister.php +++ b/lib/Doctrine/ORM/Persisters/Entity/SingleTablePersister.php @@ -87,14 +87,12 @@ class SingleTablePersister extends AbstractEntityInheritancePersister continue; } - $className = isset($assoc['inherited']) ? $assoc['inherited'] : $this->class->name; $targetClass = $this->em->getClassMetadata($assoc['targetEntity']); foreach ($assoc['targetToSourceKeyColumns'] as $srcColumn) { $columnList[] = $this->getSelectJoinColumnSQL( $tableAlias, $srcColumn, - $className, PersisterHelper::getTypeOfColumn( $assoc['sourceToTargetKeyColumns'][$srcColumn], $targetClass, From df5f480b4cd82b89a64ffdeaeea3859c13faf70d Mon Sep 17 00:00:00 2001 From: Jefersson Nathan Date: Wed, 11 Jan 2017 17:35:28 -0300 Subject: [PATCH 2/3] document change as minor BC Break --- UPGRADE.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/UPGRADE.md b/UPGRADE.md index b71e10adb..e29cd0792 100644 --- a/UPGRADE.md +++ b/UPGRADE.md @@ -1,5 +1,9 @@ # Upgrade to 2.5 +## Minor BC BREAK: remove $className parameter on AbstractEntityInheritancePersister#getSelectJoinColumnSQL + +As `$className` parameter is not used on its method body, it was safely removed. + ## Minor BC BREAK: query cache key time is now a float As of 2.5.5, the `QueryCacheEntry#time` property will contain a float value From 5208187f1a2b7cdaf896f6df19fce9e9a9604298 Mon Sep 17 00:00:00 2001 From: Jefersson Nathan Date: Thu, 12 Jan 2017 13:02:10 -0300 Subject: [PATCH 3/3] rewording upgrade sentence --- UPGRADE.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/UPGRADE.md b/UPGRADE.md index e29cd0792..cc304b898 100644 --- a/UPGRADE.md +++ b/UPGRADE.md @@ -1,8 +1,8 @@ # Upgrade to 2.5 -## Minor BC BREAK: remove $className parameter on AbstractEntityInheritancePersister#getSelectJoinColumnSQL +## Minor BC BREAK: removed $className parameter on `AbstractEntityInheritancePersister#getSelectJoinColumnSQL` -As `$className` parameter is not used on its method body, it was safely removed. +As `$className` parameter was not used in the method, it was safely removed. ## Minor BC BREAK: query cache key time is now a float