Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 10 additions & 12 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -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

Expand All @@ -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
Expand Down Expand Up @@ -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" &
Expand Down
Binary file modified .travis.yml.sig
Binary file not shown.
6 changes: 3 additions & 3 deletions app/Http/Controllers/Settings/MultiFAController.php
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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]);
}
Expand All @@ -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);

Expand Down