From 8b3ee7ab47c7048d69d6b04565f850c89b4797ec Mon Sep 17 00:00:00 2001
From: Morne Alberts <morne@malberts.net>
Date: Thu, 25 Apr 2024 18:06:22 +0200
Subject: [PATCH] Fix CS

---
 phpstan-baseline.neon            |  7 +------
 psalm-baseline.xml               | 29 ++++++-----------------------
 src/ResourceLoaderSCSSModule.php |  3 ++-
 3 files changed, 9 insertions(+), 30 deletions(-)

diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
index 47e1a93..124a394 100644
--- a/phpstan-baseline.neon
+++ b/phpstan-baseline.neon
@@ -11,11 +11,6 @@ parameters:
 			path: src/ResourceLoaderSCSSModule.php
 
 		-
-			message: "#^Method SCSS\\\\ResourceLoaderSCSSModule\\:\\:collateStyleFilesByPosition\\(\\) should return array\\<array\\<string\\>\\> but returns array\\<string, array\\<int, MediaWiki\\\\ResourceLoader\\\\FilePath\\|string\\>\\>\\.$#"
-			count: 1
-			path: src/ResourceLoaderSCSSModule.php
-
-		-
-			message: "#^Offset 'position' on \\*NEVER\\* on left side of \\?\\? always exists and is always null\\.$#"
+			message: "#^Offset 'position' on \\*NEVER\\* on left side of \\?\\? always exists and is not nullable\\.$#"
 			count: 1
 			path: src/ResourceLoaderSCSSModule.php
diff --git a/psalm-baseline.xml b/psalm-baseline.xml
index 167d6da..42e41ec 100644
--- a/psalm-baseline.xml
+++ b/psalm-baseline.xml
@@ -1,38 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<files psalm-version="5.12.0@f90118cdeacd0088e7215e64c0c99ceca819e176">
+<files psalm-version="5.23.1@8471a896ccea3526b26d082f4461eeea467f10a4">
   <file src="src/ResourceLoaderSCSSModule.php">
     <DocblockTypeContradiction>
-      <code>is_array( $value )</code>
+      <code><![CDATA[is_array( $value )]]></code>
     </DocblockTypeContradiction>
-    <MixedArrayAccess>
-      <code><![CDATA[$value['position']]]></code>
-    </MixedArrayAccess>
-    <MixedArrayOffset>
-      <code>$collatedFiles[$optionValue]</code>
-      <code>$collatedFiles[$optionValue]</code>
-      <code>$collatedFiles[$optionValue]</code>
-    </MixedArrayOffset>
-    <MixedArrayTypeCoercion>
-      <code>$collatedFiles[$optionValue]</code>
-    </MixedArrayTypeCoercion>
     <MixedAssignment>
-      <code>$cacheResult</code>
-      <code>$collatedFiles[$optionValue][]</code>
-      <code>$optionValue</code>
+      <code><![CDATA[$cacheResult]]></code>
       <code><![CDATA[$this->cacheTriggers]]></code>
       <code><![CDATA[$this->paths]]></code>
       <code><![CDATA[$this->variables]]></code>
     </MixedAssignment>
-    <MixedReturnTypeCoercion>
-      <code>$collatedFiles</code>
-      <code>string[][]</code>
-    </MixedReturnTypeCoercion>
     <RedundantConditionGivenDocblockType>
-      <code>$triggerFile !== null</code>
-      <code>is_int( $key )</code>
+      <code><![CDATA[$triggerFile !== null]]></code>
+      <code><![CDATA[is_int( $key )]]></code>
     </RedundantConditionGivenDocblockType>
     <UnusedClass>
-      <code>ResourceLoaderSCSSModule</code>
+      <code><![CDATA[ResourceLoaderSCSSModule]]></code>
     </UnusedClass>
   </file>
 </files>
diff --git a/src/ResourceLoaderSCSSModule.php b/src/ResourceLoaderSCSSModule.php
index e293edb..b47fcc5 100644
--- a/src/ResourceLoaderSCSSModule.php
+++ b/src/ResourceLoaderSCSSModule.php
@@ -30,6 +30,7 @@
 use Exception;
 use MediaWiki\ResourceLoader\Context;
 use MediaWiki\ResourceLoader\FileModule;
+use MediaWiki\ResourceLoader\FilePath;
 use ObjectCache;
 use ScssPhp\ScssPhp\Compiler;
 
@@ -273,7 +274,7 @@ private function collateStyleFilesByPosition(): array {
 				if ( !isset( $collatedFiles['main'] ) ) {
 					$collatedFiles['main'] = [];
 				}
-				$collatedFiles['main'][] = $value;
+				$collatedFiles['main'][] = $value instanceof FilePath ? $value->getPath() : $value;
 			} elseif ( is_array( $value ) ) {
 				// File name as the key, options array as the value
 				$optionValue = $value['position'] ?? 'main';