Skip to content

Commit d1bbcaf

Browse files
Merge pull request antonioribeiro#182 from davidrushton/feature/laravel-10-support
Laravel 10.x Support
2 parents 5757fc5 + 766c0d0 commit d1bbcaf

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ You can scan the QR code on [this (old) demo page](https://antoniocarlosribeiro.
4141
|---------|-----------|-------------------|
4242
| 4.2 | <= 1.0.1 | |
4343
| 5.0-5.1 | <= 1.0.1 | |
44-
| 5.2-8.x | >= 2.0.0 | >= 0.2.0 |
44+
| 5.2-10.x | >= 2.0.0 | >= 0.2.0 |
4545

4646
Before Google2FA 2.0 (Laravel 5.1) you have to install `pragmarx/google2fa:~1.0`, because this package was both a Laravel package and a PHP (agnostic).
4747

composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@
1212
],
1313
"require": {
1414
"php": ">=7.0",
15-
"laravel/framework": ">=5.4.36|^8.0|^9.0",
15+
"laravel/framework": ">=5.4.36|^8.0|^9.0|^10.0",
1616
"pragmarx/google2fa-qrcode": "^1.0|^2.0|^3.0"
1717
},
1818
"require-dev": {
1919
"phpunit/phpunit": "~5|~6|~7|~8|~9",
20-
"orchestra/testbench": "3.4.*|3.5.*|3.6.*|3.7.*|4.*|5.*|6.*",
20+
"orchestra/testbench": "3.4.*|3.5.*|3.6.*|3.7.*|4.*|5.*|6.*|7.*|8.*",
2121
"bacon/bacon-qr-code": "^2.0"
2222
},
2323
"autoload": {

tests/Google2FaLaravelTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ public function testLogin()
184184
$this->startSession();
185185

186186
$request = $this->createEmptyRequest();
187-
$request->setLaravelSession($this->app['session']);
187+
$request->setLaravelSession($this->app['session.store']);
188188

189189
$authenticator = app(\PragmaRX\Google2FALaravel\Google2FA::class)->boot($request);
190190

0 commit comments

Comments
 (0)