Make JSqueeze filter work with 1.x and 2.x (namespaced)

kriswallsmith · Jan 1, 2015 · 4854406 · 4854406
1 parent bdd814c
commit 4854406
Showing 1 changed file with 15 additions and 2 deletions.
diff --git a/src/Assetic/Filter/JSqueezeFilter.php b/src/Assetic/Filter/JSqueezeFilter.php
@@ -23,7 +23,20 @@ class JSqueezeFilter implements FilterInterface
 {
     private $singleLine = true;
     private $keepImportantComments = true;
-    private $specialVarRx = \JSqueeze::SPECIAL_VAR_RX;
+    private $classname;
+    private $specialVarRx;
+
+    function __construct() {
+        // JSqueeze is namespaced since 2.x, this works with both 1.x and 2.x
+        // Upstream default for special var is false in 2.x
+        if (class_exists('\\Patchwork\\JSqueeze')) {
+            $this->classname = '\\Patchwork\\JSqueeze';
+            $this->specialVarRx = false;
+        } else {
+            $this->classname = '\\JSqueeze';
+            $this->specialVarRx = $this->classname::SPECIAL_VAR_RX;
+        }
+    }
 
     public function setSingleLine($bool)
     {
@@ -46,7 +59,7 @@ public function filterLoad(AssetInterface $asset)
 
     public function filterDump(AssetInterface $asset)
     {
-        $parser = new \JSqueeze();
+        $parser = new $this->classname();
         $asset->setContent($parser->squeeze(
             $asset->getContent(),
             $this->singleLine,