RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-03-23 00:13:50 +03:00
Code Issues Projects Releases Wiki Activity

Don't alias PersisterHelper to Helper

Browse Source
This commit is contained in:
Jasper N. Brouwer 2014-12-20 14:26:46 +01:00 committed by Marco Pivetta
parent 7b9c6a69bd
commit a0b43d0a7f
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/Doctrine/ORM/Persisters/Collection/ManyToManyPersister.php
View File

@ -26,7 +26,7 @@ use Doctrine\ORM\Persisters\SqlValueVisitor;
use Doctrine\ORM\PersistentCollection; use Doctrine\ORM\PersistentCollection;
use Doctrine\ORM\Query; use Doctrine\ORM\Query;
use Doctrine\ORM\UnitOfWork; use Doctrine\ORM\UnitOfWork;
use Doctrine\ORM\Utility\PersisterHelper as Helper; use Doctrine\ORM\Utility\PersisterHelper;
/** /**
* Persister for many-to-many collections. * Persister for many-to-many collections.
@ -386,7 +386,7 @@ class ManyToManyPersister extends AbstractCollectionPersister
: $sourceClass->getFieldForColumn($columnName); : $sourceClass->getFieldForColumn($columnName);
$params[] = $identifier[$field]; $params[] = $identifier[$field];
$types[] = Helper::getTypeOfField($field, $sourceClass, $this->em); $types[] = PersisterHelper::getTypeOfField($field, $sourceClass, $this->em);
} }
return array($params, $types); return array($params, $types);
@ -569,7 +569,7 @@ class ManyToManyPersister extends AbstractCollectionPersister
$whereClauses[] = 'tr.' . $columnName . ' = ?'; $whereClauses[] = 'tr.' . $columnName . ' = ?';
$params[] = $key; $params[] = $key;
$types[] = Helper::getTypeOfColumn($columnName, $targetClass, $this->em); $types[] = PersisterHelper::getTypeOfColumn($columnName, $targetClass, $this->em);
} }
foreach ($mapping['joinTableColumns'] as $joinTableColumn) { foreach ($mapping['joinTableColumns'] as $joinTableColumn) {
@ -581,7 +581,7 @@ class ManyToManyPersister extends AbstractCollectionPersister
} elseif (!$joinNeeded) { } elseif (!$joinNeeded) {
$whereClauses[] = 't.' . $joinTableColumn . ' = ?'; $whereClauses[] = 't.' . $joinTableColumn . ' = ?';
$params[] = $key; $params[] = $key;
$types[] = Helper::getTypeOfColumn($column, $targetClass, $this->em); $types[] = PersisterHelper::getTypeOfColumn($column, $targetClass, $this->em);
} }
} }
@ -637,7 +637,7 @@ class ManyToManyPersister extends AbstractCollectionPersister
$params[] = $targetClass->containsForeignIdentifier $params[] = $targetClass->containsForeignIdentifier
? $targetId[$targetClass->getFieldForColumn($column)] ? $targetId[$targetClass->getFieldForColumn($column)]
: $targetId[$targetClass->fieldNames[$column]]; : $targetId[$targetClass->fieldNames[$column]];
$types[] = Helper::getTypeOfColumn($column, $targetClass, $this->em); $types[] = PersisterHelper::getTypeOfColumn($column, $targetClass, $this->em);
continue; continue;
} }

8
lib/Doctrine/ORM/Persisters/Entity/BasicEntityPersister.php
View File

@ -863,7 +863,7 @@ class BasicEntityPersister implements EntityPersister
list($params, $types) = $valueVisitor->getParamsAndTypes(); list($params, $types) = $valueVisitor->getParamsAndTypes();
foreach ($params as $param) { foreach ($params as $param) {
$sqlParams[] = Helper::getValue($param, $this->em); $sqlParams[] = PersisterHelper::getValue($param, $this->em);
} }
foreach ($types as $type) { foreach ($types as $type) {
@ -1312,7 +1312,7 @@ class BasicEntityPersister implements EntityPersister
$columnList[] = $this->getSQLTableAlias($class->name, ($alias == 'r' ? '' : $alias) ) $columnList[] = $this->getSQLTableAlias($class->name, ($alias == 'r' ? '' : $alias) )
. '.' . $quotedColumn . ' AS ' . $resultColumnName; . '.' . $quotedColumn . ' AS ' . $resultColumnName;
$type = Helper::getTypeOfColumn($joinColumn['referencedColumnName'], $targetClass, $this->em); $type = PersisterHelper::getTypeOfColumn($joinColumn['referencedColumnName'], $targetClass, $this->em);
$this->rsm->addMetaResult($alias, $resultColumnName, $quotedColumn, $isIdentifier, $type); $this->rsm->addMetaResult($alias, $resultColumnName, $quotedColumn, $isIdentifier, $type);
} }
@ -1764,7 +1764,7 @@ class BasicEntityPersister implements EntityPersister
} }
$types[] = $this->getType($field, $value, $this->class); $types[] = $this->getType($field, $value, $this->class);
$params[] = Helper::getValue($value, $this->em); $params[] = PersisterHelper::getValue($value, $this->em);
} }
return array($params, $types); return array($params, $types);
@ -1789,7 +1789,7 @@ class BasicEntityPersister implements EntityPersister
} }
$types[] = $this->getType($criterion['field'], $criterion['value'], $criterion['class']); $types[] = $this->getType($criterion['field'], $criterion['value'], $criterion['class']);
$params[] = Helper::getValue($criterion['value'], $this->em); $params[] = PersisterHelper::getValue($criterion['value'], $this->em);
} }
return array($params, $types); return array($params, $types);