Merge pull request #18 from vanilla/feature/travis-php72

DaazKu · web-flow · commit 58651edbc4c4 · 2017-09-13T15:20:25.000-04:00
Test php 7.2 on travis
diff --git a/.travis.yml b/.travis.yml
@@ -5,6 +5,8 @@ php:
     - 5.5
     - 5.6
     - 7.0
+    - 7.1
+    - 7.2
     - hhvm
 
 sudo: false
diff --git a/tests/XssTest.php b/tests/XssTest.php
@@ -129,7 +129,7 @@ public function testDom($str, $config = [], $spec = '') {
         }
 
         // Test bad elements.
-        if (count($config) == 1 && !empty($config['safe'])) {
+        if (is_array($config) && count($config) == 1 && !empty($config['safe'])) {
             $elems = ['applet', 'iframe', 'script', 'embed', 'object'];
         } else {
             $elems = ['applet', 'form', 'input', 'textarea', 'iframe', 'script', 'style', 'embed', 'object'];
@@ -297,4 +297,4 @@ public function provideEvasionTests() {
         return $result;
     }
 }
- 
+ 

-Original file line number
+Diff line change
     - 5.5
     - 5.6
     - 7.0
 +    - 7.1
 +    - 7.2
     - hhvm
 sudo: false
Original file line number	Diff line number	Diff line change
`@@ -129,7 +129,7 @@ public function testDom($str, $config = [], $spec = '') {`
`129`	`129`	`}`
`130`	`130`
`131`	`131`	`// Test bad elements.`
`132`		`- if (count($config) == 1 && !empty($config['safe'])) {`
	`132`	`+ if (is_array($config) && count($config) == 1 && !empty($config['safe'])) {`
`133`	`133`	`$elems = ['applet', 'iframe', 'script', 'embed', 'object'];`
`134`	`134`	`} else {`
`135`	`135`	`$elems = ['applet', 'form', 'input', 'textarea', 'iframe', 'script', 'style', 'embed', 'object'];`
`@@ -297,4 +297,4 @@ public function provideEvasionTests() {`
`297`	`297`	`return $result;`
`298`	`298`	`}`
`299`	`299`	`}`
`300`		`-`
	`300`	`+`