Upgrade to Laravel 6.0

This commit is contained in:
Bubka 2020-10-11 20:40:28 +02:00
parent 6d1424e195
commit c653208706
3 changed files with 2196 additions and 904 deletions

View File

@ -1,31 +1,30 @@
{ {
"name": "laravel/laravel", "name": "bubka/2fauth",
"type": "project", "type": "project",
"description": "The Laravel Framework.", "description": "Two-Factor authentication generator",
"keywords": [ "keywords": [
"framework", "2fauth",
"laravel" "two-actor authentication"
], ],
"license": "MIT", "license": "MIT",
"require": { "require": {
"php": "^7.1.3", "php": "^7.2",
"appstract/laravel-options": "^3.0",
"doctrine/dbal": "^2.10",
"fideloper/proxy": "^4.0", "fideloper/proxy": "^4.0",
"laravel/framework": "6.*",
"laravel/tinker": "^2.0",
"laravel/passport": "^9.3.2",
"doctrine/dbal": "^2.10",
"spatie/eloquent-sortable": "^3.9",
"spomky-labs/otphp": "^10.0",
"khanamiryan/qrcode-detector-decoder": "^1.0", "khanamiryan/qrcode-detector-decoder": "^1.0",
"laravel/framework": "5.8.*", "appstract/laravel-options": "^3.0"
"laravel/passport": "^7.2",
"laravel/tinker": "^1.0",
"spatie/eloquent-sortable": "^3.8",
"spomky-labs/otphp": "^10.0"
}, },
"require-dev": { "require-dev": {
"beyondcode/laravel-dump-server": "^1.0", "facade/ignition": "^1.4",
"filp/whoops": "^2.0", "fzaninotto/faker": "^1.9",
"fzaninotto/faker": "^1.4",
"mockery/mockery": "^1.0", "mockery/mockery": "^1.0",
"nunomaduro/collision": "^3.0", "nunomaduro/collision": "^3.0",
"phpunit/phpunit": "^7.5" "phpunit/phpunit": "^9.3"
}, },
"config": { "config": {
"optimize-autoloader": true, "optimize-autoloader": true,

3067
composer.lock generated

File diff suppressed because it is too large Load Diff

View File

@ -14,7 +14,7 @@ class RouteTest extends TestCase
*/ */
public function testLandingViewIsReturned() public function testLandingViewIsReturned()
{ {
$response = $this->get(route('landing', ['any' => ''])); $response = $this->get(route('landing', ['any' => '/']));
$response->assertSuccessful() $response->assertSuccessful()
->assertViewIs('landing'); ->assertViewIs('landing');