Skip to content

Commit b4596b0

Browse files
authored
Merge pull request #463 from os2display/release/2.7.1
Release 2.7.1
2 parents 0d91884 + 0494ead commit b4596b0

9 files changed

Lines changed: 888 additions & 784 deletions

File tree

CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,11 @@ All notable changes to this project will be documented in this file.
44

55
## [Unreleased]
66

7+
## [2.7.1] - 2026-05-26
8+
9+
- [#460](https://github.com/os2display/display-api-service/pull/460)
10+
- Updated bundles.
11+
712
## [2.7.0] - 2026-05-01
813

914
- [#363](https://github.com/os2display/display-api-service/pull/363)

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
"doctrine/doctrine-migrations-bundle": "^3.1",
1717
"doctrine/orm": "^2.9",
1818
"gesdinet/jwt-refresh-token-bundle": "^1.0",
19-
"itk-dev/openid-connect-bundle": "^3.1",
19+
"itk-dev/openid-connect-bundle": "^4.1",
2020
"justinrainbow/json-schema": "^5.2",
2121
"kubawerlos/php-cs-fixer-custom-fixers": "^3.11",
2222
"lexik/jwt-authentication-bundle": "^2.14",

composer.lock

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

psalm-baseline.xml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -193,6 +193,12 @@
193193
<code><![CDATA[setFeed]]></code>
194194
</PossiblyNullReference>
195195
</file>
196+
<file src="src/Entity/Tenant/Media.php">
197+
<DeprecatedClass>
198+
<code><![CDATA[Vich\Uploadable]]></code>
199+
<code><![CDATA[Vich\UploadableField(mapping: 'media_object', fileNameProperty: 'filePath', size: 'size')]]></code>
200+
</DeprecatedClass>
201+
</file>
196202
<file src="src/Entity/Tenant/Playlist.php">
197203
<InvalidReturnStatement>
198204
<code><![CDATA[$this->playlistSlides]]></code>
@@ -305,6 +311,16 @@
305311
<code><![CDATA[$value]]></code>
306312
</MissingParamType>
307313
</file>
314+
<file src="src/Filter/TenantExtension.php">
315+
<UndefinedDocblockClass>
316+
<code><![CDATA[$targetEntity->getReflectionClass()]]></code>
317+
</UndefinedDocblockClass>
318+
</file>
319+
<file src="src/Security/AzureOidcAuthenticator.php">
320+
<PossiblyInvalidArgument>
321+
<code><![CDATA[$oidcGroups]]></code>
322+
</PossiblyInvalidArgument>
323+
</file>
308324
<file src="src/Security/Voter/UserVoter.php">
309325
<MissingTemplateParam>
310326
<code><![CDATA[UserVoter]]></code>

src/Command/Screen/LoadScreenLayoutsCommand.php

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -126,13 +126,12 @@ final protected function execute(InputInterface $input, OutputInterface $output)
126126
$io->error('Removing not permitted. Playlists linked to the removed regions will be unlinked. Use --cleanup-regions option to remove regions not in json.');
127127

128128
return Command::INVALID;
129-
} else {
130-
foreach ($existingRegion->getPlaylistScreenRegions() as $playlistScreenRegion) {
131-
$this->entityManager->remove($playlistScreenRegion);
132-
}
133-
134-
$this->entityManager->remove($existingRegion);
135129
}
130+
foreach ($existingRegion->getPlaylistScreenRegions() as $playlistScreenRegion) {
131+
$this->entityManager->remove($playlistScreenRegion);
132+
}
133+
134+
$this->entityManager->remove($existingRegion);
136135
}
137136
}
138137

src/Controller/InteractiveController.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ public function __invoke(Request $request, Slide $slide): JsonResponse
3535
{
3636
$user = $this->security->getUser();
3737

38-
if (!($user instanceof ScreenUser)) {
38+
if (!$user instanceof ScreenUser) {
3939
throw new AccessDeniedHttpException('Only screen user can perform action.');
4040
}
4141

src/Feed/CalendarApiFeedType.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -425,9 +425,9 @@ private function parseBool(string|bool $value): bool
425425
{
426426
if (is_bool($value)) {
427427
return $value;
428-
} else {
429-
return 'true' == strtolower($value);
430428
}
429+
430+
return 'true' == strtolower($value);
431431
}
432432

433433
private function getMapping(string $key): string

src/Feed/KobaFeedType.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,9 +84,8 @@ public function getData(Feed $feed): array
8484
if (true === $filterList) {
8585
if (!str_contains($title, '(liste)')) {
8686
continue;
87-
} else {
88-
$title = str_replace('(liste)', '', $title);
8987
}
88+
$title = str_replace('(liste)', '', $title);
9089
}
9190

9291
// Apply booked title override. If enabled it changes the title to Optaget if it contains (optaget).

src/Repository/PlaylistSlideRepository.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -216,8 +216,8 @@ private function getWeight(Ulid $ulid): int
216216
$playlistSlide = $queryBuilder->getQuery()->setMaxResults(1)->execute();
217217
if (0 === count($playlistSlide)) {
218218
return 0;
219-
} else {
220-
return $playlistSlide[0]->getWeight() + 1;
221219
}
220+
221+
return $playlistSlide[0]->getWeight() + 1;
222222
}
223223
}

0 commit comments

Comments
 (0)