From e06b5cd4d0d99db212ec0d6905505832711ecdd3 Mon Sep 17 00:00:00 2001
From: SonataCI <thomas+ci@sonata-project.org>
Date: Sun, 17 Dec 2023 20:11:45 +0000
Subject: [PATCH 1/2] DevKit updates

---
 .php-cs-fixer.dist.php | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php
index 1afe2e23..d197afd5 100644
--- a/.php-cs-fixer.dist.php
+++ b/.php-cs-fixer.dist.php
@@ -27,8 +27,9 @@
 HEADER;
 
 $rules = [
-    '@PHP74Migration' => true,
-    '@PHP74Migration:risky' => true,
+    '@PHP80Migration' => true,
+    '@PHP80Migration:risky' => true,
+    '@PHPUnit84Migration:risky' => true,
     '@PSR12' => true,
     '@PSR12:risky' => true,
     '@Symfony' => true,
@@ -42,6 +43,7 @@
     'multiline_whitespace_before_semicolons' => ['strategy' => 'no_multi_line'],
     'no_useless_else' => true,
     'no_useless_return' => true,
+    'no_superfluous_elseif' => true,
     'no_superfluous_phpdoc_tags' => ['allow_mixed' => true, 'remove_inheritdoc' => true],
     'nullable_type_declaration_for_default_null_value' => ['use_nullable_type_declaration' => true],
     'ordered_class_elements' => true,
@@ -51,16 +53,14 @@
         ['phpstan-template', 'phpstan-template-covariant', 'phpstan-extends', 'phpstan-implements', 'phpstan-var', 'psalm-var', 'phpstan-param', 'psalm-param', 'phpstan-return', 'psalm-return'],
         ['psalm-suppress', 'phpstan-ignore-next-line'],
         ['Assert\\*'],
-        ['ODM\\*'],
-        ['ORM\\*'],
     ]],
-    'php_unit_strict' => true,
-    'php_unit_test_case_static_method_calls' => true,
     'php_unit_data_provider_name' => true,
     'php_unit_data_provider_return_type' => true,
+    'php_unit_strict' => true,
+    'php_unit_test_case_static_method_calls' => true,
     'phpdoc_to_comment' => ['ignored_tags' => ['psalm-suppress', 'phpstan-var']],
-    'single_line_throw' => false,
     'static_lambda' => true,
+    'single_line_throw' => false,
     'strict_comparison' => true,
     'strict_param' => true,
     'void_return' => false,

From 23539b78036a58d07b000ecb64b704d41c20cfe9 Mon Sep 17 00:00:00 2001
From: Jordi Sala Morales <jordism91@gmail.com>
Date: Mon, 18 Dec 2023 08:41:59 +0100
Subject: [PATCH 2/2] Fix PHPCsFixer

---
 src/Writer/XmlWriter.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/Writer/XmlWriter.php b/src/Writer/XmlWriter.php
index d241c03c..f24a32fd 100644
--- a/src/Writer/XmlWriter.php
+++ b/src/Writer/XmlWriter.php
@@ -92,7 +92,8 @@ private function generateNode(string $name, mixed $value): void
     {
         if (\is_array($value)) {
             throw new RuntimeException('Not implemented');
-        } elseif (\is_scalar($value) || null === $value) {
+        }
+        if (\is_scalar($value) || null === $value) {
             fwrite($this->getFile(), sprintf("<%s><![CDATA[%s]]></%s>\n", $name, (string) $value, $name));
         } else {
             throw new InvalidDataFormatException('Invalid data');