mirror/Part-DB.Part-DB-server
1
0
Fork 1
mirror of https://github.com/Part-DB/Part-DB-server.git synced 2025-06-24 18:58:46 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed errors caused by change on how setParameters on query builder works

Browse source 
We replaced them by individual setParameter calls as this seems to be the easiest way to fix this
This commit is contained in:
Jan Böhmer 2024-06-10 00:08:53 +02:00
parent 5eb29746af
commit 1830e9da3d
2 changed files with 15 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

29
src/Repository/LogEntryRepository.php
View file

@ -85,10 +85,8 @@ class LogEntryRepository extends DBElementRepository
->orderBy('log.timestamp', 'DESC') ->orderBy('log.timestamp', 'DESC')
->setMaxResults(1); ->setMaxResults(1);
$qb->setParameters([ $qb->setParameter('target_type', LogTargetType::fromElementClass($class));
'target_type' => LogTargetType::fromElementClass($class), $qb->setParameter('target_id', $id);
'target_id' => $id,
]);
$query = $qb->getQuery(); $query = $qb->getQuery();
@ -121,11 +119,10 @@ class LogEntryRepository extends DBElementRepository
->andWhere('log.timestamp >= :until') ->andWhere('log.timestamp >= :until')
->orderBy('log.timestamp', 'DESC'); ->orderBy('log.timestamp', 'DESC');
$qb->setParameters([ $qb->setParameter('target_type', LogTargetType::fromElementClass($element));
'target_type' => LogTargetType::fromElementClass($element), $qb->setParameter('target_id', $element->getID());
'target_id' => $element->getID(), $qb->setParameter('until', $until);
'until' => $until,
]);
$query = $qb->getQuery(); $query = $qb->getQuery();
@ -147,11 +144,9 @@ class LogEntryRepository extends DBElementRepository
->andWhere('log.timestamp >= :until') ->andWhere('log.timestamp >= :until')
->orderBy('log.timestamp', 'DESC'); ->orderBy('log.timestamp', 'DESC');
$qb->setParameters([ $qb->setParameter('target_type', LogTargetType::fromElementClass($element));
'target_type' => LogTargetType::fromElementClass($element), $qb->setParameter('target_id', $element->getID());
'target_id' => $element->getID(), $qb->setParameter('until', $timestamp);
'until' => $timestamp,
]);
$query = $qb->getQuery(); $query = $qb->getQuery();
$count = $query->getSingleScalarResult(); $count = $query->getSingleScalarResult();
@ -232,10 +227,8 @@ class LogEntryRepository extends DBElementRepository
->andWhere('log.target_id = :target_id') ->andWhere('log.target_id = :target_id')
->orderBy('log.timestamp', 'DESC'); ->orderBy('log.timestamp', 'DESC');
$qb->setParameters([ $qb->setParameter('target_type', LogTargetType::fromElementClass($element));
'target_type' => LogTargetType::fromElementClass($element), $qb->setParameter('target_id', $element->getID());
'target_id' => $element->getID(),
]);
$query = $qb->getQuery(); $query = $qb->getQuery();
$query->setMaxResults(1); $query->setMaxResults(1);

8
src/Repository/UserRepository.php
View file

@ -23,7 +23,9 @@ declare(strict_types=1);
namespace App\Repository; namespace App\Repository;
use App\Entity\UserSystem\User; use App\Entity\UserSystem\User;
use Doctrine\Common\Collections\ArrayCollection;
use Doctrine\ORM\NonUniqueResultException; use Doctrine\ORM\NonUniqueResultException;
use Doctrine\ORM\Query\Parameter;
use Symfony\Component\Security\Core\User\PasswordAuthenticatedUserInterface; use Symfony\Component\Security\Core\User\PasswordAuthenticatedUserInterface;
use Symfony\Component\Security\Core\User\PasswordUpgraderInterface; use Symfony\Component\Security\Core\User\PasswordUpgraderInterface;
use Symfony\Component\Security\Core\User\UserInterface; use Symfony\Component\Security\Core\User\UserInterface;
@ -97,10 +99,8 @@ final class UserRepository extends NamedDBElementRepository implements PasswordU
->where('u.name = (:name)') ->where('u.name = (:name)')
->orWhere('u.email = (:email)'); ->orWhere('u.email = (:email)');
$qb->setParameters([ $qb->setParameter('email', $name_or_password);
'email' => $name_or_password, $qb->setParameter('name', $name_or_password);
'name' => $name_or_password,
]);
try { try {
return $qb->getQuery()->getOneOrNullResult(); return $qb->getQuery()->getOneOrNullResult();