mirror of https://github.com/wallabag/wallabag.git
Fix test following 2.5 merge into master
This commit is contained in:
parent
66b7bdd07c
commit
4dd380b7dd
|
@ -60,11 +60,11 @@ class AnnotationRepository extends ServiceEntityRepository
|
||||||
public function findOneByIdAndUserId($annotationId, $userId)
|
public function findOneByIdAndUserId($annotationId, $userId)
|
||||||
{
|
{
|
||||||
return $this->createQueryBuilder('a')
|
return $this->createQueryBuilder('a')
|
||||||
->where('a.id = :annotationId')->setParameter('annotationId', $annotationId)
|
->where('a.id = :annotationId')->setParameter('annotationId', $annotationId)
|
||||||
->andWhere('a.user = :userId')->setParameter('userId', $userId)
|
->andWhere('a.user = :userId')->setParameter('userId', $userId)
|
||||||
->setMaxResults(1)
|
->setMaxResults(1)
|
||||||
->getQuery()
|
->getQuery()
|
||||||
->getOneOrNullResult();
|
->getOneOrNullResult();
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -90,7 +90,7 @@ class AnnotationRepository extends ServiceEntityRepository
|
||||||
*
|
*
|
||||||
* @param int $entryId
|
* @param int $entryId
|
||||||
*
|
*
|
||||||
* @return array
|
* @return Annotation|null
|
||||||
*/
|
*/
|
||||||
public function findLastAnnotationByUserId($entryId, $userId)
|
public function findLastAnnotationByUserId($entryId, $userId)
|
||||||
{
|
{
|
||||||
|
|
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
Loading…
Reference in New Issue