Skip to content

Commit

Permalink
Upgrade to laravel/framework 5.6 (#44)
Browse files Browse the repository at this point in the history
* Updating laravel/framework to 5.6.* + related changes.

* Updating php requirement to ^7.2

* Updating .travis.yml php version to ^7.2

* Trying fixing "Chrome version must be between 70 and 73" by downgrading Laravel Dusk to "^3.0"

* Adding .editorconfig

* Removing deprecated APP_LOG_LEVEL=debug from .env.example
  • Loading branch information
mchekin authored Nov 18, 2019
1 parent 74aaf16 commit f894a0d
Show file tree
Hide file tree
Showing 8 changed files with 1,498 additions and 828 deletions.
15 changes: 15 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
root = true

[*]
charset = utf-8
end_of_line = lf
insert_final_newline = true
indent_style = space
indent_size = 4
trim_trailing_whitespace = true

[*.md]
trim_trailing_whitespace = false

[*.{yml,yaml}]
indent_size = 2
1 change: 0 additions & 1 deletion .env.example
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ APP_NAME="Browser Adventure"
APP_ENV=local
APP_KEY=
APP_DEBUG=true
APP_LOG_LEVEL=debug
APP_URL=http://localhost:8000

DB_CONNECTION=sqlite
Expand Down
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ language: php
dist: trusty

php:
- 7.1
- 7.2

install:
- cp .env.example .env
Expand Down
10 changes: 5 additions & 5 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,19 +8,19 @@
"license": "MIT",
"type": "project",
"require": {
"php": ">=7.0.0",
"fideloper/proxy": "~3.3",
"php": "^7.2",
"fideloper/proxy": "^4.0",
"intervention/image": "^2.4",
"laravel/framework": "5.5.*",
"laravel/framework": "5.6.*",
"laravel/tinker": "~1.0",
"tcg/voyager": "^1.2"
},
"require-dev": {
"filp/whoops": "~2.0",
"fzaninotto/faker": "~1.4",
"laravel/dusk": "^2.0",
"laravel/dusk": "^3.0",
"mockery/mockery": "0.9.*",
"phpunit/phpunit": "~6.0"
"phpunit/phpunit": "^7.0"
},
"autoload": {
"files": [
Expand Down
Loading

0 comments on commit f894a0d

Please sign in to comment.