Skip to content

Commit

Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Quote only strings
Browse files Browse the repository at this point in the history
morozov committed May 3, 2022
1 parent afe345f commit b291c4e
Showing 4 changed files with 7 additions and 8 deletions.
1 change: 1 addition & 0 deletions lib/Doctrine/ORM/Mapping/Driver/AnnotationDriver.php
Original file line number Diff line number Diff line change
@@ -87,6 +87,7 @@ public function loadMetadataForClass($className, PersistenceClassMetadata $metad
continue;
}

unset($classAnnotations[$key]);
$classAnnotations[get_class($annot)] = $annot;
}

4 changes: 2 additions & 2 deletions lib/Doctrine/ORM/Persisters/Entity/SingleTablePersister.php
Original file line number Diff line number Diff line change
@@ -135,13 +135,13 @@ protected function getSelectConditionDiscriminatorValueSQL(): string
$values = [];

if ($this->class->discriminatorValue !== null) { // discriminators can be 0
$values[] = $this->conn->quote($this->class->discriminatorValue);
$values[] = $this->conn->quote((string) $this->class->discriminatorValue);
}

$discrValues = array_flip($this->class->discriminatorMap);

foreach ($this->class->subClasses as $subclassName) {
$values[] = $this->conn->quote($discrValues[$subclassName]);
$values[] = $this->conn->quote((string) $discrValues[$subclassName]);
}

$discColumnName = $this->class->getDiscriminatorColumn()['name'];
6 changes: 2 additions & 4 deletions lib/Doctrine/ORM/Query/Filter/SQLFilter.php
Original file line number Diff line number Diff line change
@@ -105,9 +105,7 @@ final public function getParameter(string $name): string
throw FilterException::cannotConvertListParameterIntoSingleValue($name);
}

$param = $this->parameters[$name];

return $this->em->getConnection()->quote($param['value'], $param['type']);
return $this->em->getConnection()->quote((string) $this->parameters[$name]['value']);
}

/**
@@ -133,7 +131,7 @@ final public function getParameterList(string $name): string
$connection = $this->em->getConnection();

$quoted = array_map(
static fn (mixed $value): string => (string) $connection->quote($value, $param['type']),
static fn (mixed $value): string => $connection->quote((string) $value),
$param['value']
);

4 changes: 2 additions & 2 deletions lib/Doctrine/ORM/Query/SqlWalker.php
Original file line number Diff line number Diff line change
@@ -461,7 +461,7 @@ private function generateDiscriminatorColumnConditionSQL(array $dqlAliases): str
}

foreach ($class->subClasses as $subclassName) {
$values[] = $conn->quote($this->em->getClassMetadata($subclassName)->discriminatorValue);
$values[] = $conn->quote((string) $this->em->getClassMetadata($subclassName)->discriminatorValue);
}

$sqlTableAlias = $this->useSqlTableAliases
@@ -1812,7 +1812,7 @@ public function walkUpdateItem($updateItem)
break;

default:
$sql .= $this->conn->quote($newValue);
$sql .= $this->conn->quote((string) $newValue);
break;
}

0 comments on commit b291c4e

Please sign in to comment.