Merge pull request #717 from Medienplanet24/master

Fix: Add scssphp 2.x compatibility while maintaining backward compatibility

Author: glensc

.semver

@@ -1,6 +1,6 @@
 ---
 :major: 4
 :minor: 0
-:patch: 1
+:patch: 2
 :special: ''
 :metadata: ''

CHANGELOG.md

@@ -7,6 +7,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## Unreleased
 
+## [4.0.2] - 2026-02-14
+
+- Add scssphp 2.x compatibility while maintaining backward compatibility, [#715]
+- Use `CompilationResult::getIncludedFiles()` for scssphp 2.x, fall back to `Compiler::getParsedFiles()` for scssphp 1.x
+
+[4.0.2]: https://github.com/mrclay/minify/compare/4.0.1...4.0.2
+[#715]: https://github.com/mrclay/minify/issues/715
+
 ## [4.0.1] - 2025-02-03
 
 - Recommend against use, [#711]

composer.json

@@ -46,7 +46,7 @@
 		"firephp/firephp-core": "~0.4.0",
 		"meenie/javascript-packer": "~1.1",
 		"phpunit/phpunit": "^8",
-		"scssphp/scssphp": "^1.12",
+		"scssphp/scssphp": "^1.12|^2.0",
 		"tedivm/jshrink": "~1.1.0"
 	},
 	"suggest": {

lib/Minify/ScssCssSource.php

@@ -151,18 +151,33 @@ private function compile($filename)
         // and will treat the @import line as css import
         $scss->setImportPaths(dirname($filename));
 
-        $css = $scss->compileString(file_get_contents($filename), $filename)->getCss();
+        $result = $scss->compileString(file_get_contents($filename), $filename);
+        $css = $result->getCss();
         $elapsed = round((microtime(true) - $start), 4);
 
         $v = Version::VERSION;
         $ts = date('r', (int) $start);
         $css = "/* compiled by scssphp $v on $ts ({$elapsed}s) */\n\n" . $css;
 
-        $imports = $scss->getParsedFiles();
-
-        $updated = 0;
-        foreach ($imports as $mtime) {
-            $updated = max($updated, $mtime);
+        // scssphp 2.x removed Compiler::getParsedFiles(), use CompilationResult::getIncludedFiles() instead
+        // scssphp 1.x uses Compiler::getParsedFiles() which returns [file => mtime]
+        if (method_exists($scss, 'getParsedFiles')) {
+            // scssphp 1.x
+            $imports = $scss->getParsedFiles();
+            $updated = 0;
+            foreach ($imports as $mtime) {
+                $updated = max($updated, $mtime);
+            }
+        } else {
+            // scssphp 2.x: getIncludedFiles() returns file paths only
+            $includedFiles = $result->getIncludedFiles();
+            $imports = array();
+            $updated = 0;
+            foreach ($includedFiles as $file) {
+                $mtime = filemtime($file);
+                $imports[$file] = $mtime;
+                $updated = max($updated, $mtime);
+            }
         }
 
         return array(