Merge pull request #13 from darinda/implement-issue-12

Implement issue 12

Author: emodric

bundle/Core/FieldType/EnhancedBinaryFile/FormMapper.php

@@ -24,6 +24,16 @@ public function mapFieldDefinitionForm(FormInterface $fieldDefinitionForm, Field
                     'label' => 'field_definition.enhancedbinaryfile.allowedTypes',
                     'translation_domain' => 'messages',
                 ]
+            )
+            ->add(
+                'mimeTypesMessage',
+                TextType::class,
+                [
+                    'required' => false,
+                    'property_path' => 'fieldSettings[mimeTypesMessage]',
+                    'label' => 'field_definition.enhancedbinaryfile.mimeTypesMessage',
+                    'translation_domain' => 'messages',
+                ]
             );
     }
 }

bundle/Core/FieldType/EnhancedBinaryFile/Type.php

@@ -29,6 +29,10 @@ class Type extends BinaryFileType
             'type' => 'string',
             'default' => null,
         ),
+        'mimeTypesMessage' => array(
+            'type' => 'string',
+            'default' => null
+        )
     );
 
     /**
@@ -139,6 +143,7 @@ public function validateFieldSettings($fieldSettings)
 
         foreach ($fieldSettings as $name => $value) {
             switch ($name) {
+                case 'mimeTypesMessage': // break omitted on purpose
                 case 'allowedTypes':
                     // Nothing to validate, just recognize this setting as known
                     break;

bundle/Core/Persistence/Legacy/Content/FieldValue/Converter/Converter.php

@@ -46,6 +46,9 @@ public function toStorageFieldDefinition(FieldDefinition $fieldDef, StorageField
         $storageDef->dataText1 = isset($fieldDef->fieldTypeConstraints->fieldSettings['allowedTypes']) ?
             $fieldDef->fieldTypeConstraints->fieldSettings['allowedTypes'] :
             '';
+        $storageDef->dataText2 = isset($fieldDef->fieldTypeConstraints->fieldSettings['mimeTypesMessage']) ?
+            $fieldDef->fieldTypeConstraints->fieldSettings['mimeTypesMessage'] :
+            '';
     }
 
     /**
@@ -67,6 +70,7 @@ public function toFieldDefinition(StorageFieldDefinition $storageDef, FieldDefin
                 ),
                 'fieldSettings' => new FieldSettings(array(
                     'allowedTypes' => $storageDef->dataText1,
+                    'mimeTypesMessage' => $storageDef->dataText2,
                 )),
             )
         );

bundle/Form/FieldTypeHandler/EnhancedFile.php

@@ -68,6 +68,7 @@ protected function buildFieldForm(
 
         $maxFileSize = $fieldDefinition->validatorConfiguration['FileSizeValidator']['maxFileSize'];
         $allowedExtensions = $fieldDefinition->fieldSettings['allowedTypes'];
+        $mimeTypesMessage = $fieldDefinition->fieldSettings['mimeTypesMessage'];
 
         if (null !== $maxFileSize || !empty($allowedExtensions)) {
             $constraints = array();
@@ -89,6 +90,11 @@ protected function buildFieldForm(
                 $constraints['mimeTypes'] = $allowedMimeTypes;
             }
 
+            if (!empty($mimeTypesMessage))
+            {
+                $constraints['mimeTypesMessage'] = $mimeTypesMessage;
+            }
+
             $options['constraints'][] = new Constraints\File($constraints);
         }
 

bundle/Resources/translations/messages.de.yml

@@ -1 +1,2 @@
-field_definition.enhancedbinaryfile.allowedTypes: Erlaubte Dateiformate (komma-separiert)
+field_definition.enhancedbinaryfile.allowedTypes: Erlaubte Dateiformate (|-separiert)
+field_definition.enhancedbinaryfile.mimeTypesMessage: Mimetype Validierungs-Fehlertext (https://symfony.com/doc/current/reference/constraints/File.html#mimetypesmessage)

bundle/Resources/translations/messages.en.yml

@@ -1 +1,2 @@
-field_definition.enhancedbinaryfile.allowedTypes: Allowed file types (comma separated)
+field_definition.enhancedbinaryfile.allowedTypes: Allowed file types (pipe-separated)
+field_definition.enhancedbinaryfile.mimeTypesMessage: Wrong mimetype error message (https://symfony.com/doc/current/reference/constraints/File.html#mimetypesmessage)

bundle/Resources/views/admin/field_types.html.twig

@@ -11,4 +11,10 @@
         {{- form_errors(form.allowedTypes) -}}
         {{- form_widget(form.allowedTypes) -}}
     </div>
+
+    <div class="enhancedezbinaryfile-validator mime-types-message{% if group_class is not empty %} {{ group_class }}{% endif %}">
+        {{- form_label(form.mimeTypesMessage) -}}
+        {{- form_errors(form.mimeTypesMessage) -}}
+        {{- form_widget(form.mimeTypesMessage) -}}
+    </div>
 {% endblock %}

tests/Form/FieldTypeHandler/EnhancedFileTest.php

@@ -63,6 +63,7 @@ public function testBuildFieldCreateForm()
         $fieldDefinition = new FieldDefinition(array(
             'fieldSettings' => array(
                 'allowedTypes' => 'jpg|pdf|txt',
+                'mimeTypesMessage' => null
             ),
         ));
         $lang = 'eng_US';