Try to use composer dependency.

dereuromark · Mar 8, 2015 · c860f80 · c860f80
1 parent 2965a15
commit c860f80
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/Lib/InlineCssLib.php b/Lib/InlineCssLib.php
@@ -63,10 +63,12 @@ public function process($html, $css = null) {
 	 * @return string Result
 	 */
 	protected function _processEmogrifier($html, $css) {
-		//$css .= $this->_extractAndRemoveCss($html);
-		App::import('Vendor', 'Tools.Emogrifier', ['file' => 'Emogrifier/Emogrifier.php']);
-
-		$Emogrifier = new Emogrifier($html, $css);
+		if (class_exists('\Pelago\Emogrifier')) {
+			$Emogrifier = new \Pelago\Emogrifier($html, $css);
+		} else {
+			App::import('Vendor', 'Tools.Emogrifier', ['file' => 'Emogrifier/Emogrifier.php']);
+			$Emogrifier = new Emogrifier($html, $css);
+		}
 		//$Emogrifier->preserveEncoding = true;
 
 		$result = $Emogrifier->emogrify();

diff --git a/Test/Case/Lib/InlineCssLibTest.php b/Test/Case/Lib/InlineCssLibTest.php
@@ -218,7 +218,7 @@ public function testProcessCompleteTemplateAlternativeEngine() {
 		$html = file_get_contents($path . 'email_template.html');
 		$result = $this->InlineCss->process($html);
 		$this->debug($result);
-		$expected = '<td  style="vertical-align:top;';
+		$expected = '<td  style="vertical-align:';
 		$this->assertTextContains($expected, $result);
 
 		$this->InlineCss = new InlineCssLib(['engine' => InlineCssLib::ENGINE_EMOGRIFIER]);

diff --git a/composer.json b/composer.json
@@ -22,5 +22,8 @@
 	},
 	"extra": {
 		"installer-name": "Tools"
+	},
+	"suggest": {
+		"pelago/emogrifier": "When using InlineCss lib and CSS to inline HTML transformation."
 	}
 }