From 23ae05f8f4f3bdd538bb8d967ab8d19db08ab601 Mon Sep 17 00:00:00 2001
From: Alexis Saettler <alexis@saettler.org>
Date: Fri, 16 Feb 2018 13:10:55 +0100
Subject: [PATCH 1/3] Run tests with php 7.0

---
 .travis.yml | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 80122993335..09268161124 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,19 +1,12 @@
 sudo: required
 language: php
 
-php:
-  - 7.1
-  - 7.2
-
 services:
   - mysql
   - docker
   - postgresql
 
 env:
-  matrix:
-    - DB=mysql
-    - DB=postgres
   global:
     - SAUCELABS=1
 
@@ -24,13 +17,15 @@ matrix:
         - DB=mysql
         - SELENIUM=1
         - COVERAGE=1
-  exclude:
-    - php: 7.1
+    - php: 7.0
       env: DB=mysql
     - php: 7.2
+      env: DB=mysql
+    - php: 7.1
       env: DB=postgres
   allow_failures:
     - php: 7.2
+    - php: 7.0
     - env: DB=postgres
   fast_finish: true
 
@@ -58,14 +53,14 @@ before_install:
 
 install:
   # Get packages without require-dev
-  - travis_retry composer install --no-interaction --prefer-dist --no-suggest --no-dev
+  - travis_retry composer install --no-interaction --prefer-dist --no-suggest --ignore-platform-reqs --no-dev
   # Build js and css assets
   - npm install
   - npm run production
   # Create dist file before running composer install with dev dependencies
   - make dist
   # Get packages with require-dev
-  - travis_retry composer install --no-interaction --prefer-dist --no-suggest
+  - travis_retry composer install --no-interaction --prefer-dist --no-suggest --ignore-platform-reqs
 
 before_script:
   - bash -c "if [[ \"$SELENIUM\" == \"1\" && \"$SAUCELABS\" != \"1\" ]]; then google-chrome-stable --headless --disable-gpu --remote-debugging-port=9222 http://localhost; fi" &

From a62503f7b15d6372aa0c83118bd63a79dd7eeb80 Mon Sep 17 00:00:00 2001
From: Alexis Saettler <alexis@saettler.org>
Date: Fri, 16 Feb 2018 13:48:21 +0100
Subject: [PATCH 2/3] Compatibility with php7.0

---
 app/Http/Controllers/Settings/MultiFAController.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/Http/Controllers/Settings/MultiFAController.php b/app/Http/Controllers/Settings/MultiFAController.php
index eb16866855d..dc9c51e5a30 100644
--- a/app/Http/Controllers/Settings/MultiFAController.php
+++ b/app/Http/Controllers/Settings/MultiFAController.php
@@ -17,7 +17,7 @@ class MultiFAController extends Controller
     /**
      * Session var name to store secret code.
      */
-    private const SESSION_TFA_SECRET = '2FA_secret';
+    private $SESSION_TFA_SECRET = '2FA_secret';
 
     /**
      * Create a new authentication controller instance.
@@ -48,7 +48,7 @@ public function enableTwoFactor(Request $request)
             200
         );
 
-        $request->session()->put(self::SESSION_TFA_SECRET, $secret);
+        $request->session()->put($this->SESSION_TFA_SECRET, $secret);
 
         return view('settings.security.2fa-enable', ['image' => $imageDataUri, 'secret' => $secret]);
     }
@@ -64,7 +64,7 @@ public function validateTwoFactor(Request $request)
         ]);
 
         //retrieve secret
-        $secret = $request->session()->pull(self::SESSION_TFA_SECRET);
+        $secret = $request->session()->pull($this->SESSION_TFA_SECRET);
 
         $authenticator = app(Authenticator::class)->boot($request);
 

From 0f178f270676c6069a62bb14e1944d858d3cdd7e Mon Sep 17 00:00:00 2001
From: Alexis Saettler <alexis@saettler.org>
Date: Fri, 16 Feb 2018 14:12:07 +0100
Subject: [PATCH 3/3] Run browser tests with php7.0 and php7.2

---
 .travis.yml     |   9 ++++++---
 .travis.yml.sig | Bin 72 -> 72 bytes
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 09268161124..f0da284b147 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -18,14 +18,17 @@ matrix:
         - SELENIUM=1
         - COVERAGE=1
     - php: 7.0
-      env: DB=mysql
+      env:
+        - DB=mysql
+        - SELENIUM=1
     - php: 7.2
-      env: DB=mysql
+      env:
+        - DB=mysql
+        - SELENIUM=1
     - php: 7.1
       env: DB=postgres
   allow_failures:
     - php: 7.2
-    - php: 7.0
     - env: DB=postgres
   fast_finish: true
 
diff --git a/.travis.yml.sig b/.travis.yml.sig
index e3376b8b31c73143b4101484a049fc022d5000bf..eca6565223ac4daf10ef11b555856784dd228b83 100644
GIT binary patch
literal 72
zcmV-O0Jr~$Mg#y60ssaD0$PUHdH@Ou5V(?)9ivER@7!YmpLpCqKBnkF?2y*^05zs&
eSNkUopa7i`x3VSO_^EI2HU}?oe$ZU=ScDeGupT!6

literal 72
zcmV-O0Jr~$Mg#y60ssaD0$PE}!~hBj5V(?)9ivER@6?0<pFpJs7Jp}5doT<K6Oqh4
ebNWYdfB>Itf};d9Psb#rsh=}c^rr(J@7GpW=^F9?