Allow symfony 7

.github/workflows/phpunit.yml

@@ -11,14 +11,14 @@ jobs:
         strategy:
             matrix:
                 php-version:
-                    - "7.4"
                     - "8.0"
                     - "8.1"
+                    - "8.2"
                 deps:
                     - "normal"
                 include:
                     - deps: "low"
-                      php-version: "7.4"
+                      php-version: "8.0"
 
         steps:
             - name: "Checkout"

.github/workflows/static-analysis.yml

@@ -11,7 +11,6 @@ jobs:
         strategy:
             matrix:
                 php-version:
-                    - "7.4"
                     - "8.0"
                     - "8.1"
         steps:

.gitignore

@@ -2,3 +2,4 @@
 composer.lock
 coverage/
 .phpunit.result.cache
+.idea/

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": "^6.0|^7.0",
+        "symfony/translation": "^6.0|^7.0",
+        "symfony/serializer": "^6.0|^7.0",
+        "symfony/validator": "^6.0|^7.0"
     },
     "require-dev": {
         "dealerdirect/phpcodesniffer-composer-installer": "^v0.7.2",

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/FormErrorNormalizer.php

@@ -39,7 +39,7 @@ public function __construct(TranslatorInterface $translator)
     /**
      * {@inheritdoc}
      */
-    public function normalize($object, $format = null, array $context = [])
+    public function normalize(mixed $object, ?string $format = null, array $context = []): float|array|\ArrayObject|bool|int|string|null
     {
         return [
             'code' => isset($context['status_code']) ? $context['status_code'] : null,
@@ -51,11 +51,19 @@ public function normalize($object, $format = null, array $context = [])
     /**
      * {@inheritdoc}
      */
-    public function supportsNormalization($data, $format = null)
+    public function supportsNormalization(mixed $data, ?string $format = null, array $context = []): bool
     {
         return $data instanceof FormInterface && $data->isSubmitted() && !$data->isValid();
     }
 
+    /**
+     * {@inheritdoc}
+     */
+    public function getSupportedTypes(?string $format): array
+    {
+        return ['object' => true];
+    }
+
     /**
      * This code has been taken from JMSSerializer.
      *

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

@@ -27,25 +27,34 @@ class InitialValuesNormalizer implements NormalizerInterface
     /**
      * {@inheritdoc}
      */
-    public function normalize($form, $format = null, array $context = [])
+    public function normalize($object, $format = null, array $context = []): float|array|\ArrayObject|bool|int|string|null
     {
-        $formView = $form->createView();
+        $formView = $object->createView();
 
-        return $this->getValues($form, $formView);
+        return $this->getValues($object, $formView);
     }
 
     /**
      * {@inheritdoc}
      */
-    public function supportsNormalization($data, $format = null)
+    public function supportsNormalization(mixed $data, ?string $format = null, array $context = []): bool
     {
         return $data instanceof Form;
     }
 
+    /**
+     * {@inheritdoc}
+     */
+    public function getSupportedTypes(?string $format): array
+    {
+        return ['object' => true];
+    }
+
     /**
      * Gets the values of the form
-     * @param Form|FormInterface     $form
-     * @param FormView               $formView
+     *
+     * @param Form|FormInterface $form
+     * @param FormView $formView
      *
      * @return mixed
      */
@@ -62,7 +71,7 @@ private function getValues(FormInterface $form, FormView $formView)
                 return $this->normalizeExpandedChoice($formView);
             }
             // Force serialization as {} instead of []
-            $data = (object) array();
+            $data = (object) [];
             foreach ($formView->children as $name => $child) {
                 // Avoid unknown field error when csrf_protection is true
                 // CSRF token should be extracted another way
@@ -85,13 +94,14 @@ private function getValues(FormInterface $form, FormView $formView)
 
     /**
      * Normalize when choice is multiple
+     *
      * @param FormView $formView
      *
      * @return array
      */
     private function normalizeMultipleExpandedChoice(FormView $formView)
     {
-        $data = array();
+        $data = [];
         foreach ($formView->children as $name => $child) {
             if ($child->vars['checked']) {
                 $data[] = $child->vars['value'];
@@ -103,6 +113,7 @@ private function normalizeMultipleExpandedChoice(FormView $formView)
 
     /**
      * Normalize when choice is expanded
+     *
      * @param FormView $formView
      *
      * @return mixed