more fixes for calendar syncs

This commit is contained in:
2022-06-10 14:24:46 +02:00
parent c92077926e
commit 9e4fd6183e
5 changed files with 22 additions and 21 deletions

View File

@@ -15,6 +15,7 @@ use Chill\MainBundle\Entity\GroupCenter;
use Chill\MainBundle\Entity\User;
use Doctrine\ORM\EntityManagerInterface;
use Doctrine\ORM\EntityRepository;
use Doctrine\ORM\NoResultException;
use Doctrine\ORM\Query\ResultSetMapping;
use Doctrine\ORM\Query\ResultSetMappingBuilder;
use Doctrine\ORM\QueryBuilder;
@@ -143,11 +144,15 @@ final class UserRepository implements UserRepositoryInterface
return $this->repository->findOneBy($criteria, $orderBy);
}
public function findOneByUsernameOrEmail(string $pattern)
public function findOneByUsernameOrEmail(string $pattern): ?User
{
$qb = $this->queryByUsernameOrEmail($pattern);
$qb = $this->queryByUsernameOrEmail($pattern)->select('u');
return $qb->getQuery()->getSingleResult();
try {
return $qb->getQuery()->getSingleResult();
} catch (NoResultException $e) {
return null;
}
}
/**

View File

@@ -55,7 +55,7 @@ interface UserRepositoryInterface extends ObjectRepository
public function findOneBy(array $criteria, ?array $orderBy = null): ?User;
public function findOneByUsernameOrEmail(string $pattern);
public function findOneByUsernameOrEmail(string $pattern): ?User;
/**
* Get the users having a specific flags.