Update to Laravel 5.8
This commit is contained in:
parent
82f6dfbece
commit
7f0fb16dc3
@ -40,6 +40,7 @@ A full development environment can be brought up using Docker:
|
||||
```bash
|
||||
composer install
|
||||
npm install
|
||||
docker-compose build
|
||||
docker-compose up
|
||||
```
|
||||
|
||||
|
@ -9,6 +9,7 @@ use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler;
|
||||
use Illuminate\Validation\ValidationException;
|
||||
use Log;
|
||||
use Symfony\Component\HttpKernel\Exception\HttpException;
|
||||
use Symfony\Component\HttpKernel\Exception\HttpExceptionInterface;
|
||||
use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
|
||||
|
||||
/**
|
||||
@ -134,7 +135,7 @@ class Handler extends ExceptionHandler
|
||||
*
|
||||
* @return \Illuminate\Http\Response|\Symfony\Component\HttpFoundation\Response
|
||||
*/
|
||||
protected function renderHttpException(HttpException $e)
|
||||
protected function renderHttpException(HttpExceptionInterface $e)
|
||||
{
|
||||
$status = $e->getStatusCode();
|
||||
view()->replaceNamespace('errors', [
|
||||
|
@ -7,51 +7,51 @@
|
||||
"minimum-stability": "stable",
|
||||
"homepage": "http://www.phpvms.net",
|
||||
"require": {
|
||||
"php": ">=7.1",
|
||||
"php": ">=7.2",
|
||||
"ext-calendar": "*",
|
||||
"ext-json": "*",
|
||||
"ext-mbstring": "*",
|
||||
"ext-pdo": "*",
|
||||
"composer/composer": "1.8.x",
|
||||
"composer/semver": "1.4.x",
|
||||
"akaunting/money": "1.0.x",
|
||||
"anhskohbo/no-captcha": "3.0.x",
|
||||
"arrilot/laravel-widgets": "3.13.x",
|
||||
"composer/composer": "1.8.*",
|
||||
"composer/semver": "1.4.*",
|
||||
"akaunting/money": "1.0.*",
|
||||
"anhskohbo/no-captcha": "3.0.*",
|
||||
"arrilot/laravel-widgets": "3.13.*",
|
||||
"fzaninotto/faker": "^1.8",
|
||||
"guzzlehttp/guzzle": "6.3.x",
|
||||
"hashids/hashids": "2.0.x",
|
||||
"igaster/laravel-theme": "2.0.x",
|
||||
"intervention/image": "2.4.x",
|
||||
"irazasyed/laravel-gamp": "1.3.x",
|
||||
"jackiedo/timezonelist": "5.x",
|
||||
"jmikola/geojson": "1.0.x",
|
||||
"joshbrw/laravel-module-installer": "0.1.x",
|
||||
"laracasts/flash": "3.0.x",
|
||||
"laravel/framework": "5.7.x",
|
||||
"laravelcollective/html": "5.7.x",
|
||||
"league/csv": "9.2.x",
|
||||
"league/geotools": "0.8.x",
|
||||
"league/iso3166": "2.1.x",
|
||||
"guzzlehttp/guzzle": "6.3.*",
|
||||
"hashids/hashids": "2.0.*",
|
||||
"igaster/laravel-theme": "2.0.*",
|
||||
"intervention/image": "2.4.*",
|
||||
"irazasyed/laravel-gamp": "1.3.*",
|
||||
"jackiedo/timezonelist": "5.*",
|
||||
"jmikola/geojson": "1.0.*",
|
||||
"joshbrw/laravel-module-installer": "0.1.*",
|
||||
"laracasts/flash": "3.0.*",
|
||||
"laravel/framework": "5.8.*",
|
||||
"laravelcollective/html": "^5.8",
|
||||
"league/csv": "9.2.*",
|
||||
"league/geotools": "0.8.*",
|
||||
"league/iso3166": "2.1.*",
|
||||
"markrogoyski/math-php": "^0.38.0",
|
||||
"myclabs/deep-copy": "1.8.x",
|
||||
"nabeel/vacentral": "1.x",
|
||||
"nwidart/laravel-modules": "3.3.x",
|
||||
"php-units-of-measure/php-units-of-measure": "2.1.x",
|
||||
"pragmarx/version": "0.2.x",
|
||||
"prettus/l5-repository": "2.6.x",
|
||||
"santigarcor/laratrust": "5.0.x",
|
||||
"sebastiaanluca/laravel-helpers": "1.0.x",
|
||||
"spatie/laravel-pjax": "1.3.x",
|
||||
"myclabs/deep-copy": "1.8.*",
|
||||
"nabeel/vacentral": "1.*",
|
||||
"nwidart/laravel-modules": "5.*",
|
||||
"php-units-of-measure/php-units-of-measure": "2.1.*",
|
||||
"pragmarx/version": "0.2.*",
|
||||
"prettus/l5-repository": "2.6.*",
|
||||
"santigarcor/laratrust": "5.2.*",
|
||||
"sebastiaanluca/laravel-helpers": "3.*",
|
||||
"spatie/laravel-pjax": "1.3.*",
|
||||
"symfony/polyfill-iconv": "^1.11",
|
||||
"theiconic/php-ga-measurement-protocol": "2.7.x",
|
||||
"tivie/php-os-detector": "1.1.x",
|
||||
"toin0u/geotools-laravel": "1.0.x",
|
||||
"vierbergenlars/php-semver": "3.0.x",
|
||||
"waavi/sanitizer": "1.0.x",
|
||||
"webpatser/laravel-uuid": "3.x"
|
||||
"theiconic/php-ga-measurement-protocol": "2.7.*",
|
||||
"tivie/php-os-detector": "1.1.*",
|
||||
"toin0u/geotools-laravel": "1.0.*",
|
||||
"vierbergenlars/php-semver": "3.0.*",
|
||||
"waavi/sanitizer": "1.0.*",
|
||||
"webpatser/laravel-uuid": "3.*"
|
||||
},
|
||||
"require-dev": {
|
||||
"phpunit/phpunit": "7.5.x",
|
||||
"phpunit/phpunit": "7.5.*",
|
||||
"barryvdh/laravel-ide-helper": "^2.0",
|
||||
"barryvdh/laravel-debugbar": "^3.0",
|
||||
"mockery/mockery": "0.9.*",
|
||||
|
1000
composer.lock
generated
1000
composer.lock
generated
File diff suppressed because it is too large
Load Diff
@ -67,7 +67,6 @@ return [
|
||||
Collective\Html\HtmlServiceProvider::class,
|
||||
Laracasts\Flash\FlashServiceProvider::class,
|
||||
Prettus\Repository\Providers\RepositoryServiceProvider::class,
|
||||
SebastiaanLuca\Helpers\Methods\GlobalHelpersServiceProvider::class,
|
||||
SebastiaanLuca\Helpers\Collections\CollectionMacrosServiceProvider::class,
|
||||
Toin0u\Geotools\GeotoolsServiceProvider::class,
|
||||
Jackiedo\Timezonelist\TimezonelistServiceProvider::class,
|
||||
|
@ -24,8 +24,6 @@ return [
|
||||
],
|
||||
|
||||
'stores' => [
|
||||
|
||||
'apc' => ['driver' => 'apc'],
|
||||
'array' => ['driver' => 'array'],
|
||||
'database' => [
|
||||
'driver' => 'database',
|
||||
@ -61,6 +59,5 @@ return [
|
||||
'driver' => 'redis',
|
||||
'connection' => 'default',
|
||||
],
|
||||
|
||||
],
|
||||
];
|
||||
|
@ -27,7 +27,27 @@ return [
|
||||
| Defines if Laratrust will use Laravel's Cache to cache the roles and permissions.
|
||||
|
|
||||
*/
|
||||
'use_cache' => true,
|
||||
'cache' => [
|
||||
/*
|
||||
|--------------------------------------------------------------------------
|
||||
| Use cache in the package
|
||||
|--------------------------------------------------------------------------
|
||||
|
|
||||
| Defines if Laratrust will use Laravel's Cache to cache the roles and permissions.
|
||||
| NOTE: Currently the database check does not use cache.
|
||||
|
|
||||
*/
|
||||
'enabled' => true,
|
||||
/*
|
||||
|--------------------------------------------------------------------------
|
||||
| Time to store in cache Laratrust's roles and permissions.
|
||||
|--------------------------------------------------------------------------
|
||||
|
|
||||
| Determines the time in SECONDS to store Laratrust's roles and permissions in the cache.
|
||||
|
|
||||
*/
|
||||
'expiration_time' => 3600,
|
||||
],
|
||||
|
||||
/*
|
||||
|--------------------------------------------------------------------------
|
||||
|
@ -3,10 +3,14 @@ FROM php:7.3-fpm
|
||||
RUN apt-get update
|
||||
RUN apt-get install -y libgmp-dev
|
||||
|
||||
# Copy any config files in
|
||||
COPY ext-opcache.ini $PHP_INI_DIR/conf.d/
|
||||
|
||||
RUN ln -sf /dev/stderr /var/log/fpm-error.log
|
||||
|
||||
RUN docker-php-ext-install \
|
||||
mysqli \
|
||||
pdo \
|
||||
pdo_mysql \
|
||||
gmp
|
||||
gmp \
|
||||
opcache
|
||||
|
8
docker/php/ext-opcache.ini
Normal file
8
docker/php/ext-opcache.ini
Normal file
@ -0,0 +1,8 @@
|
||||
[opcache]
|
||||
opcache.enable = 1
|
||||
opcache.memory_consumption = 128
|
||||
opcache.interned_strings_buffer = 8
|
||||
opcache.max_accelerated_files = 4000
|
||||
opcache.revalidate_freq = 60
|
||||
opcache.fast_shutdown = 1
|
||||
opcache.enable_cli = 1
|
Loading…
Reference in New Issue
Block a user