Skip to content

Commit 3100b6b

Browse files
committed
4565: Updated PHP requirements
1 parent 68a1c17 commit 3100b6b

15 files changed

+1140
-1068
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ All notable changes to this project will be documented in this file.
88
* Changed to vite 7 and rolldown.
99
* Added ADRs 008 and 009.
1010
* Cleaned up Github Actions workflows.
11+
* Updated PHP dependencies.
1112

1213
### NB! Prior to 3.x the project was split into separate repositories
1314

composer.lock

Lines changed: 1117 additions & 1046 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/Entity/ScreenLayout.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,13 +31,13 @@ class ScreenLayout extends AbstractBaseEntity implements MultiTenantInterface, R
3131
private int $gridColumns = 0;
3232

3333
/**
34-
* @var \Doctrine\Common\Collections\Collection<int, \App\Entity\Tenant\Screen>
34+
* @var Collection<int, Screen>
3535
*/
3636
#[ORM\OneToMany(targetEntity: Screen::class, mappedBy: 'screenLayout')]
3737
private Collection $screens;
3838

3939
/**
40-
* @var \Doctrine\Common\Collections\Collection<int, \App\Entity\ScreenLayoutRegions>
40+
* @var Collection<int, ScreenLayoutRegions>
4141
*/
4242
#[ORM\OneToMany(targetEntity: ScreenLayoutRegions::class, mappedBy: 'screenLayout')]
4343
private Collection $regions;

src/Entity/ScreenLayoutRegions.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ class ScreenLayoutRegions extends AbstractBaseEntity implements MultiTenantInter
3939
private ?ScreenLayout $screenLayout = null;
4040

4141
/**
42-
* @var \Doctrine\Common\Collections\Collection<int, \App\Entity\Tenant\PlaylistScreenRegion>
42+
* @var Collection<int, PlaylistScreenRegion>
4343
*/
4444
#[ORM\OneToMany(targetEntity: PlaylistScreenRegion::class, cascade: ['persist', 'remove'], mappedBy: 'region', orphanRemoval: true)]
4545
private Collection $playlistScreenRegions;

src/Entity/Template.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ class Template extends AbstractBaseEntity implements MultiTenantInterface, Relat
3232
private array $resources = [];
3333

3434
/**
35-
* @var \Doctrine\Common\Collections\Collection<int, \App\Entity\Tenant\Slide>
35+
* @var Collection<int, Slide>
3636
*/
3737
#[ORM\OneToMany(targetEntity: Slide::class, mappedBy: 'template')]
3838
private Collection $slides;

src/Entity/Tenant.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ class Tenant extends AbstractBaseEntity implements \JsonSerializable
2020
private string $tenantKey = '';
2121

2222
/**
23-
* @var \Doctrine\Common\Collections\Collection<int, \App\Entity\UserRoleTenant>
23+
* @var Collection<int, UserRoleTenant>
2424
*/
2525
#[ORM\OneToMany(targetEntity: UserRoleTenant::class, mappedBy: 'tenant', orphanRemoval: true)]
2626
private Collection $userRoleTenants;

src/Entity/Tenant/FeedSource.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ class FeedSource extends AbstractTenantScopedEntity implements RelationsChecksum
2727
private ?array $secrets = [];
2828

2929
/**
30-
* @var \Doctrine\Common\Collections\Collection<int, \App\Entity\Tenant\Feed>
30+
* @var Collection<int, Feed>
3131
*/
3232
#[ORM\OneToMany(targetEntity: Feed::class, mappedBy: 'feedSource', orphanRemoval: true)]
3333
private Collection $feeds;

src/Entity/Tenant/Media.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ class Media extends AbstractTenantScopedEntity implements RelationsChecksumInter
5353
private string $sha = '';
5454

5555
/**
56-
* @var \Doctrine\Common\Collections\Collection<int, \App\Entity\Tenant\Slide>
56+
* @var Collection<int, Slide>
5757
*/
5858
#[ORM\ManyToMany(targetEntity: Slide::class, mappedBy: 'media')]
5959
private Collection $slides;

src/Entity/Tenant/Playlist.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,32 +29,32 @@ class Playlist extends AbstractTenantScopedEntity implements MultiTenantInterfac
2929
private bool $isCampaign = false;
3030

3131
/**
32-
* @var \Doctrine\Common\Collections\Collection<int, \App\Entity\Tenant\ScreenCampaign>
32+
* @var Collection<int, ScreenCampaign>
3333
*/
3434
#[ORM\OneToMany(mappedBy: 'campaign', targetEntity: ScreenCampaign::class, orphanRemoval: true)]
3535
private Collection $screenCampaigns;
3636

3737
/**
38-
* @var \Doctrine\Common\Collections\Collection<int, \App\Entity\Tenant\ScreenGroupCampaign>
38+
* @var Collection<int, ScreenGroupCampaign>
3939
*/
4040
#[ORM\OneToMany(mappedBy: 'campaign', targetEntity: ScreenGroupCampaign::class, orphanRemoval: true)]
4141
private Collection $screenGroupCampaigns;
4242

4343
/**
44-
* @var \Doctrine\Common\Collections\Collection<int, \App\Entity\Tenant\PlaylistScreenRegion>
44+
* @var Collection<int, PlaylistScreenRegion>
4545
*/
4646
#[ORM\OneToMany(mappedBy: 'playlist', targetEntity: PlaylistScreenRegion::class, orphanRemoval: true)]
4747
private Collection $playlistScreenRegions;
4848

4949
/**
50-
* @var \Doctrine\Common\Collections\Collection<int, \App\Entity\Tenant\PlaylistSlide>
50+
* @var Collection<int, PlaylistSlide>
5151
*/
5252
#[ORM\OneToMany(mappedBy: 'playlist', targetEntity: PlaylistSlide::class, orphanRemoval: true)]
5353
#[ORM\OrderBy(['weight' => Order::Ascending->value])]
5454
private Collection $playlistSlides;
5555

5656
/**
57-
* @var \Doctrine\Common\Collections\Collection<int, \App\Entity\Tenant\Schedule>
57+
* @var Collection<int, Schedule>
5858
*/
5959
#[ORM\OneToMany(mappedBy: 'playlist', targetEntity: Schedule::class, cascade: ['persist'], orphanRemoval: true)]
6060
private Collection $schedules;

src/Entity/Tenant/Screen.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,20 +44,20 @@ class Screen extends AbstractTenantScopedEntity implements RelationsChecksumInte
4444
private ?ScreenUser $screenUser = null;
4545

4646
/**
47-
* @var \Doctrine\Common\Collections\Collection<int, \App\Entity\Tenant\ScreenCampaign>
47+
* @var Collection<int, ScreenCampaign>
4848
*/
4949
#[ORM\OneToMany(mappedBy: 'screen', targetEntity: ScreenCampaign::class, orphanRemoval: true)]
5050
private Collection $screenCampaigns;
5151

5252
/**
53-
* @var \Doctrine\Common\Collections\Collection<int, \App\Entity\Tenant\PlaylistScreenRegion>
53+
* @var Collection<int, PlaylistScreenRegion>
5454
*/
5555
#[ORM\OneToMany(mappedBy: 'screen', targetEntity: PlaylistScreenRegion::class, cascade: ['persist', 'remove'], orphanRemoval: true)]
5656
#[ORM\OrderBy(['weight' => \Doctrine\Common\Collections\Order::Ascending->value])]
5757
private Collection $playlistScreenRegions;
5858

5959
/**
60-
* @var \Doctrine\Common\Collections\Collection<int, \App\Entity\Tenant\ScreenGroup>
60+
* @var Collection<int, ScreenGroup>
6161
*/
6262
#[ORM\ManyToMany(targetEntity: ScreenGroup::class, mappedBy: 'screens')]
6363
private Collection $screenGroups;

0 commit comments

Comments
 (0)