matthiasmullie/minify - replacing JS & CSS libraries with a better one

composer.json

@@ -41,14 +41,13 @@
         "colinmollenhour/credis": "^1.15",
         "colinmollenhour/php-redis-session-abstract": "^2.0",
         "composer/composer": "^2.0, !=2.2.16",
-        "elasticsearch/elasticsearch": "^8.15",
         "duosecurity/duo_api_php": "^1.1",
         "duosecurity/duo_universal_php": "^1.0",
+        "elasticsearch/elasticsearch": "^8.15",
         "ezyang/htmlpurifier": "^4.17",
         "guzzlehttp/guzzle": "^7.5",
         "laminas/laminas-captcha": "^2.18",
         "laminas/laminas-code": "^4.13",
-        "magento/magento-zf-db": "^3.21",
         "laminas/laminas-di": "^3.15",
         "laminas/laminas-escaper": "^2.13",
         "laminas/laminas-eventmanager": "^3.11",
@@ -69,9 +68,11 @@
         "magento/composer": "^1.10.1-beta1",
         "magento/composer-dependency-version-audit-plugin": "^0.1",
         "magento/magento-composer-installer": ">=0.4.0",
+        "magento/magento-zf-db": "^3.21",
         "magento/zend-cache": "^1.16",
         "magento/zend-db": "^1.16",
         "magento/zend-pdf": "^1.16",
+        "matthiasmullie/minify": "^1.3",
         "monolog/monolog": "^3.6",
         "opensearch-project/opensearch-php": "^2.3",
         "pelago/emogrifier": "^7.0",
@@ -82,12 +83,10 @@
         "ramsey/uuid": "^4.2",
         "symfony/console": "^6.4",
         "symfony/intl": "^6.4",
-        "symfony/process": "^6.4",
-        "symfony/string": "^6.4",
         "symfony/mailer": "^6.4",
         "symfony/mime": "^6.4",
-        "tedivm/jshrink": "^1.4",
-        "tubalmartin/cssmin": "^4.1",
+        "symfony/process": "^6.4",
+        "symfony/string": "^6.4",
         "web-token/jwt-framework": "^3.4",
         "webonyx/graphql-php": "^15.0",
         "wikimedia/less.php": "^5.0"

lib/internal/Magento/Framework/Code/Minifier/Adapter/Css/CSSmin.php

@@ -5,58 +5,24 @@
  */
 namespace Magento\Framework\Code\Minifier\Adapter\Css;
 
-use tubalmartin\CssMin\Minifier as CssMinLibrary;
 use Magento\Framework\Code\Minifier\AdapterInterface;
+use MatthiasMullie\Minify\CSS;
 
 /**
  * Adapter for CSSmin library
  */
 class CSSmin implements AdapterInterface
 {
-    /**
-     * 'pcre.recursion_limit' value for CSSMin minification
-     */
-    const PCRE_RECURSION_LIMIT = 1000;
-
-    /**
-     * @var CssMinLibrary
-     */
-    protected $cssMinifier;
-
-    /**
-     * @param CssMinLibrary $cssMinifier
-     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     */
-    public function __construct(CssMinLibrary $cssMinifier)
-    {
-        // TODO: set $cssMinifier in constructor once MAGETWO-51176 is resolved.
-    }
-
-    /**
-     * Get CSS Minifier
-     *
-     * @return CssMinLibrary
-     */
-    private function getCssMin()
-    {
-        if (!($this->cssMinifier instanceof CssMinLibrary)) {
-            $this->cssMinifier = new CssMinLibrary(false);
-        }
-        return $this->cssMinifier;
-    }
-
     /**
      * Minify css file content
      *
      * @param string $content
      * @return string
      */
-    public function minify($content)
+    public function minify($content): string
     {
-        $pcreRecursionLimit = ini_get('pcre.recursion_limit');
-        ini_set('pcre.recursion_limit', self::PCRE_RECURSION_LIMIT);
-        $result = $this->getCssMin()->run($content);
-        ini_set('pcre.recursion_limit', $pcreRecursionLimit);
-        return $result;
+        $cssMinifier = new CSS();
+
+        return $cssMinifier->add($content)->minify();
     }
 }