Skip to content

Commit

Permalink
⬆️ Update to Laravel 5.6
Browse files Browse the repository at this point in the history
  • Loading branch information
octfx committed Feb 8, 2018
1 parent 9602c58 commit ff2ccce
Show file tree
Hide file tree
Showing 11 changed files with 955 additions and 780 deletions.
22 changes: 22 additions & 0 deletions app/Http/Middleware/TrimStrings.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
<?php declare(strict_types = 1);

namespace App\Http\Middleware;

use Illuminate\Foundation\Http\Middleware\TrimStrings as Middleware;

/**
* Class TrimStrings
* @package App\Http\Middleware
*/
class TrimStrings extends Middleware
{
/**
* The names of the attributes that should not be trimmed.
*
* @var array
*/
protected $except = [
'password',
'password_confirmation',
];
}
27 changes: 27 additions & 0 deletions app/Http/Middleware/TrustProxies.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
<?php declare(strict_types = 1);

namespace App\Http\Middleware;

use Illuminate\Http\Request;
use Fideloper\Proxy\TrustProxies as Middleware;

/**
* Class TrustProxies
* @package App\Http\Middleware
*/
class TrustProxies extends Middleware
{
/**
* The trusted proxies for this application.
*
* @var array
*/
protected $proxies;

/**
* The current proxy header mappings.
*
* @var string
*/
protected $headers = Request::HEADER_X_FORWARDED_ALL;
}
3 changes: 0 additions & 3 deletions bootstrap/app.php
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,6 @@
App\Exceptions\Handler::class
);

Illuminate\Pagination\AbstractPaginator::defaultView("pagination::bootstrap-4");
Illuminate\Pagination\AbstractPaginator::defaultSimpleView("pagination::simple-bootstrap-4");

/*
|--------------------------------------------------------------------------
| Return The Application
Expand Down
139 changes: 70 additions & 69 deletions composer.json
Original file line number Diff line number Diff line change
@@ -1,74 +1,75 @@
{
"name": "laravel/laravel",
"description": "The Laravel Framework.",
"keywords": [
"framework",
"laravel"
"name": "laravel/laravel",
"description": "The Laravel Framework.",
"keywords": [
"framework",
"laravel"
],
"license": "MIT",
"type": "project",
"require": {
"php": ">=7.2",
"laravel/framework": "5.6.*",
"laravel/tinker": "~1.0",
"guzzlehttp/guzzle": "^6.3",
"spatie/laravel-fractal": "^5.0.1",
"piwik/piwik-php-tracker": "^1.2",
"jackiedo/log-reader": "2.*",
"hashids/hashids": "^2.0",
"fideloper/proxy": "~4.0"
},
"require-dev": {
"filp/whoops": "~2.0",
"hesto/multi-auth": "^1.0",
"caouecs/laravel-lang": "^3.0",
"fzaninotto/faker": "~1.4",
"mockery/mockery": "~1.0",
"phpunit/phpunit": "^7.0",
"symfony/css-selector": "3.1.*",
"symfony/dom-crawler": "3.1.*",
"squizlabs/php_codesniffer": "2.*",
"escapestudios/symfony2-coding-standard": "~2.0",
"barryvdh/laravel-ide-helper": "^2.3",
"doctrine/dbal": "^2.5"
},
"autoload": {
"classmap": [
"database/seeds",
"database/factories"
],
"license": "MIT",
"type": "project",
"require": {
"php": ">=7.1",
"laravel/framework": "5.5.*",
"guzzlehttp/guzzle": "^6.3",
"spatie/laravel-fractal": "^5.0.1",
"piwik/piwik-php-tracker": "^1.2",
"jackiedo/log-reader": "2.*",
"hashids/hashids": "^2.0"
"psr-4": {
"App\\": "app/"
},
"require-dev": {
"filp/whoops": "~2.0",
"hesto/multi-auth": "^1.0",
"caouecs/laravel-lang": "^3.0",
"laravel/tinker": "~1.0",
"fzaninotto/faker": "~1.4",
"mockery/mockery": "0.9.*",
"phpunit/phpunit": "^6.0",
"symfony/css-selector": "3.1.*",
"symfony/dom-crawler": "3.1.*",
"squizlabs/php_codesniffer": "2.*",
"escapestudios/symfony2-coding-standard": "~2.0",
"barryvdh/laravel-ide-helper": "^2.3",
"doctrine/dbal": "^2.5"
},
"autoload": {
"classmap": [
"database/seeds",
"database/factories"
],
"psr-4": {
"App\\": "app/"
},
"files": [
"app/helpers.php"
]
},
"autoload-dev": {
"psr-4": {
"Tests\\": "tests/"
}
},
"extra": {
"laravel": {
"dont-discover": [
]
}
},
"scripts": {
"post-root-package-install": [
"@php -r \"file_exists('.env') || copy('.env.example', '.env');\""
],
"post-create-project-cmd": [
"@php artisan key:generate"
],
"post-autoload-dump": [
"Illuminate\\Foundation\\ComposerScripts::postAutoloadDump",
"@php artisan package:discover"
]
},
"config": {
"preferred-install": "dist",
"sort-packages": true,
"optimize-autoloader": true
"files": [
"app/helpers.php"
]
},
"autoload-dev": {
"psr-4": {
"Tests\\": "tests/"
}
},
"extra": {
"laravel": {
"dont-discover": [
]
}
},
"scripts": {
"post-root-package-install": [
"@php -r \"file_exists('.env') || copy('.env.example', '.env');\""
],
"post-create-project-cmd": [
"@php artisan key:generate"
],
"post-autoload-dump": [
"Illuminate\\Foundation\\ComposerScripts::postAutoloadDump",
"@php artisan package:discover"
]
},
"config": {
"preferred-install": "dist",
"sort-packages": true,
"optimize-autoloader": true
}
}
Loading

0 comments on commit ff2ccce

Please sign in to comment.