From 23eb9dcbda073edbbbffc71fd44f23a3c198aa65 Mon Sep 17 00:00:00 2001 From: Nabeel S Date: Fri, 13 Sep 2019 08:05:02 -0400 Subject: [PATCH] 384 Laravel 6 changes (#385) * 384 Laravel 6 changes * Library versions * Update package versions * Add keyType to models * Remove unused dependencies * StyleCI fixes * Fix models for test * Fix tests output and update test runner * Unused imports * Update exceptions handler * Fix login page --- .editorconfig | 8 + .travis/phpunit.travis.xml | 24 +- app/Console/Command.php | 12 +- app/Console/Commands/AcarsReplay.php | 5 - app/Console/Commands/ComposerCommand.php | 12 +- app/Console/Commands/CreateDatabase.php | 7 +- app/Console/Commands/DevCommands.php | 4 - app/Console/Commands/DevInstall.php | 1 - app/Console/Commands/ImportCsv.php | 4 - app/Console/Commands/NavdataImport.php | 10 - app/Console/Commands/TestApi.php | 9 - app/Console/Commands/Version.php | 4 - app/Console/Commands/YamlExport.php | 7 - app/Console/Commands/YamlImport.php | 1 - app/Console/Kernel.php | 3 - app/Contracts/FormRequest.php | 2 - app/Exceptions/Handler.php | 14 + .../Controllers/Api/AirportController.php | 3 + app/Models/Acars.php | 2 + app/Models/Airport.php | 4 +- app/Models/File.php | 4 +- app/Models/Flight.php | 4 +- app/Models/Navdata.php | 4 +- app/Models/News.php | 3 - app/Models/Pirep.php | 4 +- app/Models/PirepComment.php | 2 - app/Models/PirepFare.php | 3 - app/Models/PirepField.php | 2 - app/Models/PirepFieldValue.php | 6 +- app/Models/Rank.php | 2 - app/Models/Setting.php | 4 +- app/Models/UserAward.php | 3 - ...tProvider.php => TimezonelistProvider.php} | 6 +- ...ezonelistExtended.php => Timezonelist.php} | 59 +- composer.json | 58 +- composer.lock | 1076 ++++++++--------- config/app.php | 5 +- config/database.php | 12 +- config/ignition.php | 110 ++ phpunit.xml | 24 +- resources/stubs/installer/config.stub | 1 + resources/views/layouts/default/app.blade.php | 2 +- .../layouts/default/auth/layout.blade.php | 4 +- .../layouts/default/auth/login.blade.php | 137 +-- .../layouts/default/auth/verify.blade.php | 10 +- tests/Bootstrap.php | 39 + tests/CreatesApplication.php | 21 + tests/TestCase.php | 23 +- 48 files changed, 935 insertions(+), 829 deletions(-) rename app/Providers/{ExtendedTimezonelistProvider.php => TimezonelistProvider.php} (72%) rename app/Support/{TimezonelistExtended.php => Timezonelist.php} (62%) create mode 100644 config/ignition.php create mode 100644 tests/Bootstrap.php create mode 100644 tests/CreatesApplication.php diff --git a/.editorconfig b/.editorconfig index fe312261..b8183e82 100644 --- a/.editorconfig +++ b/.editorconfig @@ -9,6 +9,14 @@ indent_size = 2 indent_style = space indent_size = 4 +[*.blade.php] +indent_style = space +indent_size = 2 + +[*.stub] +indent_style = space +indent_size = 4 + [Makefile] indent_style = tab diff --git a/.travis/phpunit.travis.xml b/.travis/phpunit.travis.xml index 30741227..5987dbec 100644 --- a/.travis/phpunit.travis.xml +++ b/.travis/phpunit.travis.xml @@ -13,6 +13,9 @@ ./tests + + + ./app @@ -22,16 +25,21 @@ - - - - - - - - + + + + + + + + + + + + + diff --git a/app/Console/Command.php b/app/Console/Command.php index ae164883..4b7c101a 100644 --- a/app/Console/Command.php +++ b/app/Console/Command.php @@ -2,7 +2,7 @@ namespace App\Console; -use Log; +use Illuminate\Support\Facades\Log; use Symfony\Component\Process\Process; /** @@ -10,6 +10,16 @@ use Symfony\Component\Process\Process; */ abstract class Command extends \Illuminate\Console\Command { + public function __construct() + { + parent::__construct(); + + // Running in the console but not in the tests + if (app()->runningInConsole() && env('APP_ENV') !== 'testing') { + $this->redirectLoggingToFile('stdout'); + } + } + /** * @return mixed */ diff --git a/app/Console/Commands/AcarsReplay.php b/app/Console/Commands/AcarsReplay.php index 4dcb5010..76b5a600 100644 --- a/app/Console/Commands/AcarsReplay.php +++ b/app/Console/Commands/AcarsReplay.php @@ -7,9 +7,6 @@ use App\Facades\Utils; use GuzzleHttp\Client; use Illuminate\Database\Eloquent\Collection; -/** - * Class AcarsReplay - */ class AcarsReplay extends Command { protected $signature = 'phpvms:replay {files} {--manual} {--write-all} {--no-submit}'; @@ -47,8 +44,6 @@ class AcarsReplay extends Command { parent::__construct(); - $this->redirectLoggingToFile('stdout'); - $this->httpClient = new Client([ 'base_uri' => config('app.url'), 'headers' => [ diff --git a/app/Console/Commands/ComposerCommand.php b/app/Console/Commands/ComposerCommand.php index bea3d7af..167d9959 100644 --- a/app/Console/Commands/ComposerCommand.php +++ b/app/Console/Commands/ComposerCommand.php @@ -3,23 +3,13 @@ namespace App\Console\Commands; use App\Console\Command; -use Artisan; +use Illuminate\Support\Facades\Artisan; -/** - * Class ComposerCommand - */ class ComposerCommand extends Command { protected $signature = 'phpvms:composer {cmd}'; protected $description = 'Composer related tasks'; - public function __construct() - { - parent::__construct(); - - $this->redirectLoggingToFile('stdout'); - } - /** * Run composer update related commands */ diff --git a/app/Console/Commands/CreateDatabase.php b/app/Console/Commands/CreateDatabase.php index 4fcb001e..6f269ff4 100644 --- a/app/Console/Commands/CreateDatabase.php +++ b/app/Console/Commands/CreateDatabase.php @@ -3,12 +3,9 @@ namespace App\Console\Commands; use App\Console\Command; -use Log; +use Illuminate\Support\Facades\Log; use Tivie\OS\Detector; -/** - * Class CreateDatabase - */ class CreateDatabase extends Command { protected $signature = 'database:create {--reset} {--conn=?}'; @@ -21,8 +18,6 @@ class CreateDatabase extends Command public function __construct() { parent::__construct(); - - $this->redirectLoggingToFile('stdout'); $this->os = new Detector(); } diff --git a/app/Console/Commands/DevCommands.php b/app/Console/Commands/DevCommands.php index 3dbbcdb4..6ac20857 100644 --- a/app/Console/Commands/DevCommands.php +++ b/app/Console/Commands/DevCommands.php @@ -19,9 +19,6 @@ use Illuminate\Support\Facades\Schema; use PDO; use Symfony\Component\Yaml\Yaml; -/** - * Class DevCommands - */ class DevCommands extends Command { protected $signature = 'phpvms {cmd} {param?}'; @@ -37,7 +34,6 @@ class DevCommands extends Command { parent::__construct(); - $this->redirectLoggingToFile('stdout'); $this->dbSvc = $dbSvc; } diff --git a/app/Console/Commands/DevInstall.php b/app/Console/Commands/DevInstall.php index 795c316e..489c7799 100644 --- a/app/Console/Commands/DevInstall.php +++ b/app/Console/Commands/DevInstall.php @@ -27,7 +27,6 @@ class DevInstall extends Command { parent::__construct(); - $this->redirectLoggingToFile('stdout'); $this->databaseSeeder = $databaseSeeder; } diff --git a/app/Console/Commands/ImportCsv.php b/app/Console/Commands/ImportCsv.php index 3dff3361..10cdbe60 100644 --- a/app/Console/Commands/ImportCsv.php +++ b/app/Console/Commands/ImportCsv.php @@ -5,9 +5,6 @@ namespace App\Console\Commands; use App\Console\Command; use App\Services\ImportService; -/** - * Class ImportCsv - */ class ImportCsv extends Command { protected $signature = 'phpvms:csv-import {type} {file}'; @@ -24,7 +21,6 @@ class ImportCsv extends Command { parent::__construct(); - $this->redirectLoggingToFile('stdout'); $this->importer = $importer; } diff --git a/app/Console/Commands/NavdataImport.php b/app/Console/Commands/NavdataImport.php index 040a514e..dae59169 100644 --- a/app/Console/Commands/NavdataImport.php +++ b/app/Console/Commands/NavdataImport.php @@ -6,21 +6,11 @@ use App\Console\Command; use App\Models\Enums\NavaidType; use App\Models\Navdata; -/** - * Class NavdataImport - */ class NavdataImport extends Command { protected $signature = 'phpvms:navdata'; protected $description = ''; - public function __construct() - { - parent::__construct(); - - $this->redirectLoggingToFile('stdout'); - } - /** * @throws \League\Geotools\Exception\InvalidArgumentException * diff --git a/app/Console/Commands/TestApi.php b/app/Console/Commands/TestApi.php index 85483e59..66d841ca 100644 --- a/app/Console/Commands/TestApi.php +++ b/app/Console/Commands/TestApi.php @@ -5,20 +5,11 @@ namespace App\Console\Commands; use App\Console\Command; use GuzzleHttp\Client; -/** - * Class TestApi - */ class TestApi extends Command { protected $signature = 'phpvms:test-api {apikey} {url}'; protected $httpClient; - public function __construct() - { - parent::__construct(); - $this->redirectLoggingToFile('stdout'); - } - /** * Run dev related commands */ diff --git a/app/Console/Commands/Version.php b/app/Console/Commands/Version.php index f0976474..89b7066e 100644 --- a/app/Console/Commands/Version.php +++ b/app/Console/Commands/Version.php @@ -6,9 +6,6 @@ use App\Console\Command; use App\Services\VersionService; use Symfony\Component\Yaml\Yaml; -/** - * Class Version - */ class Version extends Command { protected $signature = 'phpvms:version {--write} {--base-only}'; @@ -19,7 +16,6 @@ class Version extends Command { parent::__construct(); - $this->redirectLoggingToFile('stdout'); $this->versionSvc = $versionSvc; } diff --git a/app/Console/Commands/YamlExport.php b/app/Console/Commands/YamlExport.php index bb97e90e..0182bf09 100644 --- a/app/Console/Commands/YamlExport.php +++ b/app/Console/Commands/YamlExport.php @@ -14,13 +14,6 @@ class YamlExport extends Command protected $signature = 'phpvms:yaml-export {tables*}'; protected $description = 'YAML table export'; - public function __construct() - { - parent::__construct(); - - $this->redirectLoggingToFile('stdout'); - } - /** * Run dev related commands */ diff --git a/app/Console/Commands/YamlImport.php b/app/Console/Commands/YamlImport.php index 555acdba..552edb5d 100644 --- a/app/Console/Commands/YamlImport.php +++ b/app/Console/Commands/YamlImport.php @@ -24,7 +24,6 @@ class YamlImport extends Command parent::__construct(); $this->dbSvc = $dbSvc; - $this->redirectLoggingToFile('stdout'); } /** diff --git a/app/Console/Kernel.php b/app/Console/Kernel.php index 524edbb6..80b09d2e 100755 --- a/app/Console/Kernel.php +++ b/app/Console/Kernel.php @@ -9,9 +9,6 @@ use App\Console\Cron\Weekly; use Illuminate\Console\Scheduling\Schedule; use Illuminate\Foundation\Console\Kernel as ConsoleKernel; -/** - * Class Kernel - */ class Kernel extends ConsoleKernel { /** diff --git a/app/Contracts/FormRequest.php b/app/Contracts/FormRequest.php index c2e8fb51..93eb8a0c 100644 --- a/app/Contracts/FormRequest.php +++ b/app/Contracts/FormRequest.php @@ -7,8 +7,6 @@ namespace App\Contracts; */ class FormRequest extends \Illuminate\Foundation\Http\FormRequest { - protected $sanitizer; - /** * @return bool */ diff --git a/app/Exceptions/Handler.php b/app/Exceptions/Handler.php index 9466622e..b9b5e050 100755 --- a/app/Exceptions/Handler.php +++ b/app/Exceptions/Handler.php @@ -9,6 +9,7 @@ use App\Exceptions\Converters\ValidationException; use Exception; use Illuminate\Auth\Access\AuthorizationException; use Illuminate\Auth\AuthenticationException; +use Illuminate\Contracts\Container\BindingResolutionException; use Illuminate\Database\Eloquent\ModelNotFoundException; use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler; use Illuminate\Http\Request; @@ -19,6 +20,7 @@ use Symfony\Component\HttpFoundation\Response; use Symfony\Component\HttpKernel\Exception\HttpException as SymfonyHttpException; use Symfony\Component\HttpKernel\Exception\HttpExceptionInterface; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; +use Whoops\Handler\HandlerInterface; /** * Class Handler @@ -133,4 +135,16 @@ class Handler extends ExceptionHandler return $this->convertExceptionToResponse($e); } + + /** + * Ignition error page integration + */ + protected function whoopsHandler() + { + try { + return app(HandlerInterface::class); + } catch (BindingResolutionException $e) { + return parent::whoopsHandler(); + } + } } diff --git a/app/Http/Controllers/Api/AirportController.php b/app/Http/Controllers/Api/AirportController.php index 0ddf95ca..f4b9af7d 100644 --- a/app/Http/Controllers/Api/AirportController.php +++ b/app/Http/Controllers/Api/AirportController.php @@ -8,6 +8,7 @@ use App\Http\Resources\AirportDistance as AirportDistanceResource; use App\Repositories\AirportRepository; use App\Services\AirportService; use Illuminate\Http\Request; +use Prettus\Repository\Criteria\RequestCriteria; /** * Class AirportController @@ -45,6 +46,8 @@ class AirportController extends Controller $where['hub'] = $request->get('hub'); } + $this->airportRepo->pushCriteria(new RequestCriteria($request)); + $airports = $this->airportRepo ->whereOrder($where, 'icao', 'asc') ->paginate(); diff --git a/app/Models/Acars.php b/app/Models/Acars.php index 9ee4d41b..d81048d8 100644 --- a/app/Models/Acars.php +++ b/app/Models/Acars.php @@ -28,6 +28,8 @@ class Acars extends Model use HashIdTrait; public $table = 'acars'; + + protected $keyType = 'string'; public $incrementing = false; public $fillable = [ diff --git a/app/Models/Airport.php b/app/Models/Airport.php index f0c549c6..b4d9b7d7 100644 --- a/app/Models/Airport.php +++ b/app/Models/Airport.php @@ -30,8 +30,10 @@ class Airport extends Model use FilesTrait; public $table = 'airports'; - public $timestamps = false; + + protected $keyType = 'string'; public $incrementing = false; + public $timestamps = false; protected $fillable = [ 'id', diff --git a/app/Models/File.php b/app/Models/File.php index 154e5b3e..774dfb74 100644 --- a/app/Models/File.php +++ b/app/Models/File.php @@ -23,7 +23,9 @@ class File extends Model use HashIdTrait; use ReferenceTrait; - protected $table = 'files'; + public $table = 'files'; + + protected $keyType = 'string'; public $incrementing = false; protected $fillable = [ diff --git a/app/Models/Flight.php b/app/Models/Flight.php index 7e5b9298..b3c22230 100644 --- a/app/Models/Flight.php +++ b/app/Models/Flight.php @@ -38,12 +38,14 @@ class Flight extends Model use HashIdTrait; public $table = 'flights'; - public $incrementing = false; /** The form wants this */ public $hours; public $minutes; + protected $keyType = 'string'; + public $incrementing = false; + protected $fillable = [ 'id', 'airline_id', diff --git a/app/Models/Navdata.php b/app/Models/Navdata.php index 3f0f4bad..d079a11c 100644 --- a/app/Models/Navdata.php +++ b/app/Models/Navdata.php @@ -4,13 +4,11 @@ namespace App\Models; use App\Contracts\Model; -/** - * Class Navdata - */ class Navdata extends Model { public $table = 'navdata'; + protected $keyType = 'string'; public $timestamps = false; public $incrementing = false; diff --git a/app/Models/News.php b/app/Models/News.php index 549f969d..f34259d0 100644 --- a/app/Models/News.php +++ b/app/Models/News.php @@ -4,9 +4,6 @@ namespace App\Models; use App\Contracts\Model; -/** - * Class News - */ class News extends Model { public $table = 'news'; diff --git a/app/Models/Pirep.php b/app/Models/Pirep.php index 3a965998..305509af 100644 --- a/app/Models/Pirep.php +++ b/app/Models/Pirep.php @@ -13,8 +13,6 @@ use Carbon\Carbon; use Illuminate\Support\Collection; /** - * Class Pirep - * * @property string id * @property string flight_number * @property string route_code @@ -57,6 +55,8 @@ class Pirep extends Model use HashIdTrait; public $table = 'pireps'; + + protected $keyType = 'string'; public $incrementing = false; /** The form wants this */ diff --git a/app/Models/PirepComment.php b/app/Models/PirepComment.php index 97a51661..5bfbf3a3 100644 --- a/app/Models/PirepComment.php +++ b/app/Models/PirepComment.php @@ -5,8 +5,6 @@ namespace App\Models; use App\Contracts\Model; /** - * Class PirepComment - * * @property string pirep_id * @property int user_id */ diff --git a/app/Models/PirepFare.php b/app/Models/PirepFare.php index 53a120bf..6a4b9c4d 100644 --- a/app/Models/PirepFare.php +++ b/app/Models/PirepFare.php @@ -4,9 +4,6 @@ namespace App\Models; use App\Contracts\Model; -/** - * Class PirepFare - */ class PirepFare extends Model { public $table = 'pirep_fares'; diff --git a/app/Models/PirepField.php b/app/Models/PirepField.php index 5dd66558..0a5cbb95 100644 --- a/app/Models/PirepField.php +++ b/app/Models/PirepField.php @@ -5,8 +5,6 @@ namespace App\Models; use App\Contracts\Model; /** - * Class PirepField - * * @property string name * @property string slug */ diff --git a/app/Models/PirepFieldValue.php b/app/Models/PirepFieldValue.php index 4c9305c9..76a3ebe1 100644 --- a/app/Models/PirepFieldValue.php +++ b/app/Models/PirepFieldValue.php @@ -6,7 +6,11 @@ use App\Contracts\Model; use App\Models\Enums\PirepFieldSource; /** - * Class PirepFieldValue + * @property string pirep_id + * @property string name + * @property string slug + * @property string value + * @property string source */ class PirepFieldValue extends Model { diff --git a/app/Models/Rank.php b/app/Models/Rank.php index 28d1e4fa..cb434051 100644 --- a/app/Models/Rank.php +++ b/app/Models/Rank.php @@ -5,8 +5,6 @@ namespace App\Models; use App\Contracts\Model; /** - * Class Rank - * * @property string name * @property int hours * @property float manual_base_pay_rate diff --git a/app/Models/Setting.php b/app/Models/Setting.php index bead1cf9..179cde6f 100644 --- a/app/Models/Setting.php +++ b/app/Models/Setting.php @@ -5,8 +5,6 @@ namespace App\Models; use App\Contracts\Model; /** - * Class Setting - * * @property string id * @property string name * @property string key @@ -19,6 +17,8 @@ use App\Contracts\Model; class Setting extends Model { public $table = 'settings'; + + protected $keyType = 'string'; public $incrementing = false; protected $fillable = [ diff --git a/app/Models/UserAward.php b/app/Models/UserAward.php index f7c9bfba..2081a77a 100644 --- a/app/Models/UserAward.php +++ b/app/Models/UserAward.php @@ -4,9 +4,6 @@ namespace App\Models; use App\Contracts\Model; -/** - * Class UserAward - */ class UserAward extends Model { public $table = 'user_awards'; diff --git a/app/Providers/ExtendedTimezonelistProvider.php b/app/Providers/TimezonelistProvider.php similarity index 72% rename from app/Providers/ExtendedTimezonelistProvider.php rename to app/Providers/TimezonelistProvider.php index 13c83d9d..6ac0dfff 100644 --- a/app/Providers/ExtendedTimezonelistProvider.php +++ b/app/Providers/TimezonelistProvider.php @@ -2,10 +2,10 @@ namespace App\Providers; -use App\Support\TimezonelistExtended; +use App\Support\Timezonelist; use Illuminate\Support\ServiceProvider; -class ExtendedTimezonelistProvider extends ServiceProvider +class TimezonelistProvider extends ServiceProvider { /** * Bootstrap services. @@ -24,7 +24,7 @@ class ExtendedTimezonelistProvider extends ServiceProvider public function register() { $this->app->singleton('timezonelist', function ($app) { - return new TimezonelistExtended(); + return new Timezonelist(); }); } } diff --git a/app/Support/TimezonelistExtended.php b/app/Support/Timezonelist.php similarity index 62% rename from app/Support/TimezonelistExtended.php rename to app/Support/Timezonelist.php index 3fb5919d..382f92e7 100644 --- a/app/Support/TimezonelistExtended.php +++ b/app/Support/Timezonelist.php @@ -1,12 +1,67 @@ 'GMT timezone', + 'UTC' => 'UTC timezone', + ]; + /** + * All continents of the world + * + * @var array + */ + protected $continents = [ + 'Africa' => DateTimeZone::AFRICA, + 'America' => DateTimeZone::AMERICA, + 'Antarctica' => DateTimeZone::ANTARCTICA, + 'Arctic' => DateTimeZone::ARCTIC, + 'Asia' => DateTimeZone::ASIA, + 'Atlantic' => DateTimeZone::ATLANTIC, + 'Australia' => DateTimeZone::AUSTRALIA, + 'Europe' => DateTimeZone::EUROPE, + 'Indian' => DateTimeZone::INDIAN, + 'Pacific' => DateTimeZone::PACIFIC, + ]; + /** * Format to display timezones * diff --git a/composer.json b/composer.json index c08eacf2..33f7c45d 100755 --- a/composer.json +++ b/composer.json @@ -12,49 +12,44 @@ "ext-mbstring": "*", "ext-simplexml": "*", "ext-pdo": "*", - "composer/composer": "1.8.*", - "laravel/framework": "5.8.*", - "akaunting/money": "1.0.*", - "anhskohbo/no-captcha": "3.0.*", + "composer/composer": "~1.8.0", + "laravel/framework": "~6.0.0", + "akaunting/money": "^1.0", + "anhskohbo/no-captcha": "^3.0", "appstract/laravel-opcache": "^2.0", - "arrilot/laravel-widgets": "3.13.*", - "doctrine/dbal": "2.9.*", - "elcobvg/laravel-opcache": "0.4.*", - "fzaninotto/faker": "^1.8", - "guzzlehttp/guzzle": "6.3.*", - "hashids/hashids": "2.0.*", - "igaster/laravel-theme": "2.0.*", + "arrilot/laravel-widgets": "~3.13.0", + "doctrine/dbal": "~2.9.2", + "elcobvg/laravel-opcache": "~0.4", + "guzzlehttp/guzzle": "~6.3.3", + "hashids/hashids": "^2.0.0", + "igaster/laravel-theme": "^2.0", "intervention/image": "2.4.*", - "irazasyed/laravel-gamp": "1.3.*", - "jackiedo/timezonelist": "5.*", + "irazasyed/laravel-gamp": "^1.4", "jmikola/geojson": "1.0.*", "joshbrw/laravel-module-installer": "0.1.*", - "laracasts/flash": "3.0.*", + "laracasts/flash": "^3.0", "laravel/helpers": "^1.0", - "laravelcollective/html": "^5.8", + "laravelcollective/html": "~6.0.0", "league/csv": "9.2.*", "league/geotools": "0.8.*", "league/iso3166": "2.1.*", "markrogoyski/math-php": "^0.38.0", "myclabs/deep-copy": "1.8.*", - "nabeel/vacentral": "2.x", - "nwidart/laravel-modules": "5.*", - "php-units-of-measure/php-units-of-measure": "2.1.*", + "nabeel/vacentral": "~2.0", + "nwidart/laravel-modules": "~5.1", + "php-units-of-measure/php-units-of-measure": "~2.1.0", "pragmarx/version": "0.2.*", - "predis/predis": "1.1.*", - "prettus/l5-repository": "2.6.*", - "santigarcor/laratrust": "5.2.*", - "sebastiaanluca/laravel-helpers": "3.*", - "semver/semver": "1.1.*", - "spatie/laravel-backup": "6.3.*", - "spatie/laravel-pjax": "1.3.*", - "spatie/valuestore": "1.2.*", - "symfony/polyfill-iconv": "^1.11", + "prettus/l5-repository": "~2.6.0", + "santigarcor/laratrust": "~5.2.0", + "sebastiaanluca/laravel-helpers": "~4.0", + "semver/semver": "~1.1.0", + "spatie/laravel-backup": "~6.3", + "spatie/valuestore": "~1.2.3", + "symfony/polyfill-iconv": "~1.12", "theiconic/php-ga-measurement-protocol": "2.7.*", - "tivie/php-os-detector": "1.1.*", - "toin0u/geotools-laravel": "1.0.*", - "waavi/sanitizer": "1.0.*", - "webpatser/laravel-uuid": "3.*" + "tivie/php-os-detector": "~1.1.0", + "webpatser/laravel-uuid": "~3.0", + "facade/ignition": "^1.6" }, "require-dev": { "barryvdh/laravel-debugbar": "^3.0", @@ -62,6 +57,7 @@ "bpocallaghan/generators": "5.0.1", "codedungeon/phpunit-result-printer": "^0.13.0", "filp/whoops": "~2.0", + "fzaninotto/faker": "~1.8.0", "friendsofphp/php-cs-fixer": "^2.15", "mockery/mockery": "0.9.*", "nunomaduro/collision": "^2.0", diff --git a/composer.lock b/composer.lock index 6491b48c..ac500429 100644 --- a/composer.lock +++ b/composer.lock @@ -4,25 +4,25 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "066c1731a9f29981ce2b6a9e1536e40d", + "content-hash": "0dc48b4cd01f28ea3f900ca23529803f", "packages": [ { "name": "akaunting/money", - "version": "1.0.11", + "version": "1.0.12", "source": { "type": "git", "url": "https://github.com/akaunting/money.git", - "reference": "52d5f3a8d30354dbc07b558263df0560dfa85bf1" + "reference": "1ab8060dfd6302be3c1028a2d20f131ece5ce634" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/akaunting/money/zipball/52d5f3a8d30354dbc07b558263df0560dfa85bf1", - "reference": "52d5f3a8d30354dbc07b558263df0560dfa85bf1", + "url": "https://api.github.com/repos/akaunting/money/zipball/1ab8060dfd6302be3c1028a2d20f131ece5ce634", + "reference": "1ab8060dfd6302be3c1028a2d20f131ece5ce634", "shasum": "" }, "require": { - "illuminate/support": ">=5.2 <6.0", - "illuminate/view": ">=5.2 <6.0", + "illuminate/support": ">=5.2", + "illuminate/view": ">=5.2", "php": ">=5.5.9" }, "require-dev": { @@ -65,25 +65,25 @@ "laravel", "money" ], - "time": "2019-04-09T08:29:48+00:00" + "time": "2019-09-09T05:55:43+00:00" }, { "name": "anhskohbo/no-captcha", - "version": "3.0.4", + "version": "3.1.0", "source": { "type": "git", "url": "https://github.com/anhskohbo/no-captcha.git", - "reference": "fd08c84bd0e05f4a048a9bba800ab64ada9fadfc" + "reference": "e76c17b64fdbcf9d32b58b1db12175a5966bae2d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/anhskohbo/no-captcha/zipball/fd08c84bd0e05f4a048a9bba800ab64ada9fadfc", - "reference": "fd08c84bd0e05f4a048a9bba800ab64ada9fadfc", + "url": "https://api.github.com/repos/anhskohbo/no-captcha/zipball/e76c17b64fdbcf9d32b58b1db12175a5966bae2d", + "reference": "e76c17b64fdbcf9d32b58b1db12175a5966bae2d", "shasum": "" }, "require": { "guzzlehttp/guzzle": "^6.2", - "illuminate/support": "5.0.*|5.1.*|5.2.*|5.3.*|5.4.*|5.5.*|5.6.*|5.7.*|5.8.*", + "illuminate/support": "5.0.*|5.1.*|5.2.*|5.3.*|5.4.*|5.5.*|5.6.*|5.7.*|5.8.*|6.0.*", "php": ">=5.5.5" }, "require-dev": { @@ -121,10 +121,11 @@ "laravel", "laravel4", "laravel5", + "laravel6", "no-captcha", "recaptcha" ], - "time": "2019-02-25T10:51:21+00:00" + "time": "2019-08-27T02:13:31+00:00" }, { "name": "appstract/laravel-opcache", @@ -1433,36 +1434,148 @@ "time": "2019-03-17T18:48:37+00:00" }, { - "name": "fzaninotto/faker", - "version": "v1.8.0", + "name": "facade/flare-client-php", + "version": "1.0.4", "source": { "type": "git", - "url": "https://github.com/fzaninotto/Faker.git", - "reference": "f72816b43e74063c8b10357394b6bba8cb1c10de" + "url": "https://github.com/facade/flare-client-php.git", + "reference": "7128b251b48f24ef64e5cddd7f8d40cc3a06fd3e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/fzaninotto/Faker/zipball/f72816b43e74063c8b10357394b6bba8cb1c10de", - "reference": "f72816b43e74063c8b10357394b6bba8cb1c10de", + "url": "https://api.github.com/repos/facade/flare-client-php/zipball/7128b251b48f24ef64e5cddd7f8d40cc3a06fd3e", + "reference": "7128b251b48f24ef64e5cddd7f8d40cc3a06fd3e", "shasum": "" }, "require": { - "php": "^5.3.3 || ^7.0" + "facade/ignition-contracts": "~1.0", + "illuminate/pipeline": "~5.5|~5.6|~5.7|~5.8|^6.0", + "php": "^7.1", + "symfony/http-foundation": "~3.3|~4.1", + "symfony/var-dumper": "^3.4|^4.0" }, "require-dev": { - "ext-intl": "*", - "phpunit/phpunit": "^4.8.35 || ^5.7", - "squizlabs/php_codesniffer": "^1.5" + "larapack/dd": "^1.1", + "phpunit/phpunit": "^7.0", + "spatie/phpunit-snapshot-assertions": "^2.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.8-dev" + "dev-master": "1.0-dev" } }, "autoload": { "psr-4": { - "Faker\\": "src/Faker/" + "Facade\\FlareClient\\": "src" + }, + "files": [ + "src/helpers.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "description": "Send PHP errors to Flare", + "homepage": "https://github.com/facade/flare-client-php", + "keywords": [ + "exception", + "facade", + "flare", + "reporting" + ], + "time": "2019-09-11T14:19:56+00:00" + }, + { + "name": "facade/ignition", + "version": "1.6.3", + "source": { + "type": "git", + "url": "https://github.com/facade/ignition.git", + "reference": "69d7687cb9a4b43978c532b46f05dcdd80be812c" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/facade/ignition/zipball/69d7687cb9a4b43978c532b46f05dcdd80be812c", + "reference": "69d7687cb9a4b43978c532b46f05dcdd80be812c", + "shasum": "" + }, + "require": { + "ext-json": "*", + "ext-mbstring": "*", + "facade/flare-client-php": "^1.0.4", + "facade/ignition-contracts": "^1.0", + "filp/whoops": "^2.4", + "illuminate/support": "~5.5.0 || ~5.6.0 || ~5.7.0 || ~5.8.0 || ^6.0", + "monolog/monolog": "^1.12 || ^2.0", + "php": "^7.1", + "scrivo/highlight.php": "^9.15", + "symfony/console": "^3.4 || ^4.0", + "symfony/var-dumper": "^3.4 || ^4.0" + }, + "require-dev": { + "friendsofphp/php-cs-fixer": "^2.14", + "mockery/mockery": "^1.2", + "orchestra/testbench": "^3.5 || ^3.6 || ^3.7 || ^3.8 || ^4.0" + }, + "suggest": { + "laravel/telescope": "^2.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0-dev" + }, + "laravel": { + "providers": [ + "Facade\\Ignition\\IgnitionServiceProvider" + ], + "aliases": { + "Flare": "Facade\\Ignition\\Facades\\Flare" + } + } + }, + "autoload": { + "psr-4": { + "Facade\\Ignition\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "description": "A beautiful error page for Laravel applications.", + "homepage": "https://github.com/facade/ignition", + "keywords": [ + "error", + "flare", + "laravel", + "page" + ], + "time": "2019-09-12T12:36:31+00:00" + }, + { + "name": "facade/ignition-contracts", + "version": "1.0.0", + "source": { + "type": "git", + "url": "https://github.com/facade/ignition-contracts.git", + "reference": "f445db0fb86f48e205787b2592840dd9c80ded28" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/facade/ignition-contracts/zipball/f445db0fb86f48e205787b2592840dd9c80ded28", + "reference": "f445db0fb86f48e205787b2592840dd9c80ded28", + "shasum": "" + }, + "require": { + "php": "^7.1" + }, + "type": "library", + "autoload": { + "psr-4": { + "Facade\\IgnitionContracts\\": "src" } }, "notification-url": "https://packagist.org/downloads/", @@ -1471,16 +1584,81 @@ ], "authors": [ { - "name": "François Zaninotto" + "name": "Freek Van der Herten", + "email": "freek@spatie.be", + "homepage": "https://flareapp.io", + "role": "Developer" } ], - "description": "Faker is a PHP library that generates fake data for you.", + "description": "Solution contracts for Ignition", + "homepage": "https://github.com/facade/ignition-contracts", "keywords": [ - "data", - "faker", - "fixtures" + "contracts", + "flare", + "ignition" ], - "time": "2018-07-12T10:23:15+00:00" + "time": "2019-08-30T14:06:08+00:00" + }, + { + "name": "filp/whoops", + "version": "2.5.0", + "source": { + "type": "git", + "url": "https://github.com/filp/whoops.git", + "reference": "cde50e6720a39fdacb240159d3eea6865d51fd96" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/filp/whoops/zipball/cde50e6720a39fdacb240159d3eea6865d51fd96", + "reference": "cde50e6720a39fdacb240159d3eea6865d51fd96", + "shasum": "" + }, + "require": { + "php": "^5.5.9 || ^7.0", + "psr/log": "^1.0.1" + }, + "require-dev": { + "mockery/mockery": "^0.9 || ^1.0", + "phpunit/phpunit": "^4.8.35 || ^5.7", + "symfony/var-dumper": "^2.6 || ^3.0 || ^4.0" + }, + "suggest": { + "symfony/var-dumper": "Pretty print complex values better with var-dumper available", + "whoops/soap": "Formats errors as SOAP responses" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.2-dev" + } + }, + "autoload": { + "psr-4": { + "Whoops\\": "src/Whoops/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Filipe Dobreira", + "role": "Developer", + "homepage": "https://github.com/filp" + } + ], + "description": "php error handling for cool kids", + "homepage": "https://filp.github.io/whoops/", + "keywords": [ + "error", + "exception", + "handling", + "library", + "throwable", + "whoops" + ], + "time": "2019-08-07T09:00:00+00:00" }, { "name": "guzzlehttp/guzzle", @@ -1866,21 +2044,21 @@ }, { "name": "irazasyed/laravel-gamp", - "version": "v1.3.0", + "version": "v1.4", "source": { "type": "git", "url": "https://github.com/irazasyed/laravel-gamp.git", - "reference": "4596c2fe40cc5624c7058a744898bf5c5d76e861" + "reference": "d205a0f800c3f5832d25d95232860f35b2266c55" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/irazasyed/laravel-gamp/zipball/4596c2fe40cc5624c7058a744898bf5c5d76e861", - "reference": "4596c2fe40cc5624c7058a744898bf5c5d76e861", + "url": "https://api.github.com/repos/irazasyed/laravel-gamp/zipball/d205a0f800c3f5832d25d95232860f35b2266c55", + "reference": "d205a0f800c3f5832d25d95232860f35b2266c55", "shasum": "" }, "require": { - "illuminate/support": "~5.0", - "php": ">=5.6.4", + "illuminate/support": "^5.0 || ^6.0", + "php": "^7.2", "theiconic/php-ga-measurement-protocol": "^2.0" }, "suggest": { @@ -1905,7 +2083,7 @@ "Irazasyed\\LaravelGAMP\\": "src/" } }, - "notification-url": "http://packagist.org/downloads/", + "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], @@ -1926,50 +2104,7 @@ "measurement protocol", "tracking" ], - "time": "2017-10-18T14:29:48+00:00" - }, - { - "name": "jackiedo/timezonelist", - "version": "5.0.1", - "source": { - "type": "git", - "url": "https://github.com/JackieDo/Timezone-List.git", - "reference": "e7bdd089209840dadaef5ab32574f1b5abd16ae3" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/JackieDo/Timezone-List/zipball/e7bdd089209840dadaef5ab32574f1b5abd16ae3", - "reference": "e7bdd089209840dadaef5ab32574f1b5abd16ae3", - "shasum": "" - }, - "require": { - "illuminate/support": "5.*", - "php": ">=5.4.0" - }, - "type": "library", - "autoload": { - "psr-4": { - "Jackiedo\\Timezonelist\\": "src/Jackiedo/Timezonelist" - } - }, - "notification-url": "http://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Jackie Do", - "email": "anhvudo@gmail.com" - } - ], - "description": "A small package use to create a timezone list box in Laravel", - "keywords": [ - "laravel", - "timezone", - "timezonelist", - "timezones" - ], - "time": "2017-05-16T04:31:37+00:00" + "time": "2019-08-22T21:48:44+00:00" }, { "name": "jmikola/geojson", @@ -2229,43 +2364,43 @@ }, { "name": "laravel/framework", - "version": "v5.8.35", + "version": "v6.0.3", "source": { "type": "git", "url": "https://github.com/laravel/framework.git", - "reference": "5a9e4d241a8b815e16c9d2151e908992c38db197" + "reference": "56789e9dec750e0fbe8e9e6ae90a01a4e6887902" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/framework/zipball/5a9e4d241a8b815e16c9d2151e908992c38db197", - "reference": "5a9e4d241a8b815e16c9d2151e908992c38db197", + "url": "https://api.github.com/repos/laravel/framework/zipball/56789e9dec750e0fbe8e9e6ae90a01a4e6887902", + "reference": "56789e9dec750e0fbe8e9e6ae90a01a4e6887902", "shasum": "" }, "require": { "doctrine/inflector": "^1.1", "dragonmantank/cron-expression": "^2.0", - "egulias/email-validator": "^2.0", + "egulias/email-validator": "^2.1.10", "erusev/parsedown": "^1.7", "ext-json": "*", "ext-mbstring": "*", "ext-openssl": "*", "league/flysystem": "^1.0.8", - "monolog/monolog": "^1.12", - "nesbot/carbon": "^1.26.3 || ^2.0", + "monolog/monolog": "^1.12|^2.0", + "nesbot/carbon": "^2.0", "opis/closure": "^3.1", - "php": "^7.1.3", + "php": "^7.2", "psr/container": "^1.0", "psr/simple-cache": "^1.0", "ramsey/uuid": "^3.7", "swiftmailer/swiftmailer": "^6.0", - "symfony/console": "^4.2", - "symfony/debug": "^4.2", - "symfony/finder": "^4.2", - "symfony/http-foundation": "^4.2", - "symfony/http-kernel": "^4.2", - "symfony/process": "^4.2", - "symfony/routing": "^4.2", - "symfony/var-dumper": "^4.2", + "symfony/console": "^4.3.4", + "symfony/debug": "^4.3.4", + "symfony/finder": "^4.3.4", + "symfony/http-foundation": "^4.3.4", + "symfony/http-kernel": "^4.3.4", + "symfony/process": "^4.3.4", + "symfony/routing": "^4.3.4", + "symfony/var-dumper": "^4.3.4", "tijsverkoyen/css-to-inline-styles": "^2.2.1", "vlucas/phpdotenv": "^3.3" }, @@ -2305,47 +2440,44 @@ "require-dev": { "aws/aws-sdk-php": "^3.0", "doctrine/dbal": "^2.6", - "filp/whoops": "^2.1.4", + "filp/whoops": "^2.4", "guzzlehttp/guzzle": "^6.3", "league/flysystem-cached-adapter": "^1.0", - "mockery/mockery": "^1.0", + "mockery/mockery": "^1.2.3", "moontoast/math": "^1.1", - "orchestra/testbench-core": "3.8.*", + "orchestra/testbench-core": "^4.0", "pda/pheanstalk": "^4.0", - "phpunit/phpunit": "^7.5|^8.0", + "phpunit/phpunit": "^8.3", "predis/predis": "^1.1.1", - "symfony/css-selector": "^4.2", - "symfony/dom-crawler": "^4.2", + "symfony/cache": "^4.3", "true/punycode": "^2.1" }, "suggest": { - "aws/aws-sdk-php": "Required to use the SQS queue driver and SES mail driver (^3.0).", + "aws/aws-sdk-php": "Required to use the SQS queue driver, DynamoDb failed job storage and SES mail driver (^3.0).", "doctrine/dbal": "Required to rename columns and drop SQLite columns (^2.6).", "ext-gd": "Required to use Illuminate\\Http\\Testing\\FileFactory::image().", + "ext-memcached": "Required to use the memcache cache driver.", "ext-pcntl": "Required to use all features of the queue worker.", "ext-posix": "Required to use all features of the queue worker.", - "filp/whoops": "Required for friendly error pages in development (^2.1.4).", + "ext-redis": "Required to use the Redis cache and queue drivers.", + "filp/whoops": "Required for friendly error pages in development (^2.4).", "fzaninotto/faker": "Required to use the eloquent factory builder (^1.4).", - "guzzlehttp/guzzle": "Required to use the Mailgun and Mandrill mail drivers and the ping methods on schedules (^6.0).", + "guzzlehttp/guzzle": "Required to use the Mailgun mail driver and the ping methods on schedules (^6.0).", "laravel/tinker": "Required to use the tinker console command (^1.0).", "league/flysystem-aws-s3-v3": "Required to use the Flysystem S3 driver (^1.0).", "league/flysystem-cached-adapter": "Required to use the Flysystem cache (^1.0).", - "league/flysystem-rackspace": "Required to use the Flysystem Rackspace driver (^1.0).", "league/flysystem-sftp": "Required to use the Flysystem SFTP driver (^1.0).", "moontoast/math": "Required to use ordered UUIDs (^1.1).", - "nexmo/client": "Required to use the Nexmo transport (^1.0).", "pda/pheanstalk": "Required to use the beanstalk queue driver (^4.0).", - "predis/predis": "Required to use the redis cache and queue drivers (^1.0).", "pusher/pusher-php-server": "Required to use the Pusher broadcast driver (^3.0).", - "symfony/css-selector": "Required to use some of the crawler integration testing tools (^4.2).", - "symfony/dom-crawler": "Required to use most of the crawler integration testing tools (^4.2).", - "symfony/psr-http-message-bridge": "Required to use PSR-7 bridging features (^1.1).", + "symfony/cache": "Required to PSR-6 cache bridge (^4.3.4).", + "symfony/psr-http-message-bridge": "Required to use PSR-7 bridging features (^1.2).", "wildbit/swiftmailer-postmark": "Required to use Postmark mail driver (^3.0)." }, "type": "library", "extra": { "branch-alias": { - "dev-master": "5.8-dev" + "dev-master": "6.x-dev" } }, "autoload": { @@ -2373,7 +2505,7 @@ "framework", "laravel" ], - "time": "2019-09-03T16:44:30+00:00" + "time": "2019-09-10T18:46:24+00:00" }, { "name": "laravel/helpers", @@ -2430,35 +2562,35 @@ }, { "name": "laravelcollective/html", - "version": "v5.8.0", + "version": "v6.0.1", "source": { "type": "git", "url": "https://github.com/LaravelCollective/html.git", - "reference": "0e360143d3476fe4141d267a260c140569fa207b" + "reference": "4aecb0bb71013d1218c70ee02b011944840dcb60" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/LaravelCollective/html/zipball/0e360143d3476fe4141d267a260c140569fa207b", - "reference": "0e360143d3476fe4141d267a260c140569fa207b", + "url": "https://api.github.com/repos/LaravelCollective/html/zipball/4aecb0bb71013d1218c70ee02b011944840dcb60", + "reference": "4aecb0bb71013d1218c70ee02b011944840dcb60", "shasum": "" }, "require": { - "illuminate/http": "5.8.*", - "illuminate/routing": "5.8.*", - "illuminate/session": "5.8.*", - "illuminate/support": "5.8.*", - "illuminate/view": "5.8.*", - "php": ">=7.1.3" + "illuminate/http": "6.0.*", + "illuminate/routing": "6.0.*", + "illuminate/session": "6.0.*", + "illuminate/support": "6.0.*", + "illuminate/view": "6.0.*", + "php": ">=7.2" }, "require-dev": { - "illuminate/database": "5.8.*", + "illuminate/database": "6.0.*", "mockery/mockery": "~1.0", "phpunit/phpunit": "~7.1" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "5.8-dev" + "dev-master": "6.0-dev" }, "laravel": { "providers": [ @@ -2483,18 +2615,18 @@ "MIT" ], "authors": [ - { - "name": "Taylor Otwell", - "email": "taylorotwell@gmail.com" - }, { "name": "Adam Engebretson", "email": "adam@laravelcollective.com" + }, + { + "name": "Taylor Otwell", + "email": "taylorotwell@gmail.com" } ], "description": "HTML and Form Builders for the Laravel Framework", "homepage": "https://laravelcollective.com", - "time": "2019-03-01T22:53:41+00:00" + "time": "2019-09-05T12:33:18+00:00" }, { "name": "league/csv", @@ -2842,21 +2974,21 @@ }, { "name": "monolog/monolog", - "version": "1.24.0", + "version": "2.0.0", "source": { "type": "git", "url": "https://github.com/Seldaek/monolog.git", - "reference": "bfc9ebb28f97e7a24c45bdc3f0ff482e47bb0266" + "reference": "68545165e19249013afd1d6f7485aecff07a2d22" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Seldaek/monolog/zipball/bfc9ebb28f97e7a24c45bdc3f0ff482e47bb0266", - "reference": "bfc9ebb28f97e7a24c45bdc3f0ff482e47bb0266", + "url": "https://api.github.com/repos/Seldaek/monolog/zipball/68545165e19249013afd1d6f7485aecff07a2d22", + "reference": "68545165e19249013afd1d6f7485aecff07a2d22", "shasum": "" }, "require": { - "php": ">=5.3.0", - "psr/log": "~1.0" + "php": "^7.2", + "psr/log": "^1.0.1" }, "provide": { "psr/log-implementation": "1.0.0" @@ -2864,33 +2996,36 @@ "require-dev": { "aws/aws-sdk-php": "^2.4.9 || ^3.0", "doctrine/couchdb": "~1.0@dev", - "graylog2/gelf-php": "~1.0", - "jakub-onderka/php-parallel-lint": "0.9", + "elasticsearch/elasticsearch": "^6.0", + "graylog2/gelf-php": "^1.4.2", + "jakub-onderka/php-parallel-lint": "^0.9", "php-amqplib/php-amqplib": "~2.4", "php-console/php-console": "^3.1.3", - "phpunit/phpunit": "~4.5", - "phpunit/phpunit-mock-objects": "2.3.0", + "phpspec/prophecy": "^1.6.1", + "phpunit/phpunit": "^8.3", + "predis/predis": "^1.1", + "rollbar/rollbar": "^1.3", "ruflin/elastica": ">=0.90 <3.0", - "sentry/sentry": "^0.13", "swiftmailer/swiftmailer": "^5.3|^6.0" }, "suggest": { "aws/aws-sdk-php": "Allow sending log messages to AWS services like DynamoDB", "doctrine/couchdb": "Allow sending log messages to a CouchDB server", + "elasticsearch/elasticsearch": "Allow sending log messages to an Elasticsearch server via official client", "ext-amqp": "Allow sending log messages to an AMQP server (1.0+ required)", - "ext-mongo": "Allow sending log messages to a MongoDB server", + "ext-mbstring": "Allow to work properly with unicode symbols", + "ext-mongodb": "Allow sending log messages to a MongoDB server (via driver)", "graylog2/gelf-php": "Allow sending log messages to a GrayLog2 server", - "mongodb/mongodb": "Allow sending log messages to a MongoDB server via PHP Driver", + "mongodb/mongodb": "Allow sending log messages to a MongoDB server (via library)", "php-amqplib/php-amqplib": "Allow sending log messages to an AMQP server using php-amqplib", "php-console/php-console": "Allow sending log messages to Google Chrome", "rollbar/rollbar": "Allow sending log messages to Rollbar", - "ruflin/elastica": "Allow sending log messages to an Elastic Search server", - "sentry/sentry": "Allow sending log messages to a Sentry server" + "ruflin/elastica": "Allow sending log messages to an Elastic Search server" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.0.x-dev" + "dev-master": "2.x-dev" } }, "autoload": { @@ -2916,7 +3051,7 @@ "logging", "psr-3" ], - "time": "2018-11-05T09:00:11+00:00" + "time": "2019-08-30T09:56:44+00:00" }, { "name": "myclabs/deep-copy", @@ -3584,68 +3719,18 @@ ], "time": "2018-09-22T17:12:12+00:00" }, - { - "name": "predis/predis", - "version": "v1.1.1", - "source": { - "type": "git", - "url": "https://github.com/nrk/predis.git", - "reference": "f0210e38881631afeafb56ab43405a92cafd9fd1" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/nrk/predis/zipball/f0210e38881631afeafb56ab43405a92cafd9fd1", - "reference": "f0210e38881631afeafb56ab43405a92cafd9fd1", - "shasum": "" - }, - "require": { - "php": ">=5.3.9" - }, - "require-dev": { - "phpunit/phpunit": "~4.8" - }, - "suggest": { - "ext-curl": "Allows access to Webdis when paired with phpiredis", - "ext-phpiredis": "Allows faster serialization and deserialization of the Redis protocol" - }, - "type": "library", - "autoload": { - "psr-4": { - "Predis\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Daniele Alessandri", - "email": "suppakilla@gmail.com", - "homepage": "http://clorophilla.net" - } - ], - "description": "Flexible and feature-complete Redis client for PHP and HHVM", - "homepage": "http://github.com/nrk/predis", - "keywords": [ - "nosql", - "predis", - "redis" - ], - "time": "2016-06-16T16:22:20+00:00" - }, { "name": "prettus/l5-repository", - "version": "2.6.35", + "version": "2.6.36", "source": { "type": "git", "url": "https://github.com/andersao/l5-repository.git", - "reference": "1bd39355c90a4ae241f0442ccb3b16508bd1ee29" + "reference": "c4f56cffbd23d61e16d2a8a9df0c651037313b54" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/andersao/l5-repository/zipball/1bd39355c90a4ae241f0442ccb3b16508bd1ee29", - "reference": "1bd39355c90a4ae241f0442ccb3b16508bd1ee29", + "url": "https://api.github.com/repos/andersao/l5-repository/zipball/c4f56cffbd23d61e16d2a8a9df0c651037313b54", + "reference": "c4f56cffbd23d61e16d2a8a9df0c651037313b54", "shasum": "" }, "require": { @@ -3656,7 +3741,7 @@ "illuminate/http": "~5.0|~6.0", "illuminate/pagination": "~5.0|~6.0", "illuminate/support": "~5.0|~6.0", - "prettus/laravel-validation": "1.1.*" + "prettus/laravel-validation": "~1.1|~1.2" }, "suggest": { "league/fractal": "Required to use the Fractal Presenter (0.12.*).", @@ -3697,25 +3782,25 @@ "model", "repository" ], - "time": "2019-08-30T13:49:44+00:00" + "time": "2019-09-11T14:09:40+00:00" }, { "name": "prettus/laravel-validation", - "version": "1.1.5", + "version": "1.2.0", "source": { "type": "git", "url": "https://github.com/andersao/laravel-validator.git", - "reference": "d9eb401fb3518a890b117e83bd25a4109fcdb704" + "reference": "5ffa053baae31d11fa34da013b940d85c99ba253" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/andersao/laravel-validator/zipball/d9eb401fb3518a890b117e83bd25a4109fcdb704", - "reference": "d9eb401fb3518a890b117e83bd25a4109fcdb704", + "url": "https://api.github.com/repos/andersao/laravel-validator/zipball/5ffa053baae31d11fa34da013b940d85c99ba253", + "reference": "5ffa053baae31d11fa34da013b940d85c99ba253", "shasum": "" }, "require": { - "illuminate/support": "~5.4", - "illuminate/validation": "~5.4", + "illuminate/support": "~5.4|^6.0", + "illuminate/validation": "~5.4|^6.0", "php": ">=5.4.0" }, "type": "library", @@ -3724,20 +3809,23 @@ "Prettus\\Validator\\": "src/Prettus/Validator/" } }, - "notification-url": "http://packagist.org/downloads/", + "notification-url": "https://packagist.org/downloads/", "authors": [ { "name": "Anderson Andrade", - "email": "contato@andersonandra.de" + "email": "contato@andersonandra.de", + "homepage": "http://andersonandra.de", + "role": "Developer" } ], "description": "Laravel Validation Service", + "homepage": "http://andersao.github.io/laravel-validation", "keywords": [ "laravel", "service", "validation" ], - "time": "2017-08-28T23:28:32+00:00" + "time": "2019-09-11T12:19:42+00:00" }, { "name": "psr/cache", @@ -4255,28 +4343,96 @@ "time": "2019-09-03T14:11:14+00:00" }, { - "name": "sebastiaanluca/laravel-helpers", - "version": "3.0.3", + "name": "scrivo/highlight.php", + "version": "v9.15.10.0", "source": { "type": "git", - "url": "https://github.com/sebastiaanluca/laravel-helpers.git", - "reference": "4f1895bf3b0f8fc0971b7656c8385d1d3fdc9060" + "url": "https://github.com/scrivo/highlight.php.git", + "reference": "9ad3adb4456dc91196327498dbbce6aa1ba1239e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastiaanluca/laravel-helpers/zipball/4f1895bf3b0f8fc0971b7656c8385d1d3fdc9060", - "reference": "4f1895bf3b0f8fc0971b7656c8385d1d3fdc9060", + "url": "https://api.github.com/repos/scrivo/highlight.php/zipball/9ad3adb4456dc91196327498dbbce6aa1ba1239e", + "reference": "9ad3adb4456dc91196327498dbbce6aa1ba1239e", "shasum": "" }, "require": { - "laravel/framework": "5.8.*", + "ext-json": "*", + "ext-mbstring": "*", + "php": ">=5.4" + }, + "require-dev": { + "phpunit/phpunit": "^4.8|^5.7", + "symfony/finder": "^2.8" + }, + "suggest": { + "ext-dom": "Needed to make use of the features in the utilities namespace" + }, + "type": "library", + "autoload": { + "psr-0": { + "Highlight\\": "", + "HighlightUtilities\\": "" + }, + "files": [ + "HighlightUtilities/functions.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Geert Bergman", + "role": "Project Author", + "homepage": "http://www.scrivo.org/" + }, + { + "name": "Vladimir Jimenez", + "role": "Contributor", + "homepage": "https://allejo.io" + }, + { + "name": "Martin Folkers", + "role": "Contributor", + "homepage": "https://twobrain.io" + } + ], + "description": "Server side syntax highlighter that supports 185 languages. It's a PHP port of highlight.js", + "keywords": [ + "code", + "highlight", + "highlight.js", + "highlight.php", + "syntax" + ], + "time": "2019-08-27T04:27:48+00:00" + }, + { + "name": "sebastiaanluca/laravel-helpers", + "version": "4.0.0", + "source": { + "type": "git", + "url": "https://github.com/sebastiaanluca/laravel-helpers.git", + "reference": "4011d1be955e1c1777b2bb88c3cfeec1ba2faf0c" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastiaanluca/laravel-helpers/zipball/4011d1be955e1c1777b2bb88c3cfeec1ba2faf0c", + "reference": "4011d1be955e1c1777b2bb88c3cfeec1ba2faf0c", + "shasum": "" + }, + "require": { + "laravel/framework": "5.8.*|^6.0", "php": "^7.2" }, "require-dev": { "kint-php/kint": "^3.1", "nesbot/carbon": "^1.25|^2.0", - "orchestra/testbench": "3.8.*", - "phpunit/phpunit": "^8.2" + "orchestra/testbench": "3.8.*|^4.0", + "phpunit/phpunit": "^8.3", + "sebastiaanluca/php-codesniffer-ruleset": "^0.4.2" }, "suggest": { "kint-php/kint": "A powerful and modern PHP debugging tool. Required for the debug collection macros.", @@ -4305,9 +4461,9 @@ "authors": [ { "name": "Sebastiaan Luca", + "role": "Author", "email": "hello@sebastiaanluca.com", - "homepage": "https://www.sebastiaanluca.com", - "role": "Author" + "homepage": "https://www.sebastiaanluca.com" } ], "description": "An extensive set of Laravel framework helper functions and collection macros.", @@ -4318,7 +4474,7 @@ "laravel", "macros" ], - "time": "2019-07-02T14:23:49+00:00" + "time": "2019-08-13T23:17:51+00:00" }, { "name": "seld/jsonlint", @@ -4513,25 +4669,25 @@ }, { "name": "spatie/laravel-backup", - "version": "6.3.1", + "version": "6.4.0", "source": { "type": "git", "url": "https://github.com/spatie/laravel-backup.git", - "reference": "cc37760ba75e9e07433b6314f37f438a91f7dea4" + "reference": "933c90957932dabf43b33bf91661bf3c8db8bc6a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spatie/laravel-backup/zipball/cc37760ba75e9e07433b6314f37f438a91f7dea4", - "reference": "cc37760ba75e9e07433b6314f37f438a91f7dea4", + "url": "https://api.github.com/repos/spatie/laravel-backup/zipball/933c90957932dabf43b33bf91661bf3c8db8bc6a", + "reference": "933c90957932dabf43b33bf91661bf3c8db8bc6a", "shasum": "" }, "require": { - "illuminate/console": "~5.8.0", - "illuminate/contracts": "~5.8.0", - "illuminate/events": "~5.8.0", - "illuminate/filesystem": "~5.8.0", - "illuminate/notifications": "~5.8.0", - "illuminate/support": "~5.8.0", + "illuminate/console": "~5.8.0|^6.0", + "illuminate/contracts": "~5.8.0|^6.0", + "illuminate/events": "~5.8.0|^6.0", + "illuminate/filesystem": "~5.8.0|^6.0", + "illuminate/notifications": "~5.8.0|^6.0", + "illuminate/support": "~5.8.0|^6.0", "league/flysystem": "^1.0.49", "php": "^7.2", "spatie/db-dumper": "^2.12", @@ -4540,8 +4696,9 @@ }, "require-dev": { "laravel/slack-notification-channel": "^1.0", + "league/flysystem-aws-s3-v3": "^1.0", "mockery/mockery": "^1.0", - "orchestra/testbench": "~3.8.0", + "orchestra/testbench": "~3.8.0|^4.0", "phpunit/phpunit": "^8.0" }, "suggest": { @@ -4570,9 +4727,9 @@ "authors": [ { "name": "Freek Van der Herten", - "role": "Developer", "email": "freek@spatie.be", - "homepage": "https://spatie.be" + "homepage": "https://spatie.be", + "role": "Developer" } ], "description": "A Laravel package to backup your application", @@ -4583,59 +4740,7 @@ "laravel-backup", "spatie" ], - "time": "2019-07-16T20:56:47+00:00" - }, - { - "name": "spatie/laravel-pjax", - "version": "1.3.2", - "source": { - "type": "git", - "url": "https://github.com/spatie/laravel-pjax.git", - "reference": "5c8d3b147bbdb40ecd794dee3035b4c05734ef35" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/spatie/laravel-pjax/zipball/5c8d3b147bbdb40ecd794dee3035b4c05734ef35", - "reference": "5c8d3b147bbdb40ecd794dee3035b4c05734ef35", - "shasum": "" - }, - "require": { - "illuminate/http": "^5.1", - "illuminate/support": "^5.1", - "php": "^5.5.0|^7.0", - "symfony/css-selector": "^2.7|^3.0|^4.0", - "symfony/dom-crawler": "^2.7|^3.0|^4.0" - }, - "require-dev": { - "phpunit/phpunit": "^4.8.36", - "scrutinizer/ocular": "~1.1" - }, - "type": "library", - "autoload": { - "psr-4": { - "Spatie\\Pjax\\": "src" - } - }, - "notification-url": "http://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Freek Van der Herten", - "email": "freek@spatie.be", - "homepage": "https://spatie.be", - "role": "Developer" - } - ], - "description": "A pjax middleware for Laravel 5", - "homepage": "https://github.com/spatie/laravel-pjax", - "keywords": [ - "laravel-pjax", - "pjax", - "spatie" - ], - "time": "2018-02-06T13:21:42+00:00" + "time": "2019-09-04T06:42:31+00:00" }, { "name": "spatie/temporary-directory", @@ -4982,67 +5087,6 @@ "homepage": "https://symfony.com", "time": "2019-08-20T14:27:59+00:00" }, - { - "name": "symfony/dom-crawler", - "version": "v4.3.4", - "source": { - "type": "git", - "url": "https://github.com/symfony/dom-crawler.git", - "reference": "cc686552948d627528c0e2e759186dff67c2610e" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/cc686552948d627528c0e2e759186dff67c2610e", - "reference": "cc686552948d627528c0e2e759186dff67c2610e", - "shasum": "" - }, - "require": { - "php": "^7.1.3", - "symfony/polyfill-ctype": "~1.8", - "symfony/polyfill-mbstring": "~1.0" - }, - "conflict": { - "masterminds/html5": "<2.6" - }, - "require-dev": { - "masterminds/html5": "^2.6", - "symfony/css-selector": "~3.4|~4.0" - }, - "suggest": { - "symfony/css-selector": "" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "4.3-dev" - } - }, - "autoload": { - "psr-4": { - "Symfony\\Component\\DomCrawler\\": "" - }, - "exclude-from-classmap": [ - "/Tests/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Symfony DomCrawler Component", - "homepage": "https://symfony.com", - "time": "2019-08-26T08:26:39+00:00" - }, { "name": "symfony/event-dispatcher", "version": "v4.3.4", @@ -6619,80 +6663,18 @@ ], "time": "2017-10-21T03:33:59+00:00" }, - { - "name": "toin0u/geotools-laravel", - "version": "1.0.0", - "source": { - "type": "git", - "url": "https://github.com/toin0u/Geotools-laravel.git", - "reference": "262e4209bd6368c9b69a59b55bea90dbbb5d221b" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/toin0u/Geotools-laravel/zipball/262e4209bd6368c9b69a59b55bea90dbbb5d221b", - "reference": "262e4209bd6368c9b69a59b55bea90dbbb5d221b", - "shasum": "" - }, - "require": { - "league/geotools": "~0.4", - "php": ">=5.4" - }, - "require-dev": { - "orchestra/testbench": "~2.0", - "phpunit/phpunit": "~4.0", - "satooshi/php-coveralls": "~0.6" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "0.3-dev" - } - }, - "autoload": { - "psr-4": { - "Toin0u\\Geotools\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Antoine Corcy", - "email": "contact@sbin.dk", - "homepage": "http://sbin.dk", - "role": "Developer" - } - ], - "description": "Geo-related tools PHP 5.3 library for Laravel 5", - "homepage": "http://geotools-php.org/", - "keywords": [ - "async", - "batch", - "bounds", - "distance", - "geocoder", - "geocoding", - "geoip", - "geometry", - "geotools", - "laravel" - ], - "time": "2015-02-23T12:40:40+00:00" - }, { "name": "vlucas/phpdotenv", - "version": "v3.5.0", + "version": "v3.6.0", "source": { "type": "git", "url": "https://github.com/vlucas/phpdotenv.git", - "reference": "95cb0fa6c025f7f0db7fc60f81e9fb231eb2d222" + "reference": "1bdf24f065975594f6a117f0f1f6cabf1333b156" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/vlucas/phpdotenv/zipball/95cb0fa6c025f7f0db7fc60f81e9fb231eb2d222", - "reference": "95cb0fa6c025f7f0db7fc60f81e9fb231eb2d222", + "url": "https://api.github.com/repos/vlucas/phpdotenv/zipball/1bdf24f065975594f6a117f0f1f6cabf1333b156", + "reference": "1bdf24f065975594f6a117f0f1f6cabf1333b156", "shasum": "" }, "require": { @@ -6701,12 +6683,12 @@ "symfony/polyfill-ctype": "^1.9" }, "require-dev": { - "phpunit/phpunit": "^4.8.35 || ^5.0 || ^6.0" + "phpunit/phpunit": "^4.8.35 || ^5.0 || ^6.0 || ^7.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "3.5-dev" + "dev-master": "3.6-dev" } }, "autoload": { @@ -6736,67 +6718,7 @@ "env", "environment" ], - "time": "2019-08-27T17:00:38+00:00" - }, - { - "name": "waavi/sanitizer", - "version": "1.0.11", - "source": { - "type": "git", - "url": "https://github.com/Waavi/Sanitizer.git", - "reference": "ab12ea90dcaae937dcce9970abb30dbfe9e35b78" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/Waavi/Sanitizer/zipball/ab12ea90dcaae937dcce9970abb30dbfe9e35b78", - "reference": "ab12ea90dcaae937dcce9970abb30dbfe9e35b78", - "shasum": "" - }, - "require": { - "illuminate/support": "~5.3", - "illuminate/validation": "~5.3", - "nesbot/carbon": "~1.0|~2.0" - }, - "require-dev": { - "phpunit/phpunit": "~6.0|~7.0|~8.0" - }, - "type": "library", - "extra": { - "laravel": { - "providers": [ - "Waavi\\Sanitizer\\Laravel\\SanitizerServiceProvider" - ], - "aliases": { - "Sanitizer": "Waavi\\Sanitizer\\Laravel\\Facade" - } - } - }, - "autoload": { - "psr-4": { - "Waavi\\Sanitizer\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "William Wallace San Paulo", - "email": "info@waavi.com" - } - ], - "description": "Data sanitizer and Laravel 5 form requests with input sanitation.", - "keywords": [ - "input", - "input filter", - "input sanitation", - "input sanitizer", - "laravel", - "sanitation", - "transform input" - ], - "time": "2019-04-25T13:11:15+00:00" + "time": "2019-09-10T21:37:39+00:00" }, { "name": "webpatser/laravel-uuid", @@ -6983,28 +6905,28 @@ }, { "name": "barryvdh/laravel-ide-helper", - "version": "v2.6.4", + "version": "v2.6.5", "source": { "type": "git", "url": "https://github.com/barryvdh/laravel-ide-helper.git", - "reference": "16eb4f65ee0d51b1f1182d56ae28ee00a70ce75a" + "reference": "8740a9a158d3dd5cfc706a9d4cc1bf7a518f99f3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/barryvdh/laravel-ide-helper/zipball/16eb4f65ee0d51b1f1182d56ae28ee00a70ce75a", - "reference": "16eb4f65ee0d51b1f1182d56ae28ee00a70ce75a", + "url": "https://api.github.com/repos/barryvdh/laravel-ide-helper/zipball/8740a9a158d3dd5cfc706a9d4cc1bf7a518f99f3", + "reference": "8740a9a158d3dd5cfc706a9d4cc1bf7a518f99f3", "shasum": "" }, "require": { "barryvdh/reflection-docblock": "^2.0.6", "composer/composer": "^1.6", + "doctrine/dbal": "~2.3", "illuminate/console": "^5.5|^6", "illuminate/filesystem": "^5.5|^6", "illuminate/support": "^5.5|^6", "php": ">=7" }, "require-dev": { - "doctrine/dbal": "~2.3", "illuminate/config": "^5.5|^6", "illuminate/view": "^5.5|^6", "phpro/grumphp": "^0.14", @@ -7012,9 +6934,6 @@ "scrutinizer/ocular": "~1.1", "squizlabs/php_codesniffer": "^3" }, - "suggest": { - "doctrine/dbal": "Load information from the database about models for phpdocs (~2.3)" - }, "type": "library", "extra": { "branch-alias": { @@ -7053,7 +6972,7 @@ "phpstorm", "sublime" ], - "time": "2019-09-03T17:51:13+00:00" + "time": "2019-09-08T09:56:38+00:00" }, { "name": "barryvdh/reflection-docblock", @@ -7374,67 +7293,6 @@ ], "time": "2019-03-17T17:37:11+00:00" }, - { - "name": "filp/whoops", - "version": "2.5.0", - "source": { - "type": "git", - "url": "https://github.com/filp/whoops.git", - "reference": "cde50e6720a39fdacb240159d3eea6865d51fd96" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/filp/whoops/zipball/cde50e6720a39fdacb240159d3eea6865d51fd96", - "reference": "cde50e6720a39fdacb240159d3eea6865d51fd96", - "shasum": "" - }, - "require": { - "php": "^5.5.9 || ^7.0", - "psr/log": "^1.0.1" - }, - "require-dev": { - "mockery/mockery": "^0.9 || ^1.0", - "phpunit/phpunit": "^4.8.35 || ^5.7", - "symfony/var-dumper": "^2.6 || ^3.0 || ^4.0" - }, - "suggest": { - "symfony/var-dumper": "Pretty print complex values better with var-dumper available", - "whoops/soap": "Formats errors as SOAP responses" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.2-dev" - } - }, - "autoload": { - "psr-4": { - "Whoops\\": "src/Whoops/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Filipe Dobreira", - "role": "Developer", - "homepage": "https://github.com/filp" - } - ], - "description": "php error handling for cool kids", - "homepage": "https://filp.github.io/whoops/", - "keywords": [ - "error", - "exception", - "handling", - "library", - "throwable", - "whoops" - ], - "time": "2019-08-07T09:00:00+00:00" - }, { "name": "friendsofphp/php-cs-fixer", "version": "v2.15.3", @@ -7524,6 +7382,56 @@ "description": "A tool to automatically fix PHP code style", "time": "2019-08-31T12:51:54+00:00" }, + { + "name": "fzaninotto/faker", + "version": "v1.8.0", + "source": { + "type": "git", + "url": "https://github.com/fzaninotto/Faker.git", + "reference": "f72816b43e74063c8b10357394b6bba8cb1c10de" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/fzaninotto/Faker/zipball/f72816b43e74063c8b10357394b6bba8cb1c10de", + "reference": "f72816b43e74063c8b10357394b6bba8cb1c10de", + "shasum": "" + }, + "require": { + "php": "^5.3.3 || ^7.0" + }, + "require-dev": { + "ext-intl": "*", + "phpunit/phpunit": "^4.8.35 || ^5.7", + "squizlabs/php_codesniffer": "^1.5" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.8-dev" + } + }, + "autoload": { + "psr-4": { + "Faker\\": "src/Faker/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "François Zaninotto" + } + ], + "description": "Faker is a PHP library that generates fake data for you.", + "keywords": [ + "data", + "faker", + "fixtures" + ], + "time": "2018-07-12T10:23:15+00:00" + }, { "name": "hamcrest/hamcrest-php", "version": "v1.2.2", @@ -8059,35 +7967,33 @@ }, { "name": "phpdocumentor/reflection-common", - "version": "1.0.1", + "version": "2.0.0", "source": { "type": "git", "url": "https://github.com/phpDocumentor/ReflectionCommon.git", - "reference": "21bdeb5f65d7ebf9f43b1b25d404f87deab5bfb6" + "reference": "63a995caa1ca9e5590304cd845c15ad6d482a62a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/ReflectionCommon/zipball/21bdeb5f65d7ebf9f43b1b25d404f87deab5bfb6", - "reference": "21bdeb5f65d7ebf9f43b1b25d404f87deab5bfb6", + "url": "https://api.github.com/repos/phpDocumentor/ReflectionCommon/zipball/63a995caa1ca9e5590304cd845c15ad6d482a62a", + "reference": "63a995caa1ca9e5590304cd845c15ad6d482a62a", "shasum": "" }, "require": { - "php": ">=5.5" + "php": ">=7.1" }, "require-dev": { - "phpunit/phpunit": "^4.6" + "phpunit/phpunit": "~6" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.0.x-dev" + "dev-master": "2.x-dev" } }, "autoload": { "psr-4": { - "phpDocumentor\\Reflection\\": [ - "src" - ] + "phpDocumentor\\Reflection\\": "src/" } }, "notification-url": "https://packagist.org/downloads/", @@ -8109,30 +8015,30 @@ "reflection", "static analysis" ], - "time": "2017-09-11T18:02:19+00:00" + "time": "2018-08-07T13:53:10+00:00" }, { "name": "phpdocumentor/reflection-docblock", - "version": "4.3.1", + "version": "4.3.2", "source": { "type": "git", "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git", - "reference": "bdd9f737ebc2a01c06ea7ff4308ec6697db9b53c" + "reference": "b83ff7cfcfee7827e1e78b637a5904fe6a96698e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/bdd9f737ebc2a01c06ea7ff4308ec6697db9b53c", - "reference": "bdd9f737ebc2a01c06ea7ff4308ec6697db9b53c", + "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/b83ff7cfcfee7827e1e78b637a5904fe6a96698e", + "reference": "b83ff7cfcfee7827e1e78b637a5904fe6a96698e", "shasum": "" }, "require": { "php": "^7.0", - "phpdocumentor/reflection-common": "^1.0.0", - "phpdocumentor/type-resolver": "^0.4.0", + "phpdocumentor/reflection-common": "^1.0.0 || ^2.0.0", + "phpdocumentor/type-resolver": "~0.4 || ^1.0.0", "webmozart/assert": "^1.0" }, "require-dev": { - "doctrine/instantiator": "~1.0.5", + "doctrine/instantiator": "^1.0.5", "mockery/mockery": "^1.0", "phpunit/phpunit": "^6.4" }, @@ -8160,41 +8066,40 @@ } ], "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.", - "time": "2019-04-30T17:48:53+00:00" + "time": "2019-09-12T14:27:41+00:00" }, { "name": "phpdocumentor/type-resolver", - "version": "0.4.0", + "version": "1.0.1", "source": { "type": "git", "url": "https://github.com/phpDocumentor/TypeResolver.git", - "reference": "9c977708995954784726e25d0cd1dddf4e65b0f7" + "reference": "2e32a6d48972b2c1976ed5d8967145b6cec4a4a9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/9c977708995954784726e25d0cd1dddf4e65b0f7", - "reference": "9c977708995954784726e25d0cd1dddf4e65b0f7", + "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/2e32a6d48972b2c1976ed5d8967145b6cec4a4a9", + "reference": "2e32a6d48972b2c1976ed5d8967145b6cec4a4a9", "shasum": "" }, "require": { - "php": "^5.5 || ^7.0", - "phpdocumentor/reflection-common": "^1.0" + "php": "^7.1", + "phpdocumentor/reflection-common": "^2.0" }, "require-dev": { - "mockery/mockery": "^0.9.4", - "phpunit/phpunit": "^5.2||^4.8.24" + "ext-tokenizer": "^7.1", + "mockery/mockery": "~1", + "phpunit/phpunit": "^7.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.0.x-dev" + "dev-master": "1.x-dev" } }, "autoload": { "psr-4": { - "phpDocumentor\\Reflection\\": [ - "src/" - ] + "phpDocumentor\\Reflection\\": "src" } }, "notification-url": "https://packagist.org/downloads/", @@ -8207,7 +8112,8 @@ "email": "me@mikevanriel.com" } ], - "time": "2017-07-14T14:27:02+00:00" + "description": "A PSR-5 based resolver of Class names, Types and Structural Element Names", + "time": "2019-08-22T18:11:29+00:00" }, { "name": "phpspec/prophecy", diff --git a/config/app.php b/config/app.php index 9601362f..6fa45def 100755 --- a/config/app.php +++ b/config/app.php @@ -68,8 +68,6 @@ return [ Laracasts\Flash\FlashServiceProvider::class, Prettus\Repository\Providers\RepositoryServiceProvider::class, SebastiaanLuca\Helpers\Collections\CollectionMacrosServiceProvider::class, - Toin0u\Geotools\GeotoolsServiceProvider::class, - Jackiedo\Timezonelist\TimezonelistServiceProvider::class, Irazasyed\LaravelGAMP\LaravelGAMPServiceProvider::class, Igaster\LaravelTheme\themeServiceProvider::class, Nwidart\Modules\LaravelModulesServiceProvider::class, @@ -84,7 +82,7 @@ return [ App\Providers\AuthServiceProvider::class, App\Providers\EventServiceProvider::class, App\Providers\RouteServiceProvider::class, - App\Providers\ExtendedTimezonelistProvider::class, + App\Providers\TimezonelistProvider::class, App\Providers\MeasurementsProvider::class, App\Providers\BindServiceProviders::class, ], @@ -106,7 +104,6 @@ return [ 'Flash' => Laracasts\Flash\Flash::class, 'Form' => Collective\Html\FormFacade::class, 'Gate' => Illuminate\Support\Facades\Gate::class, - 'Geotools' => Toin0u\Geotools\Facade\Geotools::class, 'Hash' => Illuminate\Support\Facades\Hash::class, 'Html' => Collective\Html\HtmlFacade::class, 'Lang' => Illuminate\Support\Facades\Lang::class, diff --git a/config/database.php b/config/database.php index 3be06d14..6cea9cea 100755 --- a/config/database.php +++ b/config/database.php @@ -32,9 +32,9 @@ return [ 'timezone' => '+00:00', 'prefix' => '', ], - 'unittest' => [ + 'testing' => [ 'driver' => 'sqlite', - 'database' => storage_path('unittest.sqlite'), + 'database' => storage_path('testing.sqlite'), 'timezone' => '+00:00', 'prefix' => '', ], @@ -50,11 +50,19 @@ return [ 'redis' => [ 'cluster' => false, + 'client' => 'phpredis', 'default' => [ 'host' => env('REDIS_HOST', 'localhost'), 'password' => env('REDIS_PASSWORD', null), 'port' => env('REDIS_PORT', 6379), 'database' => env('REDIS_DATABASE', 1), ], + 'cache' => [ + 'url' => env('REDIS_URL'), + 'host' => env('REDIS_HOST', '127.0.0.1'), + 'password' => env('REDIS_PASSWORD', null), + 'port' => env('REDIS_PORT', 6379), + 'database' => env('REDIS_CACHE_DB', 1), + ], ], ]; diff --git a/config/ignition.php b/config/ignition.php new file mode 100644 index 00000000..800e8a71 --- /dev/null +++ b/config/ignition.php @@ -0,0 +1,110 @@ + env('IGNITION_EDITOR', 'phpstorm'), + + /* + |-------------------------------------------------------------------------- + | Theme + |-------------------------------------------------------------------------- + | + | Here you may specify which theme Ignition should use. + | + | Supported: "light", "dark", "auto" + | + */ + + 'theme' => env('IGNITION_THEME', 'light'), + + /* + |-------------------------------------------------------------------------- + | Sharing + |-------------------------------------------------------------------------- + | + | You can share local errors with colleagues or others around the world. + | Sharing is completely free and doesn't require an account on Flare. + | + | If necessary, you can completely disable sharing below. + | + */ + + 'enable_share_button' => env('IGNITION_SHARING_ENABLED', true), + + /* + |-------------------------------------------------------------------------- + | Ignored Solution Providers + |-------------------------------------------------------------------------- + | + | You may specify a list of solution providers (as fully qualified class + | names) that shouldn't be loaded. Ignition will ignore these classes + | and possible solutions provided by them will never be displayed. + | + */ + + 'ignored_solution_providers' => [ + // + ], + + /* + |-------------------------------------------------------------------------- + | Runnable Solutions + |-------------------------------------------------------------------------- + | + | Some solutions that Ignition displays are runnable and can perform + | various tasks. Runnable solutions are enabled when your app has + | debug mode enabled. You may also fully disable this feature. + | + */ + + 'enable_runnable_solutions' => env('IGNITION_ENABLE_RUNNABLE_SOLUTIONS', null), + + /* + |-------------------------------------------------------------------------- + | Remote Path Mapping + |-------------------------------------------------------------------------- + | + | If you are using a remote dev server, like Laravel Homestead, Docker, or + | even a remote VPS, it will be necessary to specify your path mapping. + | + | Leaving one, or both of these, empty or null will not trigger the remote + | URL changes and Ignition will treat your editor links as local files. + | + | "remote_sites_path" is an absolute base path for your sites or projects + | in Homestead, Vagrant, Docker, or another remote development server. + | + | Example value: "/home/vagrant/Code" + | + | "local_sites_path" is an absolute base path for your sites or projects + | on your local computer where your IDE or code editor is running on. + | + | Example values: "/Users//Code", "C:\Users\\Documents\Code" + | + */ + + 'remote_sites_path' => env('IGNITION_REMOTE_SITES_PATH', ''), + 'local_sites_path' => env('IGNITION_LOCAL_SITES_PATH', ''), + + /* + |-------------------------------------------------------------------------- + | Housekeeping Endpoint Prefix + |-------------------------------------------------------------------------- + | + | Ignition registers a couple of routes when it is enabled. Below you may + | specify a route prefix that will be used to host all internal links. + | + */ + 'housekeeping_endpoint_prefix' => '_ignition', + +]; diff --git a/phpunit.xml b/phpunit.xml index 874dadaf..140c7501 100755 --- a/phpunit.xml +++ b/phpunit.xml @@ -14,6 +14,9 @@ ./tests + + + @@ -23,16 +26,21 @@ - - - - - - - - + + + + + + + + + + + + + diff --git a/resources/stubs/installer/config.stub b/resources/stubs/installer/config.stub index 9685d597..1c7bb1f9 100644 --- a/resources/stubs/installer/config.stub +++ b/resources/stubs/installer/config.stub @@ -86,6 +86,7 @@ return [ // Overrides config/logging.php 'logging' => [ + 'default' => 'stack', 'channels' => [ 'single' => ['level' => 'debug'], 'daily' => ['level' => 'debug'], diff --git a/resources/views/layouts/default/app.blade.php b/resources/views/layouts/default/app.blade.php index 4afd138a..28cd23a3 100644 --- a/resources/views/layouts/default/app.blade.php +++ b/resources/views/layouts/default/app.blade.php @@ -16,7 +16,7 @@ - + {{-- Start of the required files in the head block --}} diff --git a/resources/views/layouts/default/auth/layout.blade.php b/resources/views/layouts/default/auth/layout.blade.php index ba0f5676..08eafd5f 100644 --- a/resources/views/layouts/default/auth/layout.blade.php +++ b/resources/views/layouts/default/auth/layout.blade.php @@ -11,7 +11,9 @@ - + + + @yield('css') diff --git a/resources/views/layouts/default/auth/login.blade.php b/resources/views/layouts/default/auth/login.blade.php index c34aacee..b31464ba 100644 --- a/resources/views/layouts/default/auth/login.blade.php +++ b/resources/views/layouts/default/auth/login.blade.php @@ -2,80 +2,73 @@ @section('title', __('common.login')) @section('content') -
- - Now Ui Kit - - -
-
+
-
+
@endsection diff --git a/resources/views/layouts/default/auth/verify.blade.php b/resources/views/layouts/default/auth/verify.blade.php index f578db79..1b266428 100644 --- a/resources/views/layouts/default/auth/verify.blade.php +++ b/resources/views/layouts/default/auth/verify.blade.php @@ -15,8 +15,14 @@ @endif {{ __('Before proceeding, please check your email for a verification link.') }} - {{ __('If you did not receive the email') }}, {{ __('click here to request another') }}. + {{ __('If you did not receive the email') }}, + +
+ @csrf + . +
diff --git a/tests/Bootstrap.php b/tests/Bootstrap.php new file mode 100644 index 00000000..a47bd567 --- /dev/null +++ b/tests/Bootstrap.php @@ -0,0 +1,39 @@ +createApplication()->make(Kernel::class); + $commands = [ + 'config:cache', + 'event:cache', + ]; + foreach ($commands as $command) { + $console->call($command); + } + } + + public function executeAfterLastTest(): void + { + array_map('unlink', glob('bootstrap/cache/*.phpunit.php')); + } +} diff --git a/tests/CreatesApplication.php b/tests/CreatesApplication.php new file mode 100644 index 00000000..f27337b0 --- /dev/null +++ b/tests/CreatesApplication.php @@ -0,0 +1,21 @@ +make(Kernel::class)->bootstrap(); + + return $app; + } +} diff --git a/tests/TestCase.php b/tests/TestCase.php index b23e6605..0a74418e 100755 --- a/tests/TestCase.php +++ b/tests/TestCase.php @@ -7,14 +7,15 @@ use GuzzleHttp\Handler\MockHandler; use GuzzleHttp\HandlerStack; use GuzzleHttp\Psr7\Response; use Illuminate\Routing\Middleware\ThrottleRequests; +use Illuminate\Support\Facades\Artisan; +use Illuminate\Support\Facades\Mail; +use Tests\CreatesApplication; use Tests\TestData; -/** - * Class TestCase - */ class TestCase extends Illuminate\Foundation\Testing\TestCase { use TestData; + use CreatesApplication; /** * The base URL to use while testing the application. @@ -45,8 +46,10 @@ class TestCase extends Illuminate\Foundation\Testing\TestCase ThrottleRequests::class ); + Mail::fake(); + Artisan::call('database:create', ['--reset' => true]); - Artisan::call('migrate:refresh', ['--env' => 'unittest']); + Artisan::call('migrate:refresh', ['--env' => 'testing']); } public function tearDown() : void @@ -54,18 +57,6 @@ class TestCase extends Illuminate\Foundation\Testing\TestCase parent::tearDown(); } - /** - * Creates the application. Required to be implemented - * - * @return \Illuminate\Foundation\Application - */ - public function createApplication() - { - $app = require __DIR__.'/../bootstrap/app.php'; - $app->make(Illuminate\Contracts\Console\Kernel::class)->bootstrap(); - return $app; - } - /** * @param $user * @param array $headers