Merge pull request #217 from gRegorLove/update-travis

gRegorLove · web-flow · commit 18ca68808f4d · 2019-12-06T21:17:30.000-08:00
Update Travis CI and fix failing test
diff --git a/.editorconfig b/.editorconfig
@@ -5,3 +5,7 @@ end_of_line = lf
 trim_trailing_whitespace = true
 insert_final_newline = true
 charset = utf-8
+
+[*.yml]
+indent_style = space
+indent_size = 2
diff --git a/.travis.yml b/.travis.yml
@@ -1,3 +1,4 @@
+dist: trusty
 language: php
 php:
   - 5.4
diff --git a/tests/Mf2/ParserTest.php b/tests/Mf2/ParserTest.php
@@ -372,7 +372,7 @@ public function testApplyTransformationToSrcset() {
 	public function testRelativeURLResolvedWithFinalURL() {
 		$mf = Mf2\fetch('http://aaron.pk/4Zn5');
 
-		$this->assertEquals('https://aaronparecki.com/2014/12/23/5/photo.jpeg', $mf['items'][0]['properties']['photo'][0]);
+		$this->assertEquals('https://aaronparecki.com/img/1240x0/2014/12/23/5/photo.jpeg', $mf['items'][0]['properties']['photo'][0]);
 	}
 
 	public function testScriptTagContentsRemovedFromTextValue() {

Original file line number	Diff line number	Diff line change
`@@ -372,7 +372,7 @@ public function testApplyTransformationToSrcset() {`
`372`	`372`	`public function testRelativeURLResolvedWithFinalURL() {`
`373`	`373`	`$mf = Mf2\fetch('http://aaron.pk/4Zn5');`
`374`	`374`
`375`		`- $this->assertEquals('https://aaronparecki.com/2014/12/23/5/photo.jpeg', $mf['items'][0]['properties']['photo'][0]);`
	`375`	`+ $this->assertEquals('https://aaronparecki.com/img/1240x0/2014/12/23/5/photo.jpeg', $mf['items'][0]['properties']['photo'][0]);`
`376`	`376`	`}`
`377`	`377`
`378`	`378`	`public function testScriptTagContentsRemovedFromTextValue() {`