From 08bdc9705fa62926d52122740fd33f14c1f2e195 Mon Sep 17 00:00:00 2001 From: Dane Everitt Date: Wed, 4 Sep 2019 21:00:34 -0700 Subject: [PATCH] [L6] Update composer dependencies to support L6 Drops all of the eloquence requirements, this is going to break a shit load of code, needs to happen tired of this package always holding us back. Quite confident in my ability to write custom code to do the basic validation we need. Searching should be a fun nightmare to deal with later... --- app/Models/Allocation.php | 10 +- app/Models/ApiKey.php | 9 +- app/Models/DaemonKey.php | 9 +- app/Models/Database.php | 10 +- app/Models/DatabaseHost.php | 10 +- app/Models/Egg.php | 10 +- app/Models/EggVariable.php | 10 +- app/Models/Location.php | 10 +- app/Models/Nest.php | 10 +- app/Models/Node.php | 9 +- app/Models/Pack.php | 10 +- app/Models/Permission.php | 10 +- app/Models/Schedule.php | 10 +- app/Models/Server.php | 9 +- app/Models/Session.php | 7 - app/Models/Setting.php | 10 +- app/Models/Subuser.php | 9 +- app/Models/Task.php | 9 +- app/Models/TaskLog.php | 7 - app/Models/User.php | 16 +- app/Models/Validable.php | 40 ++ app/Providers/AppServiceProvider.php | 2 - composer.json | 10 +- composer.lock | 561 +++------------------------ config/app.php | 3 - 25 files changed, 125 insertions(+), 685 deletions(-) create mode 100644 app/Models/Validable.php diff --git a/app/Models/Allocation.php b/app/Models/Allocation.php index 5921c0a2b..fca63c0a8 100644 --- a/app/Models/Allocation.php +++ b/app/Models/Allocation.php @@ -2,16 +2,8 @@ namespace Pterodactyl\Models; -use Sofa\Eloquence\Eloquence; -use Sofa\Eloquence\Validable; -use Illuminate\Database\Eloquent\Model; -use Sofa\Eloquence\Contracts\CleansAttributes; -use Sofa\Eloquence\Contracts\Validable as ValidableContract; - -class Allocation extends Model implements CleansAttributes, ValidableContract +class Allocation extends Validable { - use Eloquence, Validable; - /** * The resource name for this model when it is transformed into an * API representation using fractal. diff --git a/app/Models/ApiKey.php b/app/Models/ApiKey.php index 797522c39..90ecf2be4 100644 --- a/app/Models/ApiKey.php +++ b/app/Models/ApiKey.php @@ -2,17 +2,10 @@ namespace Pterodactyl\Models; -use Sofa\Eloquence\Eloquence; -use Sofa\Eloquence\Validable; -use Illuminate\Database\Eloquent\Model; use Pterodactyl\Services\Acl\Api\AdminAcl; -use Sofa\Eloquence\Contracts\CleansAttributes; -use Sofa\Eloquence\Contracts\Validable as ValidableContract; -class ApiKey extends Model implements CleansAttributes, ValidableContract +class ApiKey extends Validable { - use Eloquence, Validable; - /** * Different API keys that can exist on the system. */ diff --git a/app/Models/DaemonKey.php b/app/Models/DaemonKey.php index c4c2940a9..5dc0ec4ee 100644 --- a/app/Models/DaemonKey.php +++ b/app/Models/DaemonKey.php @@ -2,16 +2,11 @@ namespace Pterodactyl\Models; -use Sofa\Eloquence\Eloquence; -use Sofa\Eloquence\Validable; -use Illuminate\Database\Eloquent\Model; use Znck\Eloquent\Traits\BelongsToThrough; -use Sofa\Eloquence\Contracts\CleansAttributes; -use Sofa\Eloquence\Contracts\Validable as ValidableContract; -class DaemonKey extends Model implements CleansAttributes, ValidableContract +class DaemonKey extends Validable { - use BelongsToThrough, Eloquence, Validable; + use BelongsToThrough; /** * @var string diff --git a/app/Models/Database.php b/app/Models/Database.php index 9ff1d8c17..8dc96ae31 100644 --- a/app/Models/Database.php +++ b/app/Models/Database.php @@ -2,16 +2,8 @@ namespace Pterodactyl\Models; -use Sofa\Eloquence\Eloquence; -use Sofa\Eloquence\Validable; -use Illuminate\Database\Eloquent\Model; -use Sofa\Eloquence\Contracts\CleansAttributes; -use Sofa\Eloquence\Contracts\Validable as ValidableContract; - -class Database extends Model implements CleansAttributes, ValidableContract +class Database extends Validable { - use Eloquence, Validable; - /** * The resource name for this model when it is transformed into an * API representation using fractal. diff --git a/app/Models/DatabaseHost.php b/app/Models/DatabaseHost.php index c564f725b..c2537148b 100644 --- a/app/Models/DatabaseHost.php +++ b/app/Models/DatabaseHost.php @@ -2,16 +2,8 @@ namespace Pterodactyl\Models; -use Sofa\Eloquence\Eloquence; -use Sofa\Eloquence\Validable; -use Illuminate\Database\Eloquent\Model; -use Sofa\Eloquence\Contracts\CleansAttributes; -use Sofa\Eloquence\Contracts\Validable as ValidableContract; - -class DatabaseHost extends Model implements CleansAttributes, ValidableContract +class DatabaseHost extends Validable { - use Eloquence, Validable; - /** * The resource name for this model when it is transformed into an * API representation using fractal. diff --git a/app/Models/Egg.php b/app/Models/Egg.php index ade28239d..5755f2269 100644 --- a/app/Models/Egg.php +++ b/app/Models/Egg.php @@ -2,16 +2,8 @@ namespace Pterodactyl\Models; -use Sofa\Eloquence\Eloquence; -use Sofa\Eloquence\Validable; -use Illuminate\Database\Eloquent\Model; -use Sofa\Eloquence\Contracts\CleansAttributes; -use Sofa\Eloquence\Contracts\Validable as ValidableContract; - -class Egg extends Model implements CleansAttributes, ValidableContract +class Egg extends Validable { - use Eloquence, Validable; - /** * The resource name for this model when it is transformed into an * API representation using fractal. diff --git a/app/Models/EggVariable.php b/app/Models/EggVariable.php index bfc9ac64f..776c60392 100644 --- a/app/Models/EggVariable.php +++ b/app/Models/EggVariable.php @@ -2,16 +2,8 @@ namespace Pterodactyl\Models; -use Sofa\Eloquence\Eloquence; -use Sofa\Eloquence\Validable; -use Illuminate\Database\Eloquent\Model; -use Sofa\Eloquence\Contracts\CleansAttributes; -use Sofa\Eloquence\Contracts\Validable as ValidableContract; - -class EggVariable extends Model implements CleansAttributes, ValidableContract +class EggVariable extends Validable { - use Eloquence, Validable; - /** * The resource name for this model when it is transformed into an * API representation using fractal. diff --git a/app/Models/Location.php b/app/Models/Location.php index 10fff147c..d50da49ee 100644 --- a/app/Models/Location.php +++ b/app/Models/Location.php @@ -2,16 +2,8 @@ namespace Pterodactyl\Models; -use Sofa\Eloquence\Eloquence; -use Sofa\Eloquence\Validable; -use Illuminate\Database\Eloquent\Model; -use Sofa\Eloquence\Contracts\CleansAttributes; -use Sofa\Eloquence\Contracts\Validable as ValidableContract; - -class Location extends Model implements CleansAttributes, ValidableContract +class Location extends Validable { - use Eloquence, Validable; - /** * The resource name for this model when it is transformed into an * API representation using fractal. diff --git a/app/Models/Nest.php b/app/Models/Nest.php index a6ab112e6..7376d5423 100644 --- a/app/Models/Nest.php +++ b/app/Models/Nest.php @@ -2,16 +2,8 @@ namespace Pterodactyl\Models; -use Sofa\Eloquence\Eloquence; -use Sofa\Eloquence\Validable; -use Illuminate\Database\Eloquent\Model; -use Sofa\Eloquence\Contracts\CleansAttributes; -use Sofa\Eloquence\Contracts\Validable as ValidableContract; - -class Nest extends Model implements CleansAttributes, ValidableContract +class Nest extends Validable { - use Eloquence, Validable; - /** * The resource name for this model when it is transformed into an * API representation using fractal. diff --git a/app/Models/Node.php b/app/Models/Node.php index 256431cea..feb595cd0 100644 --- a/app/Models/Node.php +++ b/app/Models/Node.php @@ -2,16 +2,11 @@ namespace Pterodactyl\Models; -use Sofa\Eloquence\Eloquence; -use Sofa\Eloquence\Validable; -use Illuminate\Database\Eloquent\Model; use Illuminate\Notifications\Notifiable; -use Sofa\Eloquence\Contracts\CleansAttributes; -use Sofa\Eloquence\Contracts\Validable as ValidableContract; -class Node extends Model implements CleansAttributes, ValidableContract +class Node extends Validable { - use Eloquence, Notifiable, Validable; + use Notifiable; /** * The resource name for this model when it is transformed into an diff --git a/app/Models/Pack.php b/app/Models/Pack.php index 657d2f1d0..dffee24cb 100644 --- a/app/Models/Pack.php +++ b/app/Models/Pack.php @@ -2,16 +2,8 @@ namespace Pterodactyl\Models; -use Sofa\Eloquence\Eloquence; -use Sofa\Eloquence\Validable; -use Illuminate\Database\Eloquent\Model; -use Sofa\Eloquence\Contracts\CleansAttributes; -use Sofa\Eloquence\Contracts\Validable as ValidableContract; - -class Pack extends Model implements CleansAttributes, ValidableContract +class Pack extends Validable { - use Eloquence, Validable; - /** * The resource name for this model when it is transformed into an * API representation using fractal. diff --git a/app/Models/Permission.php b/app/Models/Permission.php index 5d9ea6c72..08083793e 100644 --- a/app/Models/Permission.php +++ b/app/Models/Permission.php @@ -2,16 +2,8 @@ namespace Pterodactyl\Models; -use Sofa\Eloquence\Eloquence; -use Sofa\Eloquence\Validable; -use Illuminate\Database\Eloquent\Model; -use Sofa\Eloquence\Contracts\CleansAttributes; -use Sofa\Eloquence\Contracts\Validable as ValidableContract; - -class Permission extends Model implements CleansAttributes, ValidableContract +class Permission extends Validable { - use Eloquence, Validable; - /** * The resource name for this model when it is transformed into an * API representation using fractal. diff --git a/app/Models/Schedule.php b/app/Models/Schedule.php index 83971d797..6a4bea9b8 100644 --- a/app/Models/Schedule.php +++ b/app/Models/Schedule.php @@ -2,16 +2,8 @@ namespace Pterodactyl\Models; -use Sofa\Eloquence\Eloquence; -use Sofa\Eloquence\Validable; -use Illuminate\Database\Eloquent\Model; -use Sofa\Eloquence\Contracts\CleansAttributes; -use Sofa\Eloquence\Contracts\Validable as ValidableContract; - -class Schedule extends Model implements CleansAttributes, ValidableContract +class Schedule extends Validable { - use Eloquence, Validable; - /** * The resource name for this model when it is transformed into an * API representation using fractal. diff --git a/app/Models/Server.php b/app/Models/Server.php index 2f4477bd0..111d5c81c 100644 --- a/app/Models/Server.php +++ b/app/Models/Server.php @@ -3,13 +3,8 @@ namespace Pterodactyl\Models; use Schema; -use Sofa\Eloquence\Eloquence; -use Sofa\Eloquence\Validable; -use Illuminate\Database\Eloquent\Model; use Illuminate\Notifications\Notifiable; use Znck\Eloquent\Traits\BelongsToThrough; -use Sofa\Eloquence\Contracts\CleansAttributes; -use Sofa\Eloquence\Contracts\Validable as ValidableContract; /** * @property int $id @@ -55,9 +50,9 @@ use Sofa\Eloquence\Contracts\Validable as ValidableContract; * @property \Pterodactyl\Models\DaemonKey $key * @property \Pterodactyl\Models\DaemonKey[]|\Illuminate\Support\Collection $keys */ -class Server extends Model implements CleansAttributes, ValidableContract +class Server extends Validable { - use BelongsToThrough, Eloquence, Notifiable, Validable; + use BelongsToThrough, Notifiable; /** * The resource name for this model when it is transformed into an diff --git a/app/Models/Session.php b/app/Models/Session.php index 3eb9d526e..535afc801 100644 --- a/app/Models/Session.php +++ b/app/Models/Session.php @@ -1,11 +1,4 @@ . - * - * This software is licensed under the terms of the MIT license. - * https://opensource.org/licenses/MIT - */ namespace Pterodactyl\Models; diff --git a/app/Models/Setting.php b/app/Models/Setting.php index 90d41f3d4..c8ba5b44d 100644 --- a/app/Models/Setting.php +++ b/app/Models/Setting.php @@ -2,16 +2,8 @@ namespace Pterodactyl\Models; -use Sofa\Eloquence\Eloquence; -use Sofa\Eloquence\Validable; -use Illuminate\Database\Eloquent\Model; -use Sofa\Eloquence\Contracts\CleansAttributes; -use Sofa\Eloquence\Contracts\Validable as ValidableContract; - -class Setting extends Model implements CleansAttributes, ValidableContract +class Setting extends Validable { - use Eloquence, Validable; - /** * The table associated with the model. * diff --git a/app/Models/Subuser.php b/app/Models/Subuser.php index 93c62217a..d5b41645d 100644 --- a/app/Models/Subuser.php +++ b/app/Models/Subuser.php @@ -2,16 +2,11 @@ namespace Pterodactyl\Models; -use Sofa\Eloquence\Eloquence; -use Sofa\Eloquence\Validable; -use Illuminate\Database\Eloquent\Model; use Illuminate\Notifications\Notifiable; -use Sofa\Eloquence\Contracts\CleansAttributes; -use Sofa\Eloquence\Contracts\Validable as ValidableContract; -class Subuser extends Model implements CleansAttributes, ValidableContract +class Subuser extends Validable { - use Eloquence, Notifiable, Validable; + use Notifiable; /** * The resource name for this model when it is transformed into an diff --git a/app/Models/Task.php b/app/Models/Task.php index 28c8e3237..44de1617f 100644 --- a/app/Models/Task.php +++ b/app/Models/Task.php @@ -2,16 +2,11 @@ namespace Pterodactyl\Models; -use Sofa\Eloquence\Eloquence; -use Sofa\Eloquence\Validable; -use Illuminate\Database\Eloquent\Model; use Znck\Eloquent\Traits\BelongsToThrough; -use Sofa\Eloquence\Contracts\CleansAttributes; -use Sofa\Eloquence\Contracts\Validable as ValidableContract; -class Task extends Model implements CleansAttributes, ValidableContract +class Task extends Validable { - use BelongsToThrough, Eloquence, Validable; + use BelongsToThrough; /** * The resource name for this model when it is transformed into an diff --git a/app/Models/TaskLog.php b/app/Models/TaskLog.php index ec85677e1..eabfde604 100644 --- a/app/Models/TaskLog.php +++ b/app/Models/TaskLog.php @@ -1,11 +1,4 @@ . - * - * This software is licensed under the terms of the MIT license. - * https://opensource.org/licenses/MIT - */ namespace Pterodactyl\Models; diff --git a/app/Models/User.php b/app/Models/User.php index 28f785e01..7a5d68316 100644 --- a/app/Models/User.php +++ b/app/Models/User.php @@ -2,34 +2,25 @@ namespace Pterodactyl\Models; -use Sofa\Eloquence\Eloquence; -use Sofa\Eloquence\Validable; use Pterodactyl\Rules\Username; use Illuminate\Support\Collection; use Illuminate\Validation\Rules\In; use Illuminate\Auth\Authenticatable; -use Illuminate\Database\Eloquent\Model; use Illuminate\Notifications\Notifiable; -use Sofa\Eloquence\Contracts\CleansAttributes; use Illuminate\Auth\Passwords\CanResetPassword; use Pterodactyl\Traits\Helpers\AvailableLanguages; use Illuminate\Foundation\Auth\Access\Authorizable; -use Sofa\Eloquence\Contracts\Validable as ValidableContract; use Illuminate\Contracts\Auth\Authenticatable as AuthenticatableContract; use Illuminate\Contracts\Auth\Access\Authorizable as AuthorizableContract; use Illuminate\Contracts\Auth\CanResetPassword as CanResetPasswordContract; use Pterodactyl\Notifications\SendPasswordReset as ResetPasswordNotification; -class User extends Model implements +class User extends Validable implements AuthenticatableContract, AuthorizableContract, - CanResetPasswordContract, - CleansAttributes, - ValidableContract + CanResetPasswordContract { - use Authenticatable, Authorizable, AvailableLanguages, CanResetPassword, Eloquence, Notifiable, Validable { - gatherRules as eloquenceGatherRules; - } + use Authenticatable, Authorizable, AvailableLanguages, CanResetPassword, Notifiable; const USER_LEVEL_USER = 0; const USER_LEVEL_ADMIN = 1; @@ -171,7 +162,6 @@ class User extends Model implements */ protected static function gatherRules() { - $rules = self::eloquenceGatherRules(); $rules['language'][] = new In(array_keys((new self)->getAvailableLanguages())); $rules['username'][] = new Username; diff --git a/app/Models/Validable.php b/app/Models/Validable.php new file mode 100644 index 000000000..508e9691c --- /dev/null +++ b/app/Models/Validable.php @@ -0,0 +1,40 @@ +validate(); + }); + } + + /** + * @todo implement custom logic once L6 is done + * @return bool + */ + public function validate() + { + return true; + } +} diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php index 1adede6c6..d9aee55e2 100644 --- a/app/Providers/AppServiceProvider.php +++ b/app/Providers/AppServiceProvider.php @@ -8,7 +8,6 @@ use Pterodactyl\Models\User; use Pterodactyl\Models\Server; use Pterodactyl\Models\Subuser; use Illuminate\Support\Facades\Schema; -use Igaster\LaravelTheme\Facades\Theme; use Illuminate\Support\ServiceProvider; use Pterodactyl\Observers\UserObserver; use Pterodactyl\Observers\ServerObserver; @@ -29,7 +28,6 @@ class AppServiceProvider extends ServiceProvider View::share('appVersion', $this->versionData()['version'] ?? 'undefined'); View::share('appIsGit', $this->versionData()['is_git'] ?? false); - Theme::setSetting('cache-version', md5($this->versionData()['version'] ?? 'undefined')); } /** diff --git a/composer.json b/composer.json index 96c80e243..0e0fd6e4d 100644 --- a/composer.json +++ b/composer.json @@ -22,31 +22,25 @@ "fideloper/proxy": "^4.2", "guzzlehttp/guzzle": "^6.3", "hashids/hashids": "^4.0", - "igaster/laravel-theme": "^2.0.6", "laracasts/utilities": "^3.0", - "laravel/framework": "^5.8", + "laravel/framework": "^6.0.0", "laravel/helpers": "^1.1", "laravel/tinker": "^1.0", - "lord/laroute": "^2.4", "matriphe/iso-639": "^1.2", "pragmarx/google2fa": "^5.0", "predis/predis": "^1.1", "prologue/alerts": "^0.4", "s1lentium/iptools": "^1.1", - "sofa/eloquence-base": "v5.6.2", - "sofa/eloquence-validable": "v5.6", "spatie/laravel-fractal": "^5.6", - "staudenmeir/belongs-to-through": "^2.5", + "staudenmeir/belongs-to-through": "^2.6", "webmozart/assert": "^1.5" }, "require-dev": { "barryvdh/laravel-debugbar": "^3.2", "barryvdh/laravel-ide-helper": "^2.6", "codedungeon/phpunit-result-printer": "^0.26", - "filp/whoops": "^2.5", "friendsofphp/php-cs-fixer": "^2.15.1", "laravel/dusk": "^5.5", - "mockery/mockery": "^1.2", "php-mock/php-mock-phpunit": "^2.4", "phpunit/phpunit": "^7" }, diff --git a/composer.lock b/composer.lock index edb2230cb..f69e1537e 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "3e87f4edd42709c975105079f7f69e39", + "content-hash": "48b992ce56210c000f2d9a55a1c597e6", "packages": [ { "name": "appstract/laravel-blade-directives", @@ -1060,65 +1060,6 @@ ], "time": "2019-04-03T13:40:29+00:00" }, - { - "name": "igaster/laravel-theme", - "version": "v2.0.12", - "source": { - "type": "git", - "url": "https://github.com/igaster/laravel-theme.git", - "reference": "f75d323e1310c8506eff0f67814861cf9ced6567" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/igaster/laravel-theme/zipball/f75d323e1310c8506eff0f67814861cf9ced6567", - "reference": "f75d323e1310c8506eff0f67814861cf9ced6567", - "shasum": "" - }, - "require": { - "illuminate/contracts": "5.4.*|5.5.*|5.6.*|5.7.*|5.8.*" - }, - "suggest": { - "orchestra/asset": "Use '@css' and '@js' in Blade files" - }, - "type": "library", - "extra": { - "laravel": { - "providers": [ - "Igaster\\LaravelTheme\\themeServiceProvider" - ], - "aliases": { - "Theme": "Igaster\\LaravelTheme\\Facades\\Theme" - } - } - }, - "autoload": { - "psr-4": { - "Igaster\\LaravelTheme\\": "src/", - "Igaster\\LaravelTheme\\Tests\\": "tests/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Giannis Gasteratos", - "email": "igasteratos@gmail.com" - } - ], - "description": "Laravel 5 Themes: Asset & Views folder per theme. Theme inheritance. Blade integration and more...", - "homepage": "https://github.com/Igaster/laravel-theme.git", - "keywords": [ - "assets", - "blade", - "laravel", - "package", - "themes", - "views" - ], - "time": "2019-07-03T05:25:33+00:00" - }, { "name": "jakub-onderka/php-console-color", "version": "v0.2", @@ -1266,43 +1207,43 @@ }, { "name": "laravel/framework", - "version": "v5.8.35", + "version": "v6.0.0", "source": { "type": "git", "url": "https://github.com/laravel/framework.git", - "reference": "5a9e4d241a8b815e16c9d2151e908992c38db197" + "reference": "89c81d4dc37714d82521d05dc003b26b2a86defc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/framework/zipball/5a9e4d241a8b815e16c9d2151e908992c38db197", - "reference": "5a9e4d241a8b815e16c9d2151e908992c38db197", + "url": "https://api.github.com/repos/laravel/framework/zipball/89c81d4dc37714d82521d05dc003b26b2a86defc", + "reference": "89c81d4dc37714d82521d05dc003b26b2a86defc", "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" }, @@ -1342,47 +1283,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/cache": "Required to PSR-6 cache bridge (^4.3).", "symfony/psr-http-message-bridge": "Required to use PSR-7 bridging features (^1.1).", "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": { @@ -1410,7 +1348,7 @@ "framework", "laravel" ], - "time": "2019-09-03T16:44:30+00:00" + "time": "2019-09-03T13:09:57+00:00" }, { "name": "laravel/helpers", @@ -1676,57 +1614,6 @@ ], "time": "2019-05-10T02:16:43+00:00" }, - { - "name": "lord/laroute", - "version": "v2.4.9", - "source": { - "type": "git", - "url": "https://github.com/aaronlord/laroute.git", - "reference": "e26d30b565861c28fc99337c50f87b30d66b15ea" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/aaronlord/laroute/zipball/e26d30b565861c28fc99337c50f87b30d66b15ea", - "reference": "e26d30b565861c28fc99337c50f87b30d66b15ea", - "shasum": "" - }, - "require": { - "illuminate/config": "5.0.*|5.1.*|5.2.*|5.3.*|5.4.*|5.5.*|5.6.*|5.7.*|5.8.*", - "illuminate/console": "5.0.*|5.1.*|5.2.*|5.3.*|5.4.*|5.5.*|5.6.*|5.7.*|5.8.*", - "illuminate/filesystem": "5.0.*|5.1.*|5.2.*|5.3.*|5.4.*|5.5.*|5.6.*|5.7.*|5.8.*", - "illuminate/routing": "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.*", - "php": ">=5.4.0" - }, - "require-dev": { - "mockery/mockery": "dev-master", - "phpunit/phpunit": "~4.0" - }, - "type": "library", - "autoload": { - "psr-4": { - "Lord\\Laroute\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Aaron Lord", - "email": "hello@aaronlord.is" - } - ], - "description": "Access Laravels URL/Route helper functions, from JavaScript.", - "keywords": [ - "javascript", - "laravel", - "routes", - "routing" - ], - "time": "2019-05-11T10:01:00+00:00" - }, { "name": "matriphe/iso-639", "version": "1.2", @@ -1773,21 +1660,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" @@ -1795,33 +1682,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": { @@ -1847,7 +1737,7 @@ "logging", "psr-3" ], - "time": "2018-11-05T09:00:11+00:00" + "time": "2019-08-30T09:56:44+00:00" }, { "name": "mtdowling/jmespath.php", @@ -2853,167 +2743,6 @@ ], "time": "2018-09-19T06:15:53+00:00" }, - { - "name": "sofa/eloquence-base", - "version": "v5.6.2", - "source": { - "type": "git", - "url": "https://github.com/jarektkaczyk/eloquence-base.git", - "reference": "e941b7ff79ca9c77ef540b5f14a7f82a3acea5ba" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/jarektkaczyk/eloquence-base/zipball/e941b7ff79ca9c77ef540b5f14a7f82a3acea5ba", - "reference": "e941b7ff79ca9c77ef540b5f14a7f82a3acea5ba", - "shasum": "" - }, - "require": { - "illuminate/database": "^5.5", - "php": ">=7.0.0", - "sofa/hookable": "^5.5" - }, - "require-dev": { - "mockery/mockery": "0.9.4", - "phpunit/phpunit": "4.5.0", - "squizlabs/php_codesniffer": "2.3.3" - }, - "type": "library", - "extra": { - "laravel": { - "providers": [ - "Sofa\\Eloquence\\BaseServiceProvider" - ] - } - }, - "autoload": { - "psr-4": { - "Sofa\\Eloquence\\": "src" - }, - "files": [ - "src/helpers.php" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Jarek Tkaczyk", - "email": "jarek@softonsofa.com", - "homepage": "https://softonsofa.com/", - "role": "Developer" - } - ], - "description": "Flexible Searchable, Mappable, Metable, Validation and more extensions for Laravel Eloquent ORM.", - "keywords": [ - "eloquent", - "laravel", - "mappable", - "metable", - "mutable", - "searchable" - ], - "time": "2018-03-10T12:37:43+00:00" - }, - { - "name": "sofa/eloquence-validable", - "version": "5.6", - "source": { - "type": "git", - "url": "https://github.com/jarektkaczyk/eloquence-validable.git", - "reference": "9d9ef65bf4a4952efb54b06ac0b04fc8893d5f95" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/jarektkaczyk/eloquence-validable/zipball/9d9ef65bf4a4952efb54b06ac0b04fc8893d5f95", - "reference": "9d9ef65bf4a4952efb54b06ac0b04fc8893d5f95", - "shasum": "" - }, - "require": { - "php": ">=7.0.0", - "sofa/eloquence-base": "^5.5" - }, - "require-dev": { - "mockery/mockery": "0.9.4", - "phpunit/phpunit": "4.5.0", - "squizlabs/php_codesniffer": "2.3.3" - }, - "type": "library", - "autoload": { - "psr-4": { - "Sofa\\Eloquence\\": "src" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Jarek Tkaczyk", - "email": "jarek@softonsofa.com", - "homepage": "https://softonsofa.com/", - "role": "Developer" - } - ], - "description": "Flexible Searchable, Mappable, Metable, Validation and more extensions for Laravel Eloquent ORM.", - "keywords": [ - "eloquent", - "laravel", - "mappable", - "metable", - "mutable", - "searchable" - ], - "time": "2018-03-03T03:09:46+00:00" - }, - { - "name": "sofa/hookable", - "version": "5.6", - "source": { - "type": "git", - "url": "https://github.com/jarektkaczyk/hookable.git", - "reference": "c6f03e5e742d539755f8c7993ee96e907593a668" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/jarektkaczyk/hookable/zipball/c6f03e5e742d539755f8c7993ee96e907593a668", - "reference": "c6f03e5e742d539755f8c7993ee96e907593a668", - "shasum": "" - }, - "require": { - "illuminate/database": "^5.3", - "php": ">=5.6.4" - }, - "require-dev": { - "crysalead/kahlan": "~1.1" - }, - "type": "library", - "autoload": { - "psr-4": { - "Sofa\\Hookable\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Jarek Tkaczyk", - "email": "jarek@softonsofa.com", - "homepage": "http://softonsofa.com/", - "role": "Developer" - } - ], - "description": "Laravel Eloquent hooks system.", - "keywords": [ - "eloquent", - "laravel" - ], - "time": "2018-03-03T02:55:49+00:00" - }, { "name": "spatie/fractalistic", "version": "2.8.0", @@ -3135,24 +2864,24 @@ }, { "name": "staudenmeir/belongs-to-through", - "version": "v2.5.1", + "version": "v2.6", "source": { "type": "git", "url": "https://github.com/staudenmeir/belongs-to-through.git", - "reference": "b7be672324bdfc709787b49c22df84fd97734726" + "reference": "1f961dcc05e23aba291eb9f3da33b405b48a06ce" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/staudenmeir/belongs-to-through/zipball/b7be672324bdfc709787b49c22df84fd97734726", - "reference": "b7be672324bdfc709787b49c22df84fd97734726", + "url": "https://api.github.com/repos/staudenmeir/belongs-to-through/zipball/1f961dcc05e23aba291eb9f3da33b405b48a06ce", + "reference": "1f961dcc05e23aba291eb9f3da33b405b48a06ce", "shasum": "" }, "require": { - "illuminate/database": "~5.0", - "php": ">=5.6" + "illuminate/database": "^6.0", + "php": "^7.2" }, "require-dev": { - "phpunit/phpunit": "~5.7|~6.5" + "phpunit/phpunit": "^8.0" }, "type": "library", "autoload": { @@ -3175,7 +2904,7 @@ } ], "description": "Laravel Eloquent BelongsToThrough relationship", - "time": "2019-04-26T01:23:57+00:00" + "time": "2019-08-25T23:38:38+00:00" }, { "name": "swiftmailer/swiftmailer", @@ -5632,67 +5361,6 @@ ], "time": "2019-06-13T08:02:18+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", @@ -5782,54 +5450,6 @@ "description": "A tool to automatically fix PHP code style", "time": "2019-08-31T12:51:54+00:00" }, - { - "name": "hamcrest/hamcrest-php", - "version": "v2.0.0", - "source": { - "type": "git", - "url": "https://github.com/hamcrest/hamcrest-php.git", - "reference": "776503d3a8e85d4f9a1148614f95b7a608b046ad" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/hamcrest/hamcrest-php/zipball/776503d3a8e85d4f9a1148614f95b7a608b046ad", - "reference": "776503d3a8e85d4f9a1148614f95b7a608b046ad", - "shasum": "" - }, - "require": { - "php": "^5.3|^7.0" - }, - "replace": { - "cordoval/hamcrest-php": "*", - "davedevelopment/hamcrest-php": "*", - "kodova/hamcrest-php": "*" - }, - "require-dev": { - "phpunit/php-file-iterator": "1.3.3", - "phpunit/phpunit": "~4.0", - "satooshi/php-coveralls": "^1.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.0-dev" - } - }, - "autoload": { - "classmap": [ - "hamcrest" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD" - ], - "description": "This is the PHP port of Hamcrest Matchers", - "keywords": [ - "test" - ], - "time": "2016-01-20T08:20:44+00:00" - }, { "name": "hassankhan/config", "version": "0.11.2", @@ -6079,71 +5699,6 @@ ], "time": "2017-12-15T11:13:46+00:00" }, - { - "name": "mockery/mockery", - "version": "1.2.3", - "source": { - "type": "git", - "url": "https://github.com/mockery/mockery.git", - "reference": "4eff936d83eb809bde2c57a3cea0ee9643769031" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/mockery/mockery/zipball/4eff936d83eb809bde2c57a3cea0ee9643769031", - "reference": "4eff936d83eb809bde2c57a3cea0ee9643769031", - "shasum": "" - }, - "require": { - "hamcrest/hamcrest-php": "~2.0", - "lib-pcre": ">=7.0", - "php": ">=5.6.0" - }, - "require-dev": { - "phpunit/phpunit": "~5.7.10|~6.5|~7.0|~8.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.0.x-dev" - } - }, - "autoload": { - "psr-0": { - "Mockery": "library/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Pádraic Brady", - "email": "padraic.brady@gmail.com", - "homepage": "http://blog.astrumfutura.com" - }, - { - "name": "Dave Marshall", - "email": "dave.marshall@atstsolutions.co.uk", - "homepage": "http://davedevelopment.co.uk" - } - ], - "description": "Mockery is a simple yet flexible PHP mock object framework", - "homepage": "https://github.com/mockery/mockery", - "keywords": [ - "BDD", - "TDD", - "library", - "mock", - "mock objects", - "mockery", - "stub", - "test", - "test double", - "testing" - ], - "time": "2019-08-07T15:01:07+00:00" - }, { "name": "myclabs/deep-copy", "version": "1.9.3", diff --git a/config/app.php b/config/app.php index fccb8b888..619e22366 100644 --- a/config/app.php +++ b/config/app.php @@ -186,9 +186,7 @@ return [ /* * Additional Dependencies */ - Igaster\LaravelTheme\themeServiceProvider::class, Prologue\Alerts\AlertsServiceProvider::class, - Lord\Laroute\LarouteServiceProvider::class, ], /* @@ -236,7 +234,6 @@ return [ 'Schema' => Illuminate\Support\Facades\Schema::class, 'Session' => Illuminate\Support\Facades\Session::class, 'Storage' => Illuminate\Support\Facades\Storage::class, - 'Theme' => Igaster\LaravelTheme\Facades\Theme::class, 'URL' => Illuminate\Support\Facades\URL::class, 'Validator' => Illuminate\Support\Facades\Validator::class, 'View' => Illuminate\Support\Facades\View::class,