Merge branch 'bumplaravel' into evo2021

This commit is contained in:
Vincent BRIDIER 2021-04-20 16:10:22 +02:00
commit 1712efbf57
6 changed files with 4202 additions and 1269 deletions

View file

@ -4,6 +4,7 @@ namespace App\Exceptions;
use Exception;
use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler;
use Throwable;
class Handler extends ExceptionHandler
{
@ -29,10 +30,10 @@ class Handler extends ExceptionHandler
/**
* Report or log an exception.
*
* @param \Exception $exception
* @param \Throwable $exception
* @return void
*/
public function report(Exception $exception)
public function report(Throwable $exception)
{
parent::report($exception);
}
@ -41,10 +42,10 @@ class Handler extends ExceptionHandler
* Render an exception into an HTTP response.
*
* @param \Illuminate\Http\Request $request
* @param \Exception $exception
* @param \Throwable $exception
* @return \Illuminate\Http\Response
*/
public function render($request, Exception $exception)
public function render($request, Throwable $exception)
{
// if ($exception instanceof \ErrorException) {
// $response = response()->view('errors.500', [], 500);

View file

@ -19,7 +19,7 @@ class Site extends Model
/**
* @var string
*/
protected $keyType = 'varchar';
protected $keyType = 'string';
/**
* @var bool

View file

@ -5,13 +5,14 @@
"license": "MIT",
"type": "project",
"require": {
"php": "^7.1.3",
"php": "^7.3",
"barryvdh/laravel-dompdf": "^0.8.4",
"doctrine/dbal": "^2.8",
"fideloper/proxy": "^4.0",
"laravel/framework": "5.7.*",
"laravel/tinker": "^1.0",
"laravelcollective/html": "^5.4.0",
"laravel/framework": "^8.0",
"laravel/tinker": "^2.0",
"laravel/ui": "^3.0",
"laravelcollective/html": "6.*",
"picqer/php-barcode-generator": "^0.3.0",
"szymach/c-pchart": "^3.0",
"uxweb/sweet-alert": "^2.0"
@ -23,8 +24,8 @@
"fzaninotto/faker": "^1.4",
"laracasts/generators": "^1.1",
"mockery/mockery": "^1.0",
"nunomaduro/collision": "^2.0",
"phpunit/phpunit": "^7.0",
"nunomaduro/collision": "^5.0",
"phpunit/phpunit": "^9.0",
"squizlabs/php_codesniffer": "^3.3"
},
"autoload": {

5437
composer.lock generated

File diff suppressed because it is too large Load diff

View file

@ -1,5 +1,7 @@
<?php
use Illuminate\Support\Str;
return [
/*
@ -124,7 +126,7 @@ return [
'cookie' => env(
'SESSION_COOKIE',
str_slug(env('APP_NAME', 'laravel'), '_').'_session'
Str::slug(env('APP_NAME', 'laravel'), '_').'_session'
),
/*
@ -164,7 +166,7 @@ return [
|
*/
'secure' => env('SESSION_SECURE_COOKIE', false),
'secure' => env('SESSION_SECURE_COOKIE', null),
/*
|--------------------------------------------------------------------------

View file

@ -9,6 +9,10 @@
define('LARAVEL_START', microtime(true));
if (file_exists(__DIR__.'/../storage/framework/maintenance.php')) {
require __DIR__.'/../storage/framework/maintenance.php';
}
/*
|--------------------------------------------------------------------------
| Register The Auto Loader