RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-03-06 21:06:16 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #6216 from malukenho/enhancement/remove-unused-param

Browse Source 
Remove unused "$className" argument
This commit is contained in:
Marco Pivetta 2017-01-12 17:04:01 +01:00 committed by GitHub
commit 31c40f8342
4 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
UPGRADE.md
View File

@ -1,5 +1,9 @@
# Upgrade to 2.5 # Upgrade to 2.5
## Minor BC BREAK: removed $className parameter on `AbstractEntityInheritancePersister#getSelectJoinColumnSQL`
As `$className` parameter was not used in the method, it was safely removed.
## Minor BC BREAK: query cache key time is now a float ## 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 As of 2.5.5, the `QueryCacheEntry#time` property will contain a float value

3
lib/Doctrine/ORM/Persisters/Entity/AbstractEntityInheritancePersister.php
View File

@ -82,12 +82,11 @@ abstract class AbstractEntityInheritancePersister extends BasicEntityPersister
/** /**
* @param string $tableAlias * @param string $tableAlias
* @param string $joinColumnName * @param string $joinColumnName
* @param string $className
* @param string $type * @param string $type
* *
* @return string * @return string
*/ */
protected function getSelectJoinColumnSQL($tableAlias, $joinColumnName, $className, $type) protected function getSelectJoinColumnSQL($tableAlias, $joinColumnName, $type)
{ {
$columnAlias = $this->getSQLColumnAlias($joinColumnName); $columnAlias = $this->getSQLColumnAlias($joinColumnName);

2
lib/Doctrine/ORM/Persisters/Entity/JoinedSubclassPersister.php
View File

@ -472,7 +472,6 @@ class JoinedSubclassPersister extends AbstractEntityInheritancePersister
$columnList[] = $this->getSelectJoinColumnSQL( $columnList[] = $this->getSelectJoinColumnSQL(
$tableAlias, $tableAlias,
$srcColumn, $srcColumn,
$className,
PersisterHelper::getTypeOfColumn( PersisterHelper::getTypeOfColumn(
$mapping['sourceToTargetKeyColumns'][$srcColumn], $mapping['sourceToTargetKeyColumns'][$srcColumn],
$targetClass, $targetClass,
@ -521,7 +520,6 @@ class JoinedSubclassPersister extends AbstractEntityInheritancePersister
$columnList[] = $this->getSelectJoinColumnSQL( $columnList[] = $this->getSelectJoinColumnSQL(
$tableAlias, $tableAlias,
$srcColumn, $srcColumn,
$className,
PersisterHelper::getTypeOfColumn( PersisterHelper::getTypeOfColumn(
$mapping['sourceToTargetKeyColumns'][$srcColumn], $mapping['sourceToTargetKeyColumns'][$srcColumn],
$targetClass, $targetClass,

2
lib/Doctrine/ORM/Persisters/Entity/SingleTablePersister.php
View File

@ -87,14 +87,12 @@ class SingleTablePersister extends AbstractEntityInheritancePersister
continue; continue;
} }
$className = isset($assoc['inherited']) ? $assoc['inherited'] : $this->class->name;
$targetClass = $this->em->getClassMetadata($assoc['targetEntity']); $targetClass = $this->em->getClassMetadata($assoc['targetEntity']);
foreach ($assoc['targetToSourceKeyColumns'] as $srcColumn) { foreach ($assoc['targetToSourceKeyColumns'] as $srcColumn) {
$columnList[] = $this->getSelectJoinColumnSQL( $columnList[] = $this->getSelectJoinColumnSQL(
$tableAlias, $tableAlias,
$srcColumn, $srcColumn,
$className,
PersisterHelper::getTypeOfColumn( PersisterHelper::getTypeOfColumn(
$assoc['sourceToTargetKeyColumns'][$srcColumn], $assoc['sourceToTargetKeyColumns'][$srcColumn],
$targetClass, $targetClass,