Merge branch 'master' of github.com:/ChristophWurst/twofactor_u2f into release/1.5.0

.scrutinizer.yml

@@ -1,7 +1,6 @@
 filter:
     excluded_paths:
         - 'js/tests/*'
-        - 'js/vendor/*'
         - 'vendor/*'
         - 'l10n/*'
         - 'tests/*'
@@ -12,5 +11,5 @@ imports:
 
 tools:
     external_code_coverage:
-        timeout: 7200 # Timeout in seconds. 120 minutes
-        runs: 6
+        timeout: 600 # Timeout in seconds. 10 minutes
+        runs: 1

.travis.yml

@@ -7,6 +7,7 @@ php:
   - 5.6
   - 7.0
   - 7.1
+  - 7.2
 
 addons:
   apt:
@@ -21,19 +22,20 @@ services:
 
 env:
   global:
-  - PHP_COVERAGE=TRUE
+  - PHP_COVERAGE=FALSE
   - TEST_JS=FALSE
+  - CORE_BRANCH=master
   matrix:
-  - CORE_BRANCH=master   DB=sqlite
-  - CORE_BRANCH=master   DB=pgsql
-  # Uncomment when nc13 is out
-  #- CORE_BRANCH=stable12 DB=sqlite
-  #- CORE_BRANCH=stable12 DB=mysql
-  #- CORE_BRANCH=stable12 DB=pgsql
+  - DB=sqlite
 
 matrix:
   include:
-    - env: "CORE_BRANCH=master DB=mysql TEST_JS=TRUE"
+    - php: 7.0
+      env: "DB=mysql PHP_COVERAGE=TRUE"
+    - php: 7.1
+      env: "DB=mysql TEST_JS=TRUE"
+    - php: 7.2
+      env: "DB=pgsql"
   fast_finish: true
 
 branches:

package-lock.json

@@ -707,28 +707,18 @@
       "dev": true
     },
     "coveralls": {
-      "version": "2.13.3",
-      "resolved": "https://registry.npmjs.org/coveralls/-/coveralls-2.13.3.tgz",
-      "integrity": "sha512-iiAmn+l1XqRwNLXhW8Rs5qHZRFMYp9ZIPjEOVRpC/c4so6Y/f4/lFi0FfR5B9cCqgyhkJ5cZmbvcVRfP8MHchw==",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/coveralls/-/coveralls-3.0.0.tgz",
+      "integrity": "sha512-ZppXR9y5PraUOrf/DzHJY6gzNUhXYE3b9D43xEXs4QYZ7/Oe0Gy0CS+IPKWFfvQFXB3RG9QduaQUFehzSpGAFw==",
       "dev": true,
       "requires": {
-        "js-yaml": "3.6.1",
+        "js-yaml": "3.8.2",
         "lcov-parse": "0.0.10",
         "log-driver": "1.2.5",
         "minimist": "1.2.0",
         "request": "2.79.0"
       },
       "dependencies": {
-        "js-yaml": {
-          "version": "3.6.1",
-          "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.6.1.tgz",
-          "integrity": "sha1-bl/mfYsgXOTSL60Ft3geja3MSzA=",
-          "dev": true,
-          "requires": {
-            "argparse": "1.0.9",
-            "esprima": "2.7.3"
-          }
-        },
         "minimist": {
           "version": "1.2.0",
           "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",

package.json

@@ -14,7 +14,7 @@
   },
   "devDependencies": {
     "backbone": "^1.3.3",
-    "coveralls": "^2.13.3",
+    "coveralls": "^3.0.0",
     "jasmine": "^2.8.0",
     "jasmine-ajax": "^3.3.1",
     "jasmine-core": "^2.8.0",