Merge pull request #1 from survos/tac

Tac

README.md

@@ -29,8 +29,9 @@ in the *installation chapter* of the Composer documentation.
 #### Note
 `symfony/form ^5.0` broke backwards compatibility on some abstract functions we use. If you need to function with
 earlier versions, you need to use Liform v0.15 or earlier:
-
-    $ composer require limenius/liform "^0.15"
+```bash
+composer require limenius/liform "^0.15"
+```
 
 ## Usage
 
@@ -54,7 +55,7 @@ $schema = json_encode($liform->transform($form));
 
 And `$schema` will contain a JSON Schema representation such as:
 
-```js
+```json
 {
    "title":null,
    "properties":{
@@ -354,6 +355,6 @@ This library is under the MIT license. See the complete license in the file:
 
     LICENSE.md
 
-## Acknoledgements
+## Acknowledgements
 
 The technique for transforming forms using resolvers and reducers is inspired on [Symfony Console Form](https://github.com/matthiasnoback/symfony-console-form)

composer.json

@@ -20,11 +20,11 @@
     }
   },
   "require": {
-    "php": "^7.4|^8.0",
-    "symfony/form": "^5.4|^6.0",
-    "symfony/translation": "^5.4|^6.0",
-    "symfony/serializer": "^5.4|^6.0",
-    "symfony/validator": "^5.4|^6.0",
+    "php": "^8.0",
+    "symfony/form": "^5.4|^6.3|^7.0",
+    "symfony/translation": "^5.4|^6.3|^7.0",
+    "symfony/serializer": "^5.4|^6.3|^7.0",
+    "symfony/validator": "^5.4|^6.3|^7.0",
     "symfony/translation-contracts": "^1.0|^2.1|^3.0"
   },
   "require-dev": {

src/Limenius/Liform/Form/Extension/AddLiformExtension.php

@@ -47,7 +47,7 @@ public static function getExtendedTypes(): iterable
      *
      * @param OptionsResolver $resolver
      */
-    public function configureOptions(OptionsResolver $resolver)
+    public function configureOptions(OptionsResolver $resolver): void
     {
         $resolver->setDefined(['liform']);
     }

src/Limenius/Liform/Serializer/Normalizer/InitialValuesNormalizer.php

@@ -26,7 +26,7 @@ class InitialValuesNormalizer implements NormalizerInterface
     /**
      * {@inheritdoc}
      */
-    public function normalize($form, $format = null, array $context = [])
+    public function normalize($form, $format = null, array $context = []): float|array|\ArrayObject|bool|int|string|null
     {
         $formView = $form->createView();
 
@@ -35,8 +35,11 @@ public function normalize($form, $format = null, array $context = [])
 
     /**
      * {@inheritdoc}
+     * @param mixed $data
+     * @param null $format
+     * @param array $context
      */
-    public function supportsNormalization($data, $format = null)
+    public function supportsNormalization($data, $format = null, array $context = []): bool
     {
         return $data instanceof Form;
     }
@@ -48,7 +51,7 @@ public function supportsNormalization($data, $format = null)
      *
      * @return mixed
      */
-    private function getValues(Form $form, FormView $formView)
+    private function getValues(Form $form, FormView $formView): mixed
     {
         if (!empty($formView->children)) {
             if (in_array('choice', FormUtil::typeAncestry($form)) &&
@@ -88,7 +91,7 @@ private function getValues(Form $form, FormView $formView)
      *
      * @return array
      */
-    private function normalizeMultipleExpandedChoice(FormView $formView)
+    private function normalizeMultipleExpandedChoice(FormView $formView): array
     {
         $data = array();
         foreach ($formView->children as $name => $child) {
@@ -106,7 +109,7 @@ private function normalizeMultipleExpandedChoice(FormView $formView)
      *
      * @return mixed
      */
-    private function normalizeExpandedChoice(FormView $formView)
+    private function normalizeExpandedChoice(FormView $formView): mixed
     {
         foreach ($formView->children as $name => $child) {
             if ($child->vars['checked']) {
@@ -116,4 +119,9 @@ private function normalizeExpandedChoice(FormView $formView)
 
         return null;
     }
+
+    public function getSupportedTypes(?string $format): array
+    {
+        return [Form::class];
+    }
 }