Skip to content

Commit 8717447

Browse files
authored
Merge branch 'master' into bugfix-translations-1573
2 parents 8c3d21a + 0f1b3ee commit 8717447

5 files changed

Lines changed: 5 additions & 8 deletions

File tree

.github/workflows/build.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ jobs:
9898
- php: '8.4'
9999
symfony: '7.4.*'
100100
dependencies: highest
101-
with_imagine: false
101+
with_imagine: true
102102
with_oneupbundle: false
103103
max_deprecations: 6
104104
- php: '8.5'

docker/Dockerfile85

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
FROM php:8.5.0-alpine
1+
FROM php:8.5-alpine
22

3-
ARG MONGODB_VERSION=2.1.4
3+
ARG MONGODB_VERSION=2.1.8
44

55
# Install mongo
66
RUN set -eux; \

tests/Form/Type/VichFileTypeTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ public function testBuildView(?Product $object, array $options, array $vars): vo
8989

9090
$this->config
9191
->method('getOption')
92-
->willReturnCallback(fn (string $key) => $options[$key] ?? null);
92+
->willReturnCallback(static fn (string $key) => $options[$key] ?? null);
9393

9494
$this->form
9595
->method('getParent')

tests/Form/Type/VichImageTypeTest.php

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ public static function buildViewDataProvider(): array
3838
'download_label' => 'download',
3939
'download_label_translation_domain' => null,
4040
'image_uri' => null,
41-
'show_download_link' => true,
4241
'value' => null,
4342
'attr' => [],
4443
'asset_helper' => false,
@@ -57,7 +56,6 @@ public static function buildViewDataProvider(): array
5756
'object' => null,
5857
'download_uri' => null,
5958
'image_uri' => null,
60-
'show_download_link' => false,
6159
'value' => null,
6260
'attr' => [],
6361
'asset_helper' => false,
@@ -78,7 +76,6 @@ public static function buildViewDataProvider(): array
7876
'download_label' => 'download',
7977
'download_label_translation_domain' => null,
8078
'image_uri' => 'resolved-uri',
81-
'show_download_link' => false,
8279
'value' => null,
8380
'attr' => [],
8481
'asset_helper' => false,

tests/Handler/UploadHandlerTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -344,7 +344,7 @@ protected function expectEvents(array $events): void
344344
$this->dispatcher
345345
->expects(self::exactly(\count($events)))
346346
->method('dispatch')
347-
->willReturnCallback(fn (object $event, string $eventName): object => $event)
347+
->willReturnCallback(static fn (object $event, string $eventName): object => $event)
348348
;
349349
}
350350
}

0 commit comments

Comments
 (0)