Manual merge wip/1.2 into wip/config-writer-replacement

wintercms · Mar 1, 2022 · f74bd5a · f74bd5a
2 parents ec04043 + 27031ee
commit f74bd5a
Show file tree

Hide file tree

Showing 140 changed files with 708 additions and 7,897 deletions.
diff --git a/composer.json b/composer.json
@@ -34,18 +34,20 @@
         "ext-openssl": "*",
         "ext-PDO": "*",
         "ext-zip": "*",
+
+        "assetic/framework": "~3.0",
         "doctrine/dbal": "^2.6",
         "erusev/parsedown-extra": "~0.7",
-        "linkorb/jsmin-php": "~1.0",
-        "wikimedia/less.php": "~3.0",
-        "scssphp/scssphp": "~1.0",
-        "symfony/yaml": "^5.1",
-        "twig/twig": "~3.0",
-        "league/csv": "~9.1",
-        "nesbot/carbon": "^2.0",
         "laravel/framework": "~9.0",
         "laravel/tinker": "^2.7",
-        "nikic/php-parser": "^4.10"
+        "league/csv": "~9.1",
+        "nesbot/carbon": "^2.0",
+        "nikic/php-parser": "^4.10",
+        "scssphp/scssphp": "~1.0",
+        "symfony/yaml": "^6.0",
+        "twig/twig": "~3.0",
+        "wikimedia/less.php": "~3.0",
+        "wikimedia/minify": "~2.2"
     },
     "require-dev": {
         "phpunit/phpunit": "^9.5.8",

diff --git a/src/Assetic/Asset/AssetCache.php b/src/Assetic/Asset/AssetCache.php