From 69d41f9d466d1728d1d72bc5ed828e8e64cd1746 Mon Sep 17 00:00:00 2001 From: Finne Fortuin Date: Fri, 12 Aug 2022 11:54:52 +0200 Subject: [PATCH 1/3] allow null return values --- Entity/UserInterface.php | 2 +- Entity/WidgetUser.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Entity/UserInterface.php b/Entity/UserInterface.php index 1e65ca1..72ea591 100644 --- a/Entity/UserInterface.php +++ b/Entity/UserInterface.php @@ -18,5 +18,5 @@ */ interface UserInterface { - public function getId(): int; + public function getId(): ?int; } diff --git a/Entity/WidgetUser.php b/Entity/WidgetUser.php index ddfd4bc..b3df16d 100644 --- a/Entity/WidgetUser.php +++ b/Entity/WidgetUser.php @@ -45,7 +45,7 @@ class WidgetUser /** * Get id. */ - public function getId(): int + public function getId(): ?int { return $this->id; } @@ -57,7 +57,7 @@ public function setConfig(array $config): self return $this; } - public function getConfig(): array + public function getConfig(): ?array { return $this->config; } From 6a7ff0afab0139f1d4dc70e716e044104c661099 Mon Sep 17 00:00:00 2001 From: Finne Fortuin Date: Fri, 12 Aug 2022 12:08:45 +0200 Subject: [PATCH 2/3] fix class WidgetUser reference --- Widget/WidgetBuilder.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Widget/WidgetBuilder.php b/Widget/WidgetBuilder.php index f8d9102..074a1d3 100644 --- a/Widget/WidgetBuilder.php +++ b/Widget/WidgetBuilder.php @@ -13,6 +13,7 @@ use Doctrine\ORM\EntityManagerInterface; use Pd\WidgetBundle\Builder\ItemInterface; +use Pd\WidgetBundle\Entity\WidgetUser; use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface; /** @@ -115,7 +116,7 @@ private function loadUserConfig(): void { if (!$this->widgetConfig) { $config = $this->entityManager - ->getRepository('PdWidgetBundle:WidgetUser') + ->getRepository(WidgetUser::class) ->findOneBy([ 'owner' => $this->tokenStorage->getToken()->getUser(), ]); From c1af9af940f85eaae23ae4119dadb67d49fdd10c Mon Sep 17 00:00:00 2001 From: Finne Fortuin Date: Tue, 14 May 2024 14:22:05 +0200 Subject: [PATCH 3/3] PHP 8 attributes to use with Doctrine --- Entity/WidgetUser.php | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/Entity/WidgetUser.php b/Entity/WidgetUser.php index b3df16d..223cbdd 100644 --- a/Entity/WidgetUser.php +++ b/Entity/WidgetUser.php @@ -11,7 +11,9 @@ namespace Pd\WidgetBundle\Entity; +use Doctrine\DBAL\Types\Types; use Doctrine\ORM\Mapping as ORM; +use Pd\WidgetBundle\Repository\WidgetUserRepository; /** * Widget Private User Data. @@ -22,6 +24,9 @@ * * @author Ramazan APAYDIN */ +#[ORM\Entity(repositoryClass: WidgetUserRepository::class)] +#[ORM\Table(name: 'widget_user')] +#[ORM\Cache(usage: 'NONSTRICT_READ_WRITE')] class WidgetUser { /** @@ -29,17 +34,23 @@ class WidgetUser * @ORM\GeneratedValue * @ORM\Column(type="integer") */ + #[ORM\Id] + #[ORM\GeneratedValue] + #[ORM\Column(type: Types::INTEGER)] private $id; /** * @ORM\Column(type="array") */ + #[ORM\Column(type: Types::ARRAY)] private $config; /** * @ORM\OneToOne(targetEntity="UserInterface") * @ORM\JoinColumn(referencedColumnName="id", unique=true, onDelete="CASCADE") */ + #[ORM\OneToOne(targetEntity: UserInterface::class)] + #[ORM\JoinColumn(referencedColumnName: 'id', unique: true, onDelete: 'CASCADE')] private $owner; /**