Merge pull request #16 from OpenBuildings/css-inliner-upgrade

hkdobrev · web-flow · commit 3b5b80d07940 · 2016-08-28T17:50:10.000+03:00
Upgrade tijsverkoyen/css-to-inline-styles to 2.0
diff --git a/.travis.yml b/.travis.yml
@@ -18,6 +18,8 @@ env:
 
 matrix:
   fast_finish: true
+  allow_failures:
+    - php: hhvm
   exclude:
     - php: hhvm
       env: DEPS=lowest
diff --git a/composer.json b/composer.json
@@ -12,7 +12,7 @@
     "require" : {
         "php": ">=5.4",
         "swiftmailer/swiftmailer": "^5.1",
-        "tijsverkoyen/css-to-inline-styles": "^1.5"
+        "tijsverkoyen/css-to-inline-styles": "^2.0"
     },
     "require-dev" : {
         "phpunit/phpunit": "^4.0|^5.0",
diff --git a/composer.lock b/composer.lock
diff --git a/src/CssInlinerPlugin.php b/src/CssInlinerPlugin.php
@@ -28,7 +28,6 @@ public function __construct(CssToInlineStyles $converter = null)
 			$this->converter = $converter;
 		} else {
 			$this->converter = new CssToInlineStyles();
-			$this->converter->setUseInlineStylesBlock(true);
 		}
 	}
 
@@ -40,18 +39,12 @@ public function beforeSendPerformed(Swift_Events_SendEvent $event)
 		$message = $event->getMessage();
 
 		if ($message->getContentType() === 'text/html') {
-			$this->converter->setCSS('');
-			$this->converter->setHTML($message->getBody());
-
-			$message->setBody($this->converter->convert());
+			$message->setBody($this->converter->convert($message->getBody()));
 		}
 
 		foreach ($message->getChildren() as $part) {
 			if (strpos($part->getContentType(), 'text/html') === 0) {
-				$this->converter->setCSS('');
-				$this->converter->setHTML($part->getBody());
-
-				$part->setBody($this->converter->convert());
+				$part->setBody($this->converter->convert($part->getBody()));
 			}
 		}
 	}
diff --git a/tests/fixtures/emailConverted.html b/tests/fixtures/emailConverted.html
@@ -1,14 +1,18 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">
-<html><head><style>
+<html>
+  <head>
+    <style><![CDATA[
 			.block {
 				width: 100px;
 				height: 20px;
 			}
 			div.block ul li.small {
 				margin: 10px;
 			}
-		</style></head><body>
-		<div class="block" style="height: 20px; width: 100px;">
+		]]></style>
+  </head>
+  <body>
+		<div class="block" style="width: 100px; height: 20px;">
 			text
 
 			<ul><li>
@@ -18,4 +22,5 @@
 					Small list
 				</li>
 			</ul></div>
-	</body></html>
+	</body>
+</html>
diff --git a/tests/src/CssInlinerPluginTest.php b/tests/src/CssInlinerPluginTest.php
@@ -87,24 +87,6 @@ public function testHtmlPart()
 		$this->assertEquals($this->emailConverted, $children[0]->getBody());
 	}
 
-	/**
-	 * @covers ::__construct
-	 */
-	public function testDefaultConverterUsesInlineStylesBlock()
-	{
-		$plugin = new CssInlinerPlugin();
-
-		$converter = PHPUnit_Framework_Assert::readAttribute($plugin, 'converter');
-
-		$this->assertTrue(
-			PHPUnit_Framework_Assert::readAttribute(
-				$converter,
-				'useInlineStylesBlock'
-			),
-			'setUseInlineStylesBlock() should be called on default $converter'
-		);
-	}
-
 	/**
 	 * @covers ::__construct
 	 * @covers ::beforeSendPerformed

Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,6 @@ public function __construct(CssToInlineStyles $converter = null)`
`28`	`28`	`$this->converter = $converter;`
`29`	`29`	`} else {`
`30`	`30`	`$this->converter = new CssToInlineStyles();`
`31`		`- $this->converter->setUseInlineStylesBlock(true);`
`32`	`31`	`}`
`33`	`32`	`}`
`34`	`33`
`@@ -40,18 +39,12 @@ public function beforeSendPerformed(Swift_Events_SendEvent $event)`
`40`	`39`	`$message = $event->getMessage();`
`41`	`40`
`42`	`41`	`if ($message->getContentType() === 'text/html') {`
`43`		`- $this->converter->setCSS('');`
`44`		`- $this->converter->setHTML($message->getBody());`
`45`		`-`
`46`		`- $message->setBody($this->converter->convert());`
	`42`	`+ $message->setBody($this->converter->convert($message->getBody()));`
`47`	`43`	`}`
`48`	`44`
`49`	`45`	`foreach ($message->getChildren() as $part) {`
`50`	`46`	`if (strpos($part->getContentType(), 'text/html') === 0) {`
`51`		`- $this->converter->setCSS('');`
`52`		`- $this->converter->setHTML($part->getBody());`
`53`		`-`
`54`		`- $part->setBody($this->converter->convert());`
	`47`	`+ $part->setBody($this->converter->convert($part->getBody()));`
`55`	`48`	`}`
`56`	`49`	`}`
`57`	`50`	`}`