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 02:38:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert "Fixed errors that query builder setParameters now expects an ArrayCollection instead of an array"

Browse source 
This reverts commit 78671b0bfe.
This commit is contained in:
Jan Böhmer 2024-06-10 00:04:22 +02:00
parent afb816cc41
commit 5eb29746af
2 changed files with 10 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/Repository/LogEntryRepository.php
View file

@ -30,7 +30,6 @@ use App\Entity\LogSystem\ElementDeletedLogEntry;
use App\Entity\LogSystem\ElementEditedLogEntry; use App\Entity\LogSystem\ElementEditedLogEntry;
use App\Entity\LogSystem\LogTargetType; use App\Entity\LogSystem\LogTargetType;
use App\Entity\UserSystem\User; use App\Entity\UserSystem\User;
use Doctrine\Common\Collections\ArrayCollection;
use RuntimeException; use RuntimeException;
/** /**
@ -86,10 +85,10 @@ class LogEntryRepository extends DBElementRepository
->orderBy('log.timestamp', 'DESC') ->orderBy('log.timestamp', 'DESC')
->setMaxResults(1); ->setMaxResults(1);
$qb->setParameters(new ArrayCollection([ $qb->setParameters([
'target_type' => LogTargetType::fromElementClass($class), 'target_type' => LogTargetType::fromElementClass($class),
'target_id' => $id, 'target_id' => $id,
])); ]);
$query = $qb->getQuery(); $query = $qb->getQuery();
@ -122,11 +121,11 @@ class LogEntryRepository extends DBElementRepository
->andWhere('log.timestamp >= :until') ->andWhere('log.timestamp >= :until')
->orderBy('log.timestamp', 'DESC'); ->orderBy('log.timestamp', 'DESC');
$qb->setParameters(new ArrayCollection([ $qb->setParameters([
'target_type' => LogTargetType::fromElementClass($element), 'target_type' => LogTargetType::fromElementClass($element),
'target_id' => $element->getID(), 'target_id' => $element->getID(),
'until' => $until, 'until' => $until,
])); ]);
$query = $qb->getQuery(); $query = $qb->getQuery();
@ -148,11 +147,11 @@ class LogEntryRepository extends DBElementRepository
->andWhere('log.timestamp >= :until') ->andWhere('log.timestamp >= :until')
->orderBy('log.timestamp', 'DESC'); ->orderBy('log.timestamp', 'DESC');
$qb->setParameters(new ArrayCollection([ $qb->setParameters([
'target_type' => LogTargetType::fromElementClass($element), 'target_type' => LogTargetType::fromElementClass($element),
'target_id' => $element->getID(), 'target_id' => $element->getID(),
'until' => $timestamp, 'until' => $timestamp,
])); ]);
$query = $qb->getQuery(); $query = $qb->getQuery();
$count = $query->getSingleScalarResult(); $count = $query->getSingleScalarResult();
@ -233,10 +232,10 @@ 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(new ArrayCollection([ $qb->setParameters([
'target_type' => LogTargetType::fromElementClass($element), 'target_type' => LogTargetType::fromElementClass($element),
'target_id' => $element->getID(), 'target_id' => $element->getID(),
])); ]);
$query = $qb->getQuery(); $query = $qb->getQuery();
$query->setMaxResults(1); $query->setMaxResults(1);

5
src/Repository/UserRepository.php
View file

@ -23,7 +23,6 @@ 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 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;
@ -98,10 +97,10 @@ 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(new ArrayCollection([ $qb->setParameters([
'email' => $name_or_password, 'email' => $name_or_password,
'name' => $name_or_password, 'name' => $name_or_password,
])); ]);
try { try {
return $qb->getQuery()->getOneOrNullResult(); return $qb->getQuery()->getOneOrNullResult();