DX: fix phpstan errors

This commit is contained in:
2023-02-07 23:03:37 +01:00
parent fa481fd795
commit f57555dab4
11 changed files with 41 additions and 41 deletions

View File

@@ -44,14 +44,7 @@ class UrgencyAggregator implements AggregatorInterface
public function alterQuery(QueryBuilder $qb, $data)
{
$qb->addSelect('cal.urgent AS urgency_aggregator');
$groupBy = $qb->getDQLPart('groupBy');
if (!empty($groupBy)) {
$qb->addGroupBy('urgency_aggregator');
} else {
$qb->groupBy('urgency_aggregator');
}
$qb->addGroupBy('urgency_aggregator');
}
public function applyOn(): string

View File

@@ -49,23 +49,11 @@ class CalendarRangeFilter implements FilterInterface
public function alterQuery(QueryBuilder $qb, $data)
{
$where = $qb->getDQLPart('where');
dump($data);
if ($data['hasCalendarRange']) {
$clause = $qb->expr()->isNotNull('cal.calendarRange');
if (null !== $data['hasCalendarRange']) {
$qb->andWhere($qb->expr()->isNotNull('cal.calendarRange'));
} else {
$clause = $qb->expr()->isNull('cal.calendarRange');
$qb->andWhere($qb->expr()->isNull('cal.calendarRange'));
}
if ($where instanceof Andx) {
$where->add($clause);
} else {
$where = $qb->expr()->andX($clause);
}
$qb->add('where', $where);
}
public function applyOn(): string
@@ -87,6 +75,8 @@ class CalendarRangeFilter implements FilterInterface
public function describeAction($data, $format = 'string'): array
{
$choice = '';
foreach (self::CHOICES as $k => $v) {
if ($v === $data['hasCalendarRange']) {
$choice = $k;

View File

@@ -22,6 +22,9 @@ use Chill\CalendarBundle\Entity\Calendar;
use Chill\CalendarBundle\Messenger\Message\CalendarMessage;
use Chill\CalendarBundle\Messenger\Message\CalendarRemovedMessage;
use Doctrine\ORM\Event\LifecycleEventArgs;
use Doctrine\ORM\Event\PostPersistEventArgs;
use Doctrine\ORM\Event\PostRemoveEventArgs;
use Doctrine\ORM\Event\PostUpdateEventArgs;
use Symfony\Component\Messenger\MessageBusInterface;
use Symfony\Component\Security\Core\Security;
@@ -37,7 +40,7 @@ class CalendarEntityListener
$this->security = $security;
}
public function postPersist(Calendar $calendar, LifecycleEventArgs $args): void
public function postPersist(Calendar $calendar, PostPersistEventArgs $args): void
{
if (!$calendar->preventEnqueueChanges) {
$this->messageBus->dispatch(
@@ -50,7 +53,7 @@ class CalendarEntityListener
}
}
public function postRemove(Calendar $calendar, LifecycleEventArgs $args): void
public function postRemove(Calendar $calendar, PostRemoveEventArgs $args): void
{
if (!$calendar->preventEnqueueChanges) {
$this->messageBus->dispatch(
@@ -62,7 +65,7 @@ class CalendarEntityListener
}
}
public function postUpdate(Calendar $calendar, LifecycleEventArgs $args): void
public function postUpdate(Calendar $calendar, PostUpdateEventArgs $args): void
{
if (!$calendar->preventEnqueueChanges) {
$this->messageBus->dispatch(

View File

@@ -22,6 +22,9 @@ use Chill\CalendarBundle\Entity\CalendarRange;
use Chill\CalendarBundle\Messenger\Message\CalendarRangeMessage;
use Chill\CalendarBundle\Messenger\Message\CalendarRangeRemovedMessage;
use Doctrine\ORM\Event\LifecycleEventArgs;
use Doctrine\ORM\Event\PostPersistEventArgs;
use Doctrine\ORM\Event\PostRemoveEventArgs;
use Doctrine\ORM\Event\PostUpdateEventArgs;
use Symfony\Component\Messenger\MessageBusInterface;
use Symfony\Component\Security\Core\Security;
@@ -37,7 +40,7 @@ class CalendarRangeEntityListener
$this->security = $security;
}
public function postPersist(CalendarRange $calendarRange, LifecycleEventArgs $eventArgs): void
public function postPersist(CalendarRange $calendarRange, PostPersistEventArgs $eventArgs): void
{
if (!$calendarRange->preventEnqueueChanges) {
$this->messageBus->dispatch(
@@ -50,7 +53,7 @@ class CalendarRangeEntityListener
}
}
public function postRemove(CalendarRange $calendarRange, LifecycleEventArgs $eventArgs): void
public function postRemove(CalendarRange $calendarRange, PostRemoveEventArgs $eventArgs): void
{
if (!$calendarRange->preventEnqueueChanges) {
$this->messageBus->dispatch(
@@ -62,7 +65,7 @@ class CalendarRangeEntityListener
}
}
public function postUpdate(CalendarRange $calendarRange, LifecycleEventArgs $eventArgs): void
public function postUpdate(CalendarRange $calendarRange, PostUpdateEventArgs $eventArgs): void
{
if (!$calendarRange->preventEnqueueChanges) {
$this->messageBus->dispatch(

View File

@@ -110,11 +110,11 @@ class CalendarSyncer
$endDate = RemoteEventConverter::convertStringDateWithoutTimezone($new['end']['dateTime']);
if ($startDate->getTimestamp() !== $calendar->getStartDate()->getTimestamp()) {
$calendar->setStartDate($startDate)->setStatus(Calendar::STATUS_MOVED);
$calendar->setStartDate($startDate);
}
if ($endDate->getTimestamp() !== $calendar->getEndDate()->getTimestamp()) {
$calendar->setEndDate($endDate)->setStatus(Calendar::STATUS_MOVED);
$calendar->setEndDate($endDate);
}
$calendar