Merge branch '4.0'

This commit is contained in:
Benoît Burnichon
2016-03-11 21:50:23 +01:00
39 changed files with 279 additions and 265 deletions

View File

@@ -86,8 +86,8 @@ class DbalCollectionRepository implements CollectionRepository
}
$query = self::$selectQuery . ' WHERE coll_id IN (:collectionIds)';
$parameters = [ 'collectionIds' => $parameters ];
$parameterTypes = [ 'collectionIds' => Connection::PARAM_INT_ARRAY ];
$parameters = ['collectionIds' => $parameters];
$parameterTypes = ['collectionIds' => Connection::PARAM_INT_ARRAY];
$rows = $this->databoxConnection->fetchAll($query, $parameters, $parameterTypes);
@@ -107,7 +107,7 @@ class DbalCollectionRepository implements CollectionRepository
}
$query = self::$selectQuery . ' WHERE coll_id = :collectionId';
$row = $this->databoxConnection->fetchAssoc($query, [ ':collectionId' => $reference->getCollectionId() ]);
$row = $this->databoxConnection->fetchAssoc($query, [':collectionId' => $reference->getCollectionId()]);
if ($row !== false) {
return $this->collectionFactory->create($this->databoxId, $reference, $row);
@@ -130,7 +130,7 @@ class DbalCollectionRepository implements CollectionRepository
}
$query = self::$selectQuery . ' WHERE coll_id = :collectionId';
$row = $this->databoxConnection->fetchAssoc($query, [ ':collectionId' => $reference->getCollectionId() ]);
$row = $this->databoxConnection->fetchAssoc($query, [':collectionId' => $reference->getCollectionId()]);
if ($row !== false) {
return $this->collectionFactory->create($this->databoxId, $reference, $row);