Run tests with php 7.0 (#904)
This commit is contained in:
+10
-12
@@ -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" &
|
||||
|
||||
Binary file not shown.
@@ -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 @@ class MultiFAController extends Controller
|
||||
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 @@ class MultiFAController extends Controller
|
||||
]);
|
||||
|
||||
//retrieve secret
|
||||
$secret = $request->session()->pull(self::SESSION_TFA_SECRET);
|
||||
$secret = $request->session()->pull($this->SESSION_TFA_SECRET);
|
||||
|
||||
$authenticator = app(Authenticator::class)->boot($request);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user