Skip to content

Laravel 5.6 Shift #348

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Feb 18, 2018
Merged

Laravel 5.6 Shift #348

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
65ce774
Shift Middleware
laravel-shift Feb 11, 2018
7a58fd6
Shift configuration
laravel-shift Feb 11, 2018
53e49a5
Shift Laravel dependencies
laravel-shift Feb 11, 2018
57d27ca
Import class
driesvints Feb 11, 2018
3fc0a6d
Revert changes to composer file and remove symfony
driesvints Feb 11, 2018
0aeaf36
Upgrade dependencies
driesvints Feb 18, 2018
9c324bb
Update CreatesApplication
driesvints Feb 18, 2018
f83c175
Upgrade some more stuff
driesvints Feb 18, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions app/Http/Kernel.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
use App\Http\Middleware\RedirectIfBanned;
use Illuminate\Auth\Middleware\Authorize;
use Illuminate\Auth\Middleware\Authenticate;
use Illuminate\Http\Middleware\SetCacheHeaders;
use Illuminate\Session\Middleware\StartSession;
use App\Http\Middleware\RedirectIfAuthenticated;
use Illuminate\Routing\Middleware\ThrottleRequests;
Expand Down Expand Up @@ -72,6 +73,7 @@ class Kernel extends HttpKernel
'auth' => Authenticate::class,
'auth.basic' => AuthenticateWithBasicAuth::class,
'bindings' => SubstituteBindings::class,
'cache.headers' => SetCacheHeaders::class,
'can' => Authorize::class,
'guest' => RedirectIfAuthenticated::class,
'throttle' => ThrottleRequests::class,
Expand Down
12 changes: 3 additions & 9 deletions app/Http/Middleware/TrustProxies.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,9 @@ class TrustProxies extends Middleware
protected $proxies;

/**
* The current proxy header mappings.
* The headers that should be used to detect proxies.
*
* @var array
* @var string
*/
protected $headers = [
Request::HEADER_FORWARDED => 'FORWARDED',
Request::HEADER_X_FORWARDED_FOR => 'X_FORWARDED_FOR',
Request::HEADER_X_FORWARDED_HOST => 'X_FORWARDED_HOST',
Request::HEADER_X_FORWARDED_PORT => 'X_FORWARDED_PORT',
Request::HEADER_X_FORWARDED_PROTO => 'X_FORWARDED_PROTO',
];
protected $headers = Request::HEADER_X_FORWARDED_ALL;
}
8 changes: 0 additions & 8 deletions app/Providers/AppServiceProvider.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@

use Horizon;
use App\Models\Thread;
use Psr\Log\LoggerInterface;
use Illuminate\Contracts\Logging\Log;
use Illuminate\Support\ServiceProvider;
use Illuminate\Database\Eloquent\Relations\Relation;

Expand Down Expand Up @@ -40,10 +38,4 @@ public function bootHorizon()
return auth()->check() && auth()->user()->emailAddress() === $horizonEmail;
});
}

public function register()
{
$this->app->alias('bugsnag.multi', Log::class);
$this->app->alias('bugsnag.multi', LoggerInterface::class);
}
}
23 changes: 11 additions & 12 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,18 @@
"license": "MIT",
"type": "project",
"require": {
"php": "^7.1",
"bugsnag/bugsnag-laravel": "^2.4",
"php": ">=7.1.3",
"bugsnag/bugsnag-laravel": "^2.14",
"doctrine/dbal": "^2.5",
"fideloper/proxy": "^3.3",
"fideloper/proxy": "^4.0",
"guzzlehttp/guzzle": "^6.3",
"laravel/framework": "5.5.*",
"laravel/framework": "5.6.*",
"laravel/horizon": "^1.1",
"laravel/socialite": "^3.0",
"laravel/tinker": "^1.0",
"laravelcollective/html": "5.5.*",
"laravelcollective/html": "5.6.*",
"lasserafn/php-initial-avatar-generator": "^2.0",
"league/commonmark": "^0.15.2",
"league/commonmark": "^0.17.0",
"predis/predis": "^1.1",
"ramsey/uuid": "^3.7",
"roave/security-advisories": "dev-master",
Expand All @@ -27,13 +27,12 @@
"fzaninotto/faker": "^1.6",
"jakub-onderka/php-console-highlighter": "^0.3.2",
"jakub-onderka/php-parallel-lint": "^0.9.2",
"laravel/browser-kit-testing": "^2.0",
"laravel/homestead": "^5",
"laravel/browser-kit-testing": "^4.0",
"laravel/homestead": "^7",
"mockery/mockery": "^1.0",
"phpspec/phpspec": "^3.2",
"phpunit/phpunit": "^6.4",
"symfony/css-selector": "^3.1",
"symfony/dom-crawler": "^3.1"
"nunomaduro/collision": "^2.0",
"phpspec/phpspec": "^4.3",
"phpunit/phpunit": "^7.0"
},
"autoload": {
"classmap": [
Expand Down
Loading