Skip to content
This repository was archived by the owner on May 21, 2021. It is now read-only.

Commit 44bb5be

Browse files
authored
Merge pull request #33 from hedii/laravel56
Upgrade Laravel to 5.6
2 parents b292974 + 0c2b3cb commit 44bb5be

File tree

10 files changed

+502
-380
lines changed

10 files changed

+502
-380
lines changed

.env.example

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,10 @@ APP_NAME=Crawler
22
APP_ENV=local
33
APP_KEY=
44
APP_DEBUG=true
5-
APP_LOG_LEVEL=debug
65
APP_URL=http://crawler.localhost
76

7+
LOG_CHANNEL=stack
8+
89
DB_CONNECTION=mysql
910
DB_HOST=127.0.0.1
1011
DB_PORT=3306
@@ -33,3 +34,6 @@ PUSHER_APP_ID=
3334
PUSHER_APP_KEY=
3435
PUSHER_APP_SECRET=
3536
PUSHER_APP_CLUSTER=mt1
37+
38+
MIX_PUSHER_APP_KEY="${PUSHER_APP_KEY}"
39+
MIX_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}"

app/Http/Middleware/TrustProxies.php

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,9 @@ class TrustProxies extends Middleware
1515
protected $proxies;
1616

1717
/**
18-
* The current proxy header mappings.
18+
* The headers that should be used to detect proxies.
1919
*
20-
* @var array
20+
* @var string
2121
*/
22-
protected $headers = [
23-
Request::HEADER_FORWARDED => 'FORWARDED',
24-
Request::HEADER_X_FORWARDED_FOR => 'X_FORWARDED_FOR',
25-
Request::HEADER_X_FORWARDED_HOST => 'X_FORWARDED_HOST',
26-
Request::HEADER_X_FORWARDED_PORT => 'X_FORWARDED_PORT',
27-
Request::HEADER_X_FORWARDED_PROTO => 'X_FORWARDED_PROTO',
28-
];
22+
protected $headers = Request::HEADER_X_FORWARDED_ALL;
2923
}

app/Providers/AppServiceProvider.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
namespace App\Providers;
44

5-
use Illuminate\Support\Facades\Blade;
65
use Illuminate\Support\ServiceProvider;
76

87
class AppServiceProvider extends ServiceProvider
@@ -14,7 +13,7 @@ class AppServiceProvider extends ServiceProvider
1413
*/
1514
public function boot()
1615
{
17-
Blade::doubleEncode();
16+
//
1817
}
1918

2019
/**

composer.json

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,19 +15,20 @@
1515
"require": {
1616
"php": ">=7.2.0",
1717
"doctrine/dbal": "^2.6",
18-
"fideloper/proxy": "~3.3",
18+
"fideloper/proxy": "~4.0",
1919
"guzzlehttp/guzzle": "^6.3",
2020
"hedii/extractors": "^2.0",
21-
"laravel/framework": "5.5.*",
22-
"laravel/passport": "^4.0",
21+
"laravel/framework": "5.6.*",
22+
"laravel/passport": "~5.0",
2323
"laravel/tinker": "~1.0"
2424
},
2525
"require-dev": {
2626
"barryvdh/laravel-ide-helper": "^2.4",
2727
"filp/whoops": "~2.0",
2828
"fzaninotto/faker": "~1.4",
2929
"mockery/mockery": "~1.0",
30-
"phpunit/phpunit": "~6.0",
30+
"nunomaduro/collision": "~1.1",
31+
"phpunit/phpunit": "~7.0",
3132
"symfony/thanks": "^1.0"
3233
},
3334
"autoload": {

0 commit comments

Comments
 (0)