From 2a28465626e414cc3cd8a285d076b3d92f2ea829 Mon Sep 17 00:00:00 2001 From: lubiana Date: Fri, 16 Aug 2024 11:15:23 +0200 Subject: [PATCH] lint --- src/Entity/FoodOrder.php | 9 ++------- tests/Controller/FoodOrderControllerTest.php | 2 -- tests/Controller/OrderItemControllerTest.php | 7 ++++--- 3 files changed, 6 insertions(+), 12 deletions(-) diff --git a/src/Entity/FoodOrder.php b/src/Entity/FoodOrder.php index 89ccccf..4fe29f5 100644 --- a/src/Entity/FoodOrder.php +++ b/src/Entity/FoodOrder.php @@ -67,15 +67,10 @@ class FoodOrder public function isClosed(): bool { - if ($this->closedAt === null) { + if (! $this->closedAt instanceof DateTimeImmutable) { return false; } - - if ($this->closedAt < new DateTimeImmutable) { - return true; - } - - return false; + return $this->closedAt < new DateTimeImmutable; } public function close(): static diff --git a/tests/Controller/FoodOrderControllerTest.php b/tests/Controller/FoodOrderControllerTest.php index 00b225e..a7c222e 100644 --- a/tests/Controller/FoodOrderControllerTest.php +++ b/tests/Controller/FoodOrderControllerTest.php @@ -192,7 +192,6 @@ final class FoodOrderControllerTest extends DbWebTest $this->manager->persist($order); $this->manager->flush(); - $this->client->request('GET', sprintf('%s%s/open', $this->path, $order->getId())); self::assertResponseRedirects("{$this->path}{$order->getId()}"); $openOrder = $this->repository->find($order->getId()); @@ -209,7 +208,6 @@ final class FoodOrderControllerTest extends DbWebTest $this->manager->persist($order); $this->manager->flush(); - $this->client->request('GET', sprintf('%s%s/close', $this->path, $order->getId())); self::assertResponseRedirects("{$this->path}{$order->getId()}"); $openOrder = $this->repository->find($order->getId()); diff --git a/tests/Controller/OrderItemControllerTest.php b/tests/Controller/OrderItemControllerTest.php index aff847d..1c65fb8 100644 --- a/tests/Controller/OrderItemControllerTest.php +++ b/tests/Controller/OrderItemControllerTest.php @@ -8,6 +8,7 @@ use App\Entity\MenuItem; use App\Entity\OrderItem; use App\Repository\MenuItemRepository; use App\Tests\DbWebTest; +use DateTimeImmutable; use Override; use function sprintf; @@ -66,7 +67,7 @@ final class OrderItemControllerTest extends DbWebTest public function testNewOrderClosed(): void { - $this->order->setClosedAt(new \DateTimeImmutable('-1 Hour')); + $this->order->setClosedAt(new DateTimeImmutable('-1 Hour')); $this->manager->persist($this->order); $this->manager->flush(); @@ -172,7 +173,6 @@ final class OrderItemControllerTest extends DbWebTest self::assertSame(1, $this->repository->count([])); self::assertSame(2, $this->menuItemRepository->count([])); - } public function testEditOrderClosed(): void @@ -182,13 +182,14 @@ final class OrderItemControllerTest extends DbWebTest $orderItem->setExtras('My Extra'); $orderItem->setFoodOrder($this->order); $orderItem->setMenuItem($this->menuItem); + $this->order->close(); $this->manager->persist($orderItem); $this->manager->persist($this->order); $this->manager->flush(); - $crawler = $this->client->request('GET', sprintf('%s%s/edit', $this->path, $orderItem->getId())); + $this->client->request('GET', sprintf('%s%s/edit', $this->path, $orderItem->getId())); self::assertResponseRedirects(sprintf('/food/order/%s', $this->order->getId())); }