diff --git a/lib/Doctrine/ORM/Persisters/Collection/ManyToManyPersister.php b/lib/Doctrine/ORM/Persisters/Collection/ManyToManyPersister.php index 8ebf68a16..81aee6584 100644 --- a/lib/Doctrine/ORM/Persisters/Collection/ManyToManyPersister.php +++ b/lib/Doctrine/ORM/Persisters/Collection/ManyToManyPersister.php @@ -26,7 +26,7 @@ use Doctrine\ORM\Persisters\SqlValueVisitor; use Doctrine\ORM\PersistentCollection; use Doctrine\ORM\Query; use Doctrine\ORM\UnitOfWork; -use Doctrine\ORM\Utility\PersisterHelper as Helper; +use Doctrine\ORM\Utility\PersisterHelper; /** * Persister for many-to-many collections. @@ -386,7 +386,7 @@ class ManyToManyPersister extends AbstractCollectionPersister : $sourceClass->getFieldForColumn($columnName); $params[] = $identifier[$field]; - $types[] = Helper::getTypeOfField($field, $sourceClass, $this->em); + $types[] = PersisterHelper::getTypeOfField($field, $sourceClass, $this->em); } return array($params, $types); @@ -569,7 +569,7 @@ class ManyToManyPersister extends AbstractCollectionPersister $whereClauses[] = 'tr.' . $columnName . ' = ?'; $params[] = $key; - $types[] = Helper::getTypeOfColumn($columnName, $targetClass, $this->em); + $types[] = PersisterHelper::getTypeOfColumn($columnName, $targetClass, $this->em); } foreach ($mapping['joinTableColumns'] as $joinTableColumn) { @@ -581,7 +581,7 @@ class ManyToManyPersister extends AbstractCollectionPersister } elseif (!$joinNeeded) { $whereClauses[] = 't.' . $joinTableColumn . ' = ?'; $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 ? $targetId[$targetClass->getFieldForColumn($column)] : $targetId[$targetClass->fieldNames[$column]]; - $types[] = Helper::getTypeOfColumn($column, $targetClass, $this->em); + $types[] = PersisterHelper::getTypeOfColumn($column, $targetClass, $this->em); continue; } diff --git a/lib/Doctrine/ORM/Persisters/Entity/BasicEntityPersister.php b/lib/Doctrine/ORM/Persisters/Entity/BasicEntityPersister.php index 740c09b40..4d78abf43 100644 --- a/lib/Doctrine/ORM/Persisters/Entity/BasicEntityPersister.php +++ b/lib/Doctrine/ORM/Persisters/Entity/BasicEntityPersister.php @@ -863,7 +863,7 @@ class BasicEntityPersister implements EntityPersister list($params, $types) = $valueVisitor->getParamsAndTypes(); foreach ($params as $param) { - $sqlParams[] = Helper::getValue($param, $this->em); + $sqlParams[] = PersisterHelper::getValue($param, $this->em); } foreach ($types as $type) { @@ -1312,7 +1312,7 @@ class BasicEntityPersister implements EntityPersister $columnList[] = $this->getSQLTableAlias($class->name, ($alias == 'r' ? '' : $alias) ) . '.' . $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); } @@ -1764,7 +1764,7 @@ class BasicEntityPersister implements EntityPersister } $types[] = $this->getType($field, $value, $this->class); - $params[] = Helper::getValue($value, $this->em); + $params[] = PersisterHelper::getValue($value, $this->em); } return array($params, $types); @@ -1789,7 +1789,7 @@ class BasicEntityPersister implements EntityPersister } $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);