VichFileType : Fix translation for 'delete_label' when 'download_label' is a callable #1573 (#1574)

Author: theredled

phpstan-baseline.neon

@@ -66,3 +66,8 @@ parameters:
 			count: 4
 			path: tests/TestCase.php
 
+		-
+			message: '#^Return type of call to method PHPUnit\\Framework\\TestCase\:\:createMock\(\) contains unresolvable type\.$#'
+			identifier: method.unresolvableReturnType
+			count: 4
+			path: tests/TestCaseTrait.php

src/Form/Type/VichFileType.php

@@ -31,7 +31,7 @@ public function __construct(
         protected readonly StorageInterface $storage,
         protected readonly UploadHandler $handler,
         protected readonly PropertyMappingFactory $factory,
-        ?PropertyAccessorInterface $propertyAccessor = null
+        ?PropertyAccessorInterface $propertyAccessor = null,
     ) {
         $this->propertyAccessor = $propertyAccessor ?: PropertyAccess::createPropertyAccessor();
     }
@@ -44,6 +44,9 @@ public function configureOptions(OptionsResolver $resolver): void
             'download_uri' => true,
             'download_label' => 'vich_uploader.link.download',
             'delete_label' => 'vich_uploader.form_label.delete_confirm',
+            'download_label_translation_domain' => null,
+            'delete_label_translation_domain' => null,
+            'translation_domain' => null,
             'error_bubbling' => false,
         ]);
 
@@ -90,7 +93,7 @@ protected function buildDeleteField(FormBuilderInterface $builder, array $option
             $form->add('delete', Type\CheckboxType::class, [
                 'label' => $options['delete_label'],
                 'mapped' => false,
-                'translation_domain' => $options['translation_domain'],
+                'translation_domain' => $options['delete_label_translation_domain'] ?? $options['translation_domain'],
                 'required' => false,
             ]);
         });
@@ -117,9 +120,10 @@ public function buildView(FormView $view, FormInterface $form, array $options):
         $view->vars['download_uri'] = null;
         if ($options['download_uri'] && $object) {
             $view->vars['download_uri'] = $this->resolveUriOption($options['download_uri'], $object, $form);
+
             $view->vars = \array_replace(
                 $view->vars,
-                $this->resolveDownloadLabel($options['download_label'], $object, $form)
+                $this->resolveDownloadLabel($options['download_label'], $object, $form, $options)
             );
         }
 
@@ -149,7 +153,7 @@ protected function resolveUriOption(mixed $uriOption, object $object, FormInterf
         return $uriOption;
     }
 
-    protected function resolveDownloadLabel(mixed $downloadLabel, object $object, FormInterface $form): array
+    protected function resolveDownloadLabel(mixed $downloadLabel, object $object, FormInterface $form, array $options): array
     {
         if (true === $downloadLabel) {
             $fieldName = $this->getFieldName($form);
@@ -158,25 +162,32 @@ protected function resolveDownloadLabel(mixed $downloadLabel, object $object, Fo
                 throw new \UnexpectedValueException(\sprintf('Cannot find mapping for "%s" field', $fieldName));
             }
 
-            return ['download_label' => $mapping->readProperty($object, 'originalName'), 'translation_domain' => false];
+            return ['download_label' => $mapping->readProperty($object, 'originalName'), 'download_label_translation_domain' => false];
         }
 
         if (\is_callable($downloadLabel)) {
             $result = $downloadLabel($object);
 
             return [
                 'download_label' => $result['download_label'] ?? $result,
-                'translation_domain' => $result['translation_domain'] ?? false,
+                'download_label_translation_domain' => $result['download_label_translation_domain']
+                    ?? $result['translation_domain']
+                    ?? false,
             ];
         }
 
         if ($downloadLabel instanceof PropertyPath) {
             return [
                 'download_label' => $this->propertyAccessor->getValue($object, $downloadLabel),
-                'translation_domain' => false,
+                'download_label_translation_domain' => false,
             ];
         }
 
-        return ['download_label' => $downloadLabel];
+        return [
+            'download_label' => $downloadLabel,
+            'download_label_translation_domain' => $options['download_label_translation_domain']
+                ?? $options['translation_domain']
+                ?? null,
+        ];
     }
 }

src/Form/Type/VichImageType.php

@@ -86,7 +86,7 @@ public function buildView(FormView $view, FormInterface $form, array $options):
 
             $view->vars = \array_replace(
                 $view->vars,
-                $this->resolveDownloadLabel($options['download_label'], $object, $form)
+                $this->resolveDownloadLabel($options['download_label'], $object, $form, $options)
             );
 
             $view->vars['download_uri'] = $this->resolveUriOption($options['download_uri'], $object, $form);

templates/Form/fields.html.twig

@@ -15,7 +15,7 @@
 
         {%- if download_uri -%}
             <a href="{{ asset_helper is same as(true) ? asset(download_uri) : download_uri }}" download>
-                {{ translation_domain is same as(false) ? download_label : download_label|trans({}, translation_domain) }}
+                {{ download_label_translation_domain is same as(false) ? download_label : download_label|trans({}, download_label_translation_domain) }}
             </a>
         {%- endif -%}
     </div>
@@ -43,7 +43,7 @@
         {%- endif -%}
         {%- if download_uri -%}
             <a href="{{ asset_helper is same as(true) ? asset(download_uri) : download_uri }}" download>
-                {{ translation_domain is same as(false) ? download_label : download_label|trans({}, translation_domain) }}
+                {{ download_label_translation_domain is same as(false) ? download_label : download_label|trans({}, download_label_translation_domain) }}
             </a>
         {%- endif -%}
     </div>

tests/Fixtures/TestBundle/src/Entity/Product.php

@@ -18,7 +18,7 @@ class Product
 
     private ?string $title = null;
 
-    public function getImage(): File
+    public function getImage(): ?File
     {
         return $this->image;
     }