Merge 39025d9 into 613d694

wmde · Aug 5, 2017 · 2a0f715 · 2a0f715
2 parents 613d694 + 39025d9
commit 2a0f715
Show file tree

Hide file tree

Showing 19 changed files with 116 additions and 3,097 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -6,6 +6,7 @@
 .travis.yml export-ignore
 build export-ignore
 composer.json export-ignore
+karma.conf.js export-ignore
 phpcs.xml export-ignore
 phpunit.xml.dist export-ignore
 tests export-ignore
diff --git a/.travis.yml b/.travis.yml
@@ -1,28 +1,29 @@
 language: php
 
 env:
-  - QUNIT=false
+  - JS_BUILD=false
 
 dist: trusty
 
 php:
   - 5.5
   - 5.6
   - 7
+  - 7.1
   - hhvm
 
 matrix:
   include:
     - php: 5.5
-      env: QUNIT=true
+      env: JS_BUILD=true
 
 before_script:
   - composer install --prefer-source
-  - npm install eslint eslint-config-wikimedia
+  - if [[ "$JS_BUILD" == true ]]; then npm install; fi
 
 script:
   - composer test
-  - bash ./build/travis/script.sh
+  - if [[ "$JS_BUILD" == true ]]; then npm test; fi
 
 notifications:
   email:

diff --git a/build/travis/script.sh b/build/travis/script.sh
diff --git a/composer.json b/composer.json
@@ -23,7 +23,7 @@
 		"irc": "irc://irc.freenode.net/wikidata"
 	},
 	"require": {
-		"php": ">=5.5.0"
+		"php": ">=5.5.9"
 	},
 	"require-dev": {
 		"phpunit/phpunit": "~4.8",

diff --git a/js/config.js b/js/config.js
diff --git a/js/lib/TestRunner/TestRunner.js b/js/lib/TestRunner/TestRunner.js
diff --git a/js/lib/TestRunner/TestRunner.phantom.js b/js/lib/TestRunner/TestRunner.phantom.js
diff --git a/js/lib/TestRunner/runTests.phantom.js b/js/lib/TestRunner/runTests.phantom.js
diff --git a/js/lib/jquery/jquery.js b/js/lib/jquery/jquery.js
diff --git a/js/lib/qunit.parameterize/LICENCE b/js/lib/qunit.parameterize/LICENCE