From fe42298af624c904578c880f430efbc33af21872 Mon Sep 17 00:00:00 2001 From: Troels Ugilt Jensen <6103205+tuj@users.noreply.github.com> Date: Thu, 9 Apr 2026 16:18:52 +0200 Subject: [PATCH 1/2] 6871: Added extra lazy to all collections doctrine mappings --- src/Entity/ScreenLayout.php | 4 ++-- src/Entity/ScreenLayoutRegions.php | 4 ++-- src/Entity/Template.php | 2 +- src/Entity/Tenant.php | 2 +- src/Entity/Tenant/AbstractTenantScopedEntity.php | 2 +- src/Entity/Tenant/Feed.php | 2 +- src/Entity/Tenant/FeedSource.php | 2 +- src/Entity/Tenant/Media.php | 2 +- src/Entity/Tenant/Playlist.php | 10 +++++----- src/Entity/Tenant/PlaylistScreenRegion.php | 6 +++--- src/Entity/Tenant/PlaylistSlide.php | 4 ++-- src/Entity/Tenant/Schedule.php | 2 +- src/Entity/Tenant/Screen.php | 8 ++++---- src/Entity/Tenant/ScreenCampaign.php | 4 ++-- src/Entity/Tenant/ScreenGroup.php | 4 ++-- src/Entity/Tenant/ScreenGroupCampaign.php | 4 ++-- src/Entity/Tenant/Slide.php | 6 +++--- src/Entity/Tenant/Theme.php | 2 +- src/Entity/Traits/MultiTenantTrait.php | 2 +- src/Entity/User.php | 2 +- src/Entity/UserRoleTenant.php | 4 ++-- 21 files changed, 39 insertions(+), 39 deletions(-) diff --git a/src/Entity/ScreenLayout.php b/src/Entity/ScreenLayout.php index 89b66e5af..ca235edf7 100644 --- a/src/Entity/ScreenLayout.php +++ b/src/Entity/ScreenLayout.php @@ -33,13 +33,13 @@ class ScreenLayout extends AbstractBaseEntity implements MultiTenantInterface, R /** * @var Collection */ - #[ORM\OneToMany(targetEntity: Screen::class, mappedBy: 'screenLayout')] + #[ORM\OneToMany(mappedBy: 'screenLayout', targetEntity: Screen::class, fetch: 'EXTRA_LAZY')] private Collection $screens; /** * @var Collection */ - #[ORM\OneToMany(targetEntity: ScreenLayoutRegions::class, mappedBy: 'screenLayout')] + #[ORM\OneToMany(targetEntity: ScreenLayoutRegions::class, fetch: 'EXTRA_LAZY', mappedBy: 'screenLayout')] private Collection $regions; public function __construct() diff --git a/src/Entity/ScreenLayoutRegions.php b/src/Entity/ScreenLayoutRegions.php index 0c5466511..6c4bb3cff 100644 --- a/src/Entity/ScreenLayoutRegions.php +++ b/src/Entity/ScreenLayoutRegions.php @@ -35,13 +35,13 @@ class ScreenLayoutRegions extends AbstractBaseEntity implements MultiTenantInter #[Groups(['read'])] private ?string $type = null; - #[ORM\ManyToOne(targetEntity: ScreenLayout::class, inversedBy: 'regions')] + #[ORM\ManyToOne(targetEntity: ScreenLayout::class, fetch: 'EXTRA_LAZY', inversedBy: 'regions')] private ?ScreenLayout $screenLayout = null; /** * @var Collection */ - #[ORM\OneToMany(targetEntity: PlaylistScreenRegion::class, cascade: ['persist', 'remove'], mappedBy: 'region', orphanRemoval: true)] + #[ORM\OneToMany(targetEntity: PlaylistScreenRegion::class, fetch: 'EXTRA_LAZY', cascade: ['persist', 'remove'], mappedBy: 'region', orphanRemoval: true)] private Collection $playlistScreenRegions; public function __construct() diff --git a/src/Entity/Template.php b/src/Entity/Template.php index cae53c7e4..9eea0f8dd 100644 --- a/src/Entity/Template.php +++ b/src/Entity/Template.php @@ -30,7 +30,7 @@ class Template extends AbstractBaseEntity implements MultiTenantInterface, Relat /** * @var Collection */ - #[ORM\OneToMany(targetEntity: Slide::class, mappedBy: 'template')] + #[ORM\OneToMany(mappedBy: 'template', targetEntity: Slide::class, fetch: 'EXTRA_LAZY')] private Collection $slides; public function __construct() diff --git a/src/Entity/Tenant.php b/src/Entity/Tenant.php index 91008f673..4a486763a 100644 --- a/src/Entity/Tenant.php +++ b/src/Entity/Tenant.php @@ -22,7 +22,7 @@ class Tenant extends AbstractBaseEntity implements \JsonSerializable /** * @var Collection */ - #[ORM\OneToMany(targetEntity: UserRoleTenant::class, mappedBy: 'tenant', orphanRemoval: true)] + #[ORM\OneToMany(mappedBy: 'tenant', targetEntity: UserRoleTenant::class, fetch: 'EXTRA_LAZY', orphanRemoval: true)] private Collection $userRoleTenants; #[ORM\Column(type: \Doctrine\DBAL\Types\Types::STRING, nullable: true)] diff --git a/src/Entity/Tenant/AbstractTenantScopedEntity.php b/src/Entity/Tenant/AbstractTenantScopedEntity.php index 03edc1f14..f0b5a9a6f 100644 --- a/src/Entity/Tenant/AbstractTenantScopedEntity.php +++ b/src/Entity/Tenant/AbstractTenantScopedEntity.php @@ -13,7 +13,7 @@ #[ORM\HasLifecycleCallbacks] abstract class AbstractTenantScopedEntity extends AbstractBaseEntity implements TenantScopedEntityInterface { - #[ORM\ManyToOne(targetEntity: Tenant::class)] + #[ORM\ManyToOne(targetEntity: Tenant::class, fetch: 'EXTRA_LAZY')] #[ORM\JoinColumn(nullable: false)] private Tenant $tenant; diff --git a/src/Entity/Tenant/Feed.php b/src/Entity/Tenant/Feed.php index 4c7ed2cd6..3ca9fce07 100644 --- a/src/Entity/Tenant/Feed.php +++ b/src/Entity/Tenant/Feed.php @@ -16,7 +16,7 @@ class Feed extends AbstractTenantScopedEntity implements RelationsChecksumInterf { use RelationsChecksumTrait; - #[ORM\ManyToOne(targetEntity: FeedSource::class, inversedBy: 'feeds')] + #[ORM\ManyToOne(targetEntity: FeedSource::class, fetch: 'EXTRA_LAZY', inversedBy: 'feeds')] #[ORM\JoinColumn(nullable: false)] private ?FeedSource $feedSource = null; diff --git a/src/Entity/Tenant/FeedSource.php b/src/Entity/Tenant/FeedSource.php index b580bfe7d..d730b13a4 100644 --- a/src/Entity/Tenant/FeedSource.php +++ b/src/Entity/Tenant/FeedSource.php @@ -29,7 +29,7 @@ class FeedSource extends AbstractTenantScopedEntity implements RelationsChecksum /** * @var Collection */ - #[ORM\OneToMany(targetEntity: Feed::class, mappedBy: 'feedSource', orphanRemoval: true)] + #[ORM\OneToMany(mappedBy: 'feedSource', targetEntity: Feed::class, fetch: 'EXTRA_LAZY', orphanRemoval: true)] private Collection $feeds; #[ORM\Column(type: \Doctrine\DBAL\Types\Types::STRING, length: 255)] diff --git a/src/Entity/Tenant/Media.php b/src/Entity/Tenant/Media.php index 442ccade6..7ba0883f5 100644 --- a/src/Entity/Tenant/Media.php +++ b/src/Entity/Tenant/Media.php @@ -52,7 +52,7 @@ class Media extends AbstractTenantScopedEntity implements RelationsChecksumInter /** * @var Collection */ - #[ORM\ManyToMany(targetEntity: Slide::class, mappedBy: 'media')] + #[ORM\ManyToMany(targetEntity: Slide::class, mappedBy: 'media', fetch: 'EXTRA_LAZY')] private Collection $slides; public function __construct() diff --git a/src/Entity/Tenant/Playlist.php b/src/Entity/Tenant/Playlist.php index d565ff84a..4504cbc85 100644 --- a/src/Entity/Tenant/Playlist.php +++ b/src/Entity/Tenant/Playlist.php @@ -31,32 +31,32 @@ class Playlist extends AbstractTenantScopedEntity implements MultiTenantInterfac /** * @var Collection */ - #[ORM\OneToMany(mappedBy: 'campaign', targetEntity: ScreenCampaign::class, orphanRemoval: true)] + #[ORM\OneToMany(mappedBy: 'campaign', targetEntity: ScreenCampaign::class, fetch: 'EXTRA_LAZY', orphanRemoval: true)] private Collection $screenCampaigns; /** * @var Collection */ - #[ORM\OneToMany(mappedBy: 'campaign', targetEntity: ScreenGroupCampaign::class, orphanRemoval: true)] + #[ORM\OneToMany(mappedBy: 'campaign', targetEntity: ScreenGroupCampaign::class, fetch: 'EXTRA_LAZY', orphanRemoval: true)] private Collection $screenGroupCampaigns; /** * @var Collection */ - #[ORM\OneToMany(mappedBy: 'playlist', targetEntity: PlaylistScreenRegion::class, orphanRemoval: true)] + #[ORM\OneToMany(mappedBy: 'playlist', targetEntity: PlaylistScreenRegion::class, fetch: 'EXTRA_LAZY', orphanRemoval: true)] private Collection $playlistScreenRegions; /** * @var Collection */ - #[ORM\OneToMany(mappedBy: 'playlist', targetEntity: PlaylistSlide::class, orphanRemoval: true)] + #[ORM\OneToMany(mappedBy: 'playlist', targetEntity: PlaylistSlide::class, fetch: 'EXTRA_LAZY', orphanRemoval: true)] #[ORM\OrderBy(['weight' => Order::Ascending->value])] private Collection $playlistSlides; /** * @var Collection */ - #[ORM\OneToMany(mappedBy: 'playlist', targetEntity: Schedule::class, cascade: ['persist'], orphanRemoval: true)] + #[ORM\OneToMany(mappedBy: 'playlist', targetEntity: Schedule::class, cascade: ['persist'], fetch: 'EXTRA_LAZY', orphanRemoval: true)] private Collection $schedules; public function __construct() diff --git a/src/Entity/Tenant/PlaylistScreenRegion.php b/src/Entity/Tenant/PlaylistScreenRegion.php index 97a7a92b8..c801d7859 100644 --- a/src/Entity/Tenant/PlaylistScreenRegion.php +++ b/src/Entity/Tenant/PlaylistScreenRegion.php @@ -17,15 +17,15 @@ class PlaylistScreenRegion extends AbstractTenantScopedEntity implements Relatio { use RelationsChecksumTrait; - #[ORM\ManyToOne(targetEntity: Playlist::class, inversedBy: 'playlistScreenRegions')] + #[ORM\ManyToOne(targetEntity: Playlist::class, fetch: 'EXTRA_LAZY', inversedBy: 'playlistScreenRegions')] #[ORM\JoinColumn(nullable: false)] private ?Playlist $playlist = null; - #[ORM\ManyToOne(targetEntity: Screen::class, inversedBy: 'playlistScreenRegions')] + #[ORM\ManyToOne(targetEntity: Screen::class, fetch: 'EXTRA_LAZY', inversedBy: 'playlistScreenRegions')] #[ORM\JoinColumn(nullable: false)] private ?Screen $screen = null; - #[ORM\ManyToOne(targetEntity: ScreenLayoutRegions::class, inversedBy: 'playlistScreenRegions')] + #[ORM\ManyToOne(targetEntity: ScreenLayoutRegions::class, fetch: 'EXTRA_LAZY', inversedBy: 'playlistScreenRegions')] #[ORM\JoinColumn(nullable: false)] private ?ScreenLayoutRegions $region = null; diff --git a/src/Entity/Tenant/PlaylistSlide.php b/src/Entity/Tenant/PlaylistSlide.php index ae8f0a1da..a167643b1 100644 --- a/src/Entity/Tenant/PlaylistSlide.php +++ b/src/Entity/Tenant/PlaylistSlide.php @@ -15,11 +15,11 @@ class PlaylistSlide extends AbstractTenantScopedEntity implements RelationsCheck { use RelationsChecksumTrait; - #[ORM\ManyToOne(targetEntity: Playlist::class, inversedBy: 'playlistSlides')] + #[ORM\ManyToOne(targetEntity: Playlist::class, fetch: 'EXTRA_LAZY', inversedBy: 'playlistSlides')] #[ORM\JoinColumn(nullable: false)] private Playlist $playlist; - #[ORM\ManyToOne(targetEntity: Slide::class, inversedBy: 'playlistSlides')] + #[ORM\ManyToOne(targetEntity: Slide::class, fetch: 'EXTRA_LAZY', inversedBy: 'playlistSlides')] #[ORM\JoinColumn(nullable: false)] private Slide $slide; diff --git a/src/Entity/Tenant/Schedule.php b/src/Entity/Tenant/Schedule.php index c0789a771..20d9b1707 100644 --- a/src/Entity/Tenant/Schedule.php +++ b/src/Entity/Tenant/Schedule.php @@ -17,7 +17,7 @@ class Schedule extends AbstractTenantScopedEntity #[ORM\Column(type: \Doctrine\DBAL\Types\Types::INTEGER)] private int $duration = 0; - #[ORM\ManyToOne(targetEntity: Playlist::class, inversedBy: 'schedules')] + #[ORM\ManyToOne(targetEntity: Playlist::class, fetch: 'EXTRA_LAZY', inversedBy: 'schedules')] #[ORM\JoinColumn(nullable: false)] private ?Playlist $playlist = null; diff --git a/src/Entity/Tenant/Screen.php b/src/Entity/Tenant/Screen.php index 9fde5553e..7786f1d1d 100644 --- a/src/Entity/Tenant/Screen.php +++ b/src/Entity/Tenant/Screen.php @@ -36,7 +36,7 @@ class Screen extends AbstractTenantScopedEntity implements RelationsChecksumInte #[ORM\Column(type: \Doctrine\DBAL\Types\Types::BOOLEAN, nullable: true)] private ?bool $enableColorSchemeChange = null; - #[ORM\ManyToOne(targetEntity: ScreenLayout::class, inversedBy: 'screens')] + #[ORM\ManyToOne(targetEntity: ScreenLayout::class, fetch: 'EXTRA_LAZY', inversedBy: 'screens')] #[ORM\JoinColumn(nullable: false)] private ScreenLayout $screenLayout; @@ -46,20 +46,20 @@ class Screen extends AbstractTenantScopedEntity implements RelationsChecksumInte /** * @var Collection */ - #[ORM\OneToMany(mappedBy: 'screen', targetEntity: ScreenCampaign::class, orphanRemoval: true)] + #[ORM\OneToMany(mappedBy: 'screen', targetEntity: ScreenCampaign::class, fetch: 'EXTRA_LAZY', orphanRemoval: true)] private Collection $screenCampaigns; /** * @var Collection */ - #[ORM\OneToMany(mappedBy: 'screen', targetEntity: PlaylistScreenRegion::class, cascade: ['persist', 'remove'], orphanRemoval: true)] + #[ORM\OneToMany(mappedBy: 'screen', targetEntity: PlaylistScreenRegion::class, cascade: ['persist', 'remove'], fetch: 'EXTRA_LAZY', orphanRemoval: true)] #[ORM\OrderBy(['weight' => \Doctrine\Common\Collections\Order::Ascending->value])] private Collection $playlistScreenRegions; /** * @var Collection */ - #[ORM\ManyToMany(targetEntity: ScreenGroup::class, mappedBy: 'screens')] + #[ORM\ManyToMany(targetEntity: ScreenGroup::class, mappedBy: 'screens', fetch: 'EXTRA_LAZY')] private Collection $screenGroups; public function __construct() diff --git a/src/Entity/Tenant/ScreenCampaign.php b/src/Entity/Tenant/ScreenCampaign.php index 1101cbf31..eb70e78f3 100644 --- a/src/Entity/Tenant/ScreenCampaign.php +++ b/src/Entity/Tenant/ScreenCampaign.php @@ -15,11 +15,11 @@ class ScreenCampaign extends AbstractTenantScopedEntity implements RelationsChec { use RelationsChecksumTrait; - #[ORM\ManyToOne(targetEntity: Playlist::class, inversedBy: 'screenCampaigns')] + #[ORM\ManyToOne(targetEntity: Playlist::class, fetch: 'EXTRA_LAZY', inversedBy: 'screenCampaigns')] #[ORM\JoinColumn(nullable: false)] private Playlist $campaign; - #[ORM\ManyToOne(targetEntity: Screen::class, inversedBy: 'screenCampaigns')] + #[ORM\ManyToOne(targetEntity: Screen::class, fetch: 'EXTRA_LAZY', inversedBy: 'screenCampaigns')] #[ORM\JoinColumn(nullable: false)] private Screen $screen; diff --git a/src/Entity/Tenant/ScreenGroup.php b/src/Entity/Tenant/ScreenGroup.php index 228ebe82d..23fa34646 100644 --- a/src/Entity/Tenant/ScreenGroup.php +++ b/src/Entity/Tenant/ScreenGroup.php @@ -22,13 +22,13 @@ class ScreenGroup extends AbstractTenantScopedEntity implements RelationsChecksu /** * @var Collection */ - #[ORM\OneToMany(mappedBy: 'screenGroup', targetEntity: ScreenGroupCampaign::class, orphanRemoval: true)] + #[ORM\OneToMany(mappedBy: 'screenGroup', targetEntity: ScreenGroupCampaign::class, fetch: 'EXTRA_LAZY', orphanRemoval: true)] private Collection $screenGroupCampaigns; /** * @var Collection */ - #[ORM\ManyToMany(targetEntity: Screen::class, inversedBy: 'screenGroups')] + #[ORM\ManyToMany(targetEntity: Screen::class, inversedBy: 'screenGroups', fetch: 'EXTRA_LAZY')] private Collection $screens; public function __construct() diff --git a/src/Entity/Tenant/ScreenGroupCampaign.php b/src/Entity/Tenant/ScreenGroupCampaign.php index 8337d3795..680bafefc 100644 --- a/src/Entity/Tenant/ScreenGroupCampaign.php +++ b/src/Entity/Tenant/ScreenGroupCampaign.php @@ -15,11 +15,11 @@ class ScreenGroupCampaign extends AbstractTenantScopedEntity implements Relation { use RelationsChecksumTrait; - #[ORM\ManyToOne(targetEntity: Playlist::class, inversedBy: 'screenGroupCampaigns')] + #[ORM\ManyToOne(targetEntity: Playlist::class, fetch: 'EXTRA_LAZY', inversedBy: 'screenGroupCampaigns')] #[ORM\JoinColumn(nullable: false)] private Playlist $campaign; - #[ORM\ManyToOne(targetEntity: ScreenGroup::class, inversedBy: 'screenGroupCampaigns')] + #[ORM\ManyToOne(targetEntity: ScreenGroup::class, fetch: 'EXTRA_LAZY', inversedBy: 'screenGroupCampaigns')] #[ORM\JoinColumn(nullable: false)] private ScreenGroup $screenGroup; diff --git a/src/Entity/Tenant/Slide.php b/src/Entity/Tenant/Slide.php index 82e1fbd7f..f11cd6d33 100644 --- a/src/Entity/Tenant/Slide.php +++ b/src/Entity/Tenant/Slide.php @@ -31,18 +31,18 @@ class Slide extends AbstractTenantScopedEntity implements RelationsChecksumInter #[ORM\Column(type: \Doctrine\DBAL\Types\Types::JSON, nullable: true)] private array $templateOptions = []; - #[ORM\ManyToOne(targetEntity: Template::class, inversedBy: 'slides')] + #[ORM\ManyToOne(targetEntity: Template::class, fetch: 'EXTRA_LAZY', inversedBy: 'slides')] #[ORM\JoinColumn(nullable: false)] private ?Template $template = null; - #[ORM\ManyToOne(targetEntity: Theme::class, inversedBy: 'slides')] + #[ORM\ManyToOne(targetEntity: Theme::class, fetch: 'EXTRA_LAZY', inversedBy: 'slides')] #[ORM\JoinColumn(onDelete: 'SET NULL')] private ?Theme $theme = null; /** * @var Collection */ - #[ORM\ManyToMany(targetEntity: Media::class, inversedBy: 'slides')] + #[ORM\ManyToMany(targetEntity: Media::class, inversedBy: 'slides', fetch: 'EXTRA_LAZY')] private Collection $media; /** diff --git a/src/Entity/Tenant/Theme.php b/src/Entity/Tenant/Theme.php index 915e48c4d..a8f8ebdf5 100644 --- a/src/Entity/Tenant/Theme.php +++ b/src/Entity/Tenant/Theme.php @@ -29,7 +29,7 @@ class Theme extends AbstractTenantScopedEntity implements RelationsChecksumInter /** * @var Collection */ - #[ORM\OneToMany(mappedBy: 'theme', targetEntity: Slide::class)] + #[ORM\OneToMany(mappedBy: 'theme', targetEntity: Slide::class, fetch: 'EXTRA_LAZY')] private Collection $slides; public function __construct() diff --git a/src/Entity/Traits/MultiTenantTrait.php b/src/Entity/Traits/MultiTenantTrait.php index f05310a44..b99ce2eec 100644 --- a/src/Entity/Traits/MultiTenantTrait.php +++ b/src/Entity/Traits/MultiTenantTrait.php @@ -13,7 +13,7 @@ trait MultiTenantTrait /** * @var Collection */ - #[ORM\ManyToMany(targetEntity: Tenant::class)] + #[ORM\ManyToMany(targetEntity: Tenant::class, fetch: 'EXTRA_LAZY')] private Collection $tenants; /** diff --git a/src/Entity/User.php b/src/Entity/User.php index 6f5b191a9..53b6fdba7 100644 --- a/src/Entity/User.php +++ b/src/Entity/User.php @@ -42,7 +42,7 @@ class User extends AbstractBaseEntity implements UserInterface, PasswordAuthenti /** * @var Collection */ - #[ORM\OneToMany(targetEntity: UserRoleTenant::class, mappedBy: 'user', cascade: ['persist', 'remove'], orphanRemoval: true)] + #[ORM\OneToMany(mappedBy: 'user', targetEntity: UserRoleTenant::class, cascade: ['persist', 'remove'], fetch: 'EXTRA_LAZY', orphanRemoval: true)] private Collection $userRoleTenants; #[ORM\Column(type: Types::STRING)] diff --git a/src/Entity/UserRoleTenant.php b/src/Entity/UserRoleTenant.php index b94bc1005..ef6533b9a 100644 --- a/src/Entity/UserRoleTenant.php +++ b/src/Entity/UserRoleTenant.php @@ -12,11 +12,11 @@ #[ORM\Entity(repositoryClass: UserRoleTenantRepository::class)] class UserRoleTenant extends AbstractBaseEntity implements \JsonSerializable { - #[ORM\ManyToOne(targetEntity: User::class, inversedBy: 'userRoleTenants')] + #[ORM\ManyToOne(targetEntity: User::class, fetch: 'EXTRA_LAZY', inversedBy: 'userRoleTenants')] #[ORM\JoinColumn(nullable: false)] private ?User $user = null; - #[ORM\ManyToOne(targetEntity: Tenant::class, inversedBy: 'userRoleTenants')] + #[ORM\ManyToOne(targetEntity: Tenant::class, fetch: 'EXTRA_LAZY', inversedBy: 'userRoleTenants')] #[ORM\JoinColumn(nullable: false)] private ?Tenant $tenant = null; From f48a6076a1b310229156fc80d7d5929766d39a8a Mon Sep 17 00:00:00 2001 From: Troels Ugilt Jensen <6103205+tuj@users.noreply.github.com> Date: Fri, 10 Apr 2026 17:59:56 +0200 Subject: [PATCH 2/2] 6871: Removed fetch EXTRA_LAZY from ManyToOne associations --- src/Entity/ScreenLayoutRegions.php | 2 +- src/Entity/Tenant/AbstractTenantScopedEntity.php | 2 +- src/Entity/Tenant/Feed.php | 2 +- src/Entity/Tenant/PlaylistScreenRegion.php | 6 +++--- src/Entity/Tenant/PlaylistSlide.php | 4 ++-- src/Entity/Tenant/Schedule.php | 2 +- src/Entity/Tenant/Screen.php | 2 +- src/Entity/Tenant/ScreenCampaign.php | 4 ++-- src/Entity/Tenant/ScreenGroupCampaign.php | 4 ++-- src/Entity/Tenant/Slide.php | 4 ++-- src/Entity/UserRoleTenant.php | 4 ++-- 11 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/Entity/ScreenLayoutRegions.php b/src/Entity/ScreenLayoutRegions.php index 6c4bb3cff..a95711a2b 100644 --- a/src/Entity/ScreenLayoutRegions.php +++ b/src/Entity/ScreenLayoutRegions.php @@ -35,7 +35,7 @@ class ScreenLayoutRegions extends AbstractBaseEntity implements MultiTenantInter #[Groups(['read'])] private ?string $type = null; - #[ORM\ManyToOne(targetEntity: ScreenLayout::class, fetch: 'EXTRA_LAZY', inversedBy: 'regions')] + #[ORM\ManyToOne(targetEntity: ScreenLayout::class, inversedBy: 'regions')] private ?ScreenLayout $screenLayout = null; /** diff --git a/src/Entity/Tenant/AbstractTenantScopedEntity.php b/src/Entity/Tenant/AbstractTenantScopedEntity.php index f0b5a9a6f..03edc1f14 100644 --- a/src/Entity/Tenant/AbstractTenantScopedEntity.php +++ b/src/Entity/Tenant/AbstractTenantScopedEntity.php @@ -13,7 +13,7 @@ #[ORM\HasLifecycleCallbacks] abstract class AbstractTenantScopedEntity extends AbstractBaseEntity implements TenantScopedEntityInterface { - #[ORM\ManyToOne(targetEntity: Tenant::class, fetch: 'EXTRA_LAZY')] + #[ORM\ManyToOne(targetEntity: Tenant::class)] #[ORM\JoinColumn(nullable: false)] private Tenant $tenant; diff --git a/src/Entity/Tenant/Feed.php b/src/Entity/Tenant/Feed.php index 3ca9fce07..4c7ed2cd6 100644 --- a/src/Entity/Tenant/Feed.php +++ b/src/Entity/Tenant/Feed.php @@ -16,7 +16,7 @@ class Feed extends AbstractTenantScopedEntity implements RelationsChecksumInterf { use RelationsChecksumTrait; - #[ORM\ManyToOne(targetEntity: FeedSource::class, fetch: 'EXTRA_LAZY', inversedBy: 'feeds')] + #[ORM\ManyToOne(targetEntity: FeedSource::class, inversedBy: 'feeds')] #[ORM\JoinColumn(nullable: false)] private ?FeedSource $feedSource = null; diff --git a/src/Entity/Tenant/PlaylistScreenRegion.php b/src/Entity/Tenant/PlaylistScreenRegion.php index c801d7859..97a7a92b8 100644 --- a/src/Entity/Tenant/PlaylistScreenRegion.php +++ b/src/Entity/Tenant/PlaylistScreenRegion.php @@ -17,15 +17,15 @@ class PlaylistScreenRegion extends AbstractTenantScopedEntity implements Relatio { use RelationsChecksumTrait; - #[ORM\ManyToOne(targetEntity: Playlist::class, fetch: 'EXTRA_LAZY', inversedBy: 'playlistScreenRegions')] + #[ORM\ManyToOne(targetEntity: Playlist::class, inversedBy: 'playlistScreenRegions')] #[ORM\JoinColumn(nullable: false)] private ?Playlist $playlist = null; - #[ORM\ManyToOne(targetEntity: Screen::class, fetch: 'EXTRA_LAZY', inversedBy: 'playlistScreenRegions')] + #[ORM\ManyToOne(targetEntity: Screen::class, inversedBy: 'playlistScreenRegions')] #[ORM\JoinColumn(nullable: false)] private ?Screen $screen = null; - #[ORM\ManyToOne(targetEntity: ScreenLayoutRegions::class, fetch: 'EXTRA_LAZY', inversedBy: 'playlistScreenRegions')] + #[ORM\ManyToOne(targetEntity: ScreenLayoutRegions::class, inversedBy: 'playlistScreenRegions')] #[ORM\JoinColumn(nullable: false)] private ?ScreenLayoutRegions $region = null; diff --git a/src/Entity/Tenant/PlaylistSlide.php b/src/Entity/Tenant/PlaylistSlide.php index a167643b1..ae8f0a1da 100644 --- a/src/Entity/Tenant/PlaylistSlide.php +++ b/src/Entity/Tenant/PlaylistSlide.php @@ -15,11 +15,11 @@ class PlaylistSlide extends AbstractTenantScopedEntity implements RelationsCheck { use RelationsChecksumTrait; - #[ORM\ManyToOne(targetEntity: Playlist::class, fetch: 'EXTRA_LAZY', inversedBy: 'playlistSlides')] + #[ORM\ManyToOne(targetEntity: Playlist::class, inversedBy: 'playlistSlides')] #[ORM\JoinColumn(nullable: false)] private Playlist $playlist; - #[ORM\ManyToOne(targetEntity: Slide::class, fetch: 'EXTRA_LAZY', inversedBy: 'playlistSlides')] + #[ORM\ManyToOne(targetEntity: Slide::class, inversedBy: 'playlistSlides')] #[ORM\JoinColumn(nullable: false)] private Slide $slide; diff --git a/src/Entity/Tenant/Schedule.php b/src/Entity/Tenant/Schedule.php index 20d9b1707..c0789a771 100644 --- a/src/Entity/Tenant/Schedule.php +++ b/src/Entity/Tenant/Schedule.php @@ -17,7 +17,7 @@ class Schedule extends AbstractTenantScopedEntity #[ORM\Column(type: \Doctrine\DBAL\Types\Types::INTEGER)] private int $duration = 0; - #[ORM\ManyToOne(targetEntity: Playlist::class, fetch: 'EXTRA_LAZY', inversedBy: 'schedules')] + #[ORM\ManyToOne(targetEntity: Playlist::class, inversedBy: 'schedules')] #[ORM\JoinColumn(nullable: false)] private ?Playlist $playlist = null; diff --git a/src/Entity/Tenant/Screen.php b/src/Entity/Tenant/Screen.php index 7786f1d1d..660f59bc8 100644 --- a/src/Entity/Tenant/Screen.php +++ b/src/Entity/Tenant/Screen.php @@ -36,7 +36,7 @@ class Screen extends AbstractTenantScopedEntity implements RelationsChecksumInte #[ORM\Column(type: \Doctrine\DBAL\Types\Types::BOOLEAN, nullable: true)] private ?bool $enableColorSchemeChange = null; - #[ORM\ManyToOne(targetEntity: ScreenLayout::class, fetch: 'EXTRA_LAZY', inversedBy: 'screens')] + #[ORM\ManyToOne(targetEntity: ScreenLayout::class, inversedBy: 'screens')] #[ORM\JoinColumn(nullable: false)] private ScreenLayout $screenLayout; diff --git a/src/Entity/Tenant/ScreenCampaign.php b/src/Entity/Tenant/ScreenCampaign.php index eb70e78f3..1101cbf31 100644 --- a/src/Entity/Tenant/ScreenCampaign.php +++ b/src/Entity/Tenant/ScreenCampaign.php @@ -15,11 +15,11 @@ class ScreenCampaign extends AbstractTenantScopedEntity implements RelationsChec { use RelationsChecksumTrait; - #[ORM\ManyToOne(targetEntity: Playlist::class, fetch: 'EXTRA_LAZY', inversedBy: 'screenCampaigns')] + #[ORM\ManyToOne(targetEntity: Playlist::class, inversedBy: 'screenCampaigns')] #[ORM\JoinColumn(nullable: false)] private Playlist $campaign; - #[ORM\ManyToOne(targetEntity: Screen::class, fetch: 'EXTRA_LAZY', inversedBy: 'screenCampaigns')] + #[ORM\ManyToOne(targetEntity: Screen::class, inversedBy: 'screenCampaigns')] #[ORM\JoinColumn(nullable: false)] private Screen $screen; diff --git a/src/Entity/Tenant/ScreenGroupCampaign.php b/src/Entity/Tenant/ScreenGroupCampaign.php index 680bafefc..8337d3795 100644 --- a/src/Entity/Tenant/ScreenGroupCampaign.php +++ b/src/Entity/Tenant/ScreenGroupCampaign.php @@ -15,11 +15,11 @@ class ScreenGroupCampaign extends AbstractTenantScopedEntity implements Relation { use RelationsChecksumTrait; - #[ORM\ManyToOne(targetEntity: Playlist::class, fetch: 'EXTRA_LAZY', inversedBy: 'screenGroupCampaigns')] + #[ORM\ManyToOne(targetEntity: Playlist::class, inversedBy: 'screenGroupCampaigns')] #[ORM\JoinColumn(nullable: false)] private Playlist $campaign; - #[ORM\ManyToOne(targetEntity: ScreenGroup::class, fetch: 'EXTRA_LAZY', inversedBy: 'screenGroupCampaigns')] + #[ORM\ManyToOne(targetEntity: ScreenGroup::class, inversedBy: 'screenGroupCampaigns')] #[ORM\JoinColumn(nullable: false)] private ScreenGroup $screenGroup; diff --git a/src/Entity/Tenant/Slide.php b/src/Entity/Tenant/Slide.php index f11cd6d33..335846915 100644 --- a/src/Entity/Tenant/Slide.php +++ b/src/Entity/Tenant/Slide.php @@ -31,11 +31,11 @@ class Slide extends AbstractTenantScopedEntity implements RelationsChecksumInter #[ORM\Column(type: \Doctrine\DBAL\Types\Types::JSON, nullable: true)] private array $templateOptions = []; - #[ORM\ManyToOne(targetEntity: Template::class, fetch: 'EXTRA_LAZY', inversedBy: 'slides')] + #[ORM\ManyToOne(targetEntity: Template::class, inversedBy: 'slides')] #[ORM\JoinColumn(nullable: false)] private ?Template $template = null; - #[ORM\ManyToOne(targetEntity: Theme::class, fetch: 'EXTRA_LAZY', inversedBy: 'slides')] + #[ORM\ManyToOne(targetEntity: Theme::class, inversedBy: 'slides')] #[ORM\JoinColumn(onDelete: 'SET NULL')] private ?Theme $theme = null; diff --git a/src/Entity/UserRoleTenant.php b/src/Entity/UserRoleTenant.php index ef6533b9a..b94bc1005 100644 --- a/src/Entity/UserRoleTenant.php +++ b/src/Entity/UserRoleTenant.php @@ -12,11 +12,11 @@ #[ORM\Entity(repositoryClass: UserRoleTenantRepository::class)] class UserRoleTenant extends AbstractBaseEntity implements \JsonSerializable { - #[ORM\ManyToOne(targetEntity: User::class, fetch: 'EXTRA_LAZY', inversedBy: 'userRoleTenants')] + #[ORM\ManyToOne(targetEntity: User::class, inversedBy: 'userRoleTenants')] #[ORM\JoinColumn(nullable: false)] private ?User $user = null; - #[ORM\ManyToOne(targetEntity: Tenant::class, fetch: 'EXTRA_LAZY', inversedBy: 'userRoleTenants')] + #[ORM\ManyToOne(targetEntity: Tenant::class, inversedBy: 'userRoleTenants')] #[ORM\JoinColumn(nullable: false)] private ?Tenant $tenant = null;