From 757c0195055155f62ae2070bb9d31d2f9f40258f Mon Sep 17 00:00:00 2001
From: Oliver Klee <github@oliverklee.de>
Date: Thu, 6 Jun 2024 16:19:43 +0200
Subject: [PATCH] [TASK] Update the QA tools

Also reformat the code with the updated version of PHP-CS-Fixer.

Also recreate the Psalm baseline with the additional warnings
that get detected now.
---
 .phive/phars.xml              |  4 ++--
 psalm.baseline.xml            | 11 ++++++++++-
 tests/Unit/CssInlinerTest.php | 12 ++++++------
 3 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/.phive/phars.xml b/.phive/phars.xml
index 24f8d7a3..938f126f 100644
--- a/.phive/phars.xml
+++ b/.phive/phars.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phive xmlns="https://phar.io/phive">
   <phar name="composer-normalize" version="^2.42.0" installed="2.42.0" location="./.phive/composer-normalize" copy="false"/>
-  <phar name="php-cs-fixer" version="^3.50.0" installed="3.50.0" location="./.phive/php-cs-fixer" copy="false"/>
+  <phar name="php-cs-fixer" version="^3.58.1" installed="3.58.1" location="./.phive/php-cs-fixer" copy="false"/>
   <phar name="phpmd" version="^2.15.0" installed="2.15.0" location="./.phive/phpmd" copy="false"/>
-  <phar name="psalm" version="^5.22.2" installed="5.22.2" location="./.phive/psalm" copy="false"/>
+  <phar name="psalm" version="^5.24.0" installed="5.24.0" location="./.phive/psalm" copy="false"/>
 </phive>
diff --git a/psalm.baseline.xml b/psalm.baseline.xml
index 88ef81dc..d39df584 100644
--- a/psalm.baseline.xml
+++ b/psalm.baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<files psalm-version="5.22.2@d768d914152dbbf3486c36398802f74e80cfde48">
+<files psalm-version="5.24.0@462c80e31c34e58cc4f750c656be3927e80e550e">
   <file src="src/CssInliner.php">
     <MixedAssignment>
       <code><![CDATA[$path]]></code>
@@ -23,9 +23,18 @@
       <code><![CDATA[$element]]></code>
     </PossiblyInvalidArgument>
   </file>
+  <file src="src/Utilities/CssConcatenator.php">
+    <InvalidArgument>
+      <code><![CDATA[[self::class, 'getMediaRuleCss']]]></code>
+      <code><![CDATA[[self::class, 'getRuleBlockCss']]]></code>
+    </InvalidArgument>
+  </file>
   <file src="tests/Support/Constraint/CssConstraint.php">
     <DirectConstructorCall>
       <code><![CDATA[parent::__construct()]]></code>
     </DirectConstructorCall>
+    <InvalidArgument>
+      <code><![CDATA[[self::class, 'getCssRegularExpressionReplacement']]]></code>
+    </InvalidArgument>
   </file>
 </files>
diff --git a/tests/Unit/CssInlinerTest.php b/tests/Unit/CssInlinerTest.php
index eb183af5..2bfceaa0 100644
--- a/tests/Unit/CssInlinerTest.php
+++ b/tests/Unit/CssInlinerTest.php
@@ -1779,12 +1779,12 @@ public function orderedRulesAndSurroundingCssDataProvider(): array
             'non-matching CSS with pseudo-component' => 'h6:hover { color: #f00; }',
         ];
         $possibleCssBefore = $possibleSurroundingCss + [
-                '@import' => '@import "foo.css";',
-                '@charset' => '@charset "UTF-8";',
-                'invalid @charset (uppercase identifier)' => '@CHARSET "UTF-8";',
-                'invalid @charset (extra space)' => '@charset  "UTF-8";',
-                // broken: invalid @charset (unquoted value)
-            ];
+            '@import' => '@import "foo.css";',
+            '@charset' => '@charset "UTF-8";',
+            'invalid @charset (uppercase identifier)' => '@CHARSET "UTF-8";',
+            'invalid @charset (extra space)' => '@charset  "UTF-8";',
+            // broken: invalid @charset (unquoted value)
+        ];
 
         /** @var array<string, array<int, string>> $datasetsSurroundingCss */
         $datasetsSurroundingCss = [];