diff --git a/.travis.yml b/.travis.yml index 80122993335..f0da284b147 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,10 +17,15 @@ matrix: - DB=mysql - SELENIUM=1 - COVERAGE=1 - exclude: - - php: 7.1 - env: DB=mysql + - php: 7.0 + env: + - DB=mysql + - SELENIUM=1 - php: 7.2 + env: + - DB=mysql + - SELENIUM=1 + - php: 7.1 env: DB=postgres allow_failures: - php: 7.2 @@ -58,14 +56,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" & diff --git a/.travis.yml.sig b/.travis.yml.sig index e3376b8b31c..eca6565223a 100644 Binary files a/.travis.yml.sig and b/.travis.yml.sig differ 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);