From ec4f10d43a7da44a90a5f527eb28d7d66b53371c Mon Sep 17 00:00:00 2001 From: Nabeel S Date: Wed, 30 Oct 2019 09:05:18 -0400 Subject: [PATCH] 359 Select theme in settings (#423) * Update composer package versions * Laravel version * Change theme in the admin settings page closes #359 * Fix comment --- Makefile | 4 +- app/Console/Commands/DevInstall.php | 8 - app/Database/seeds/settings.yml | 7 + .../Controllers/Admin/SettingsController.php | 23 +- app/Http/Middleware/SetActiveTheme.php | 22 + app/Http/Routes/web.php | 7 +- composer.json | 2 +- composer.lock | 539 +++++++++--------- resources/stubs/installer/config.stub | 11 - .../views/admin/settings/table.blade.php | 107 ++-- 10 files changed, 391 insertions(+), 339 deletions(-) create mode 100644 app/Http/Middleware/SetActiveTheme.php diff --git a/Makefile b/Makefile index de700e19..83e23777 100644 --- a/Makefile +++ b/Makefile @@ -65,7 +65,9 @@ reset: clean .PHONY: reload-db reload-db: - @php artisan phpvms:dev-install --reset-db + @php artisan database:create --reset + @php artisan migrate --seed + @echo "Done!" @make clean .PHONY: tests diff --git a/app/Console/Commands/DevInstall.php b/app/Console/Commands/DevInstall.php index 5856899c..ad19570b 100644 --- a/app/Console/Commands/DevInstall.php +++ b/app/Console/Commands/DevInstall.php @@ -13,14 +13,6 @@ class DevInstall extends Command protected $signature = 'phpvms:dev-install {--reset-db} {--reset-configs}'; protected $description = 'Run a developer install and run the sample migration'; - /** - * The YAML files with sample data to import - */ - protected $yaml_imports = [ - 'sample.yml', - 'acars.yml', - ]; - private $databaseSeeder; public function __construct(\DatabaseSeeder $databaseSeeder) diff --git a/app/Database/seeds/settings.yml b/app/Database/seeds/settings.yml index f88b2f9e..9b58b44f 100644 --- a/app/Database/seeds/settings.yml +++ b/app/Database/seeds/settings.yml @@ -1,3 +1,10 @@ +- key: general.theme + name: 'Current Theme' + group: general + value: 'default' + options: '' + type: select + description: 'The currently active theme' - key: general.start_date name: 'Start Date' group: general diff --git a/app/Http/Controllers/Admin/SettingsController.php b/app/Http/Controllers/Admin/SettingsController.php index 70ce68be..11882b13 100644 --- a/app/Http/Controllers/Admin/SettingsController.php +++ b/app/Http/Controllers/Admin/SettingsController.php @@ -4,14 +4,34 @@ namespace App\Http\Controllers\Admin; use App\Contracts\Controller; use App\Models\Setting; +use Igaster\LaravelTheme\Facades\Theme; use Illuminate\Http\Request; -use Log; +use Illuminate\Support\Facades\Log; /** * Class SettingsController */ class SettingsController extends Controller { + /** + * Get a list of themes formatted for a select box + * + * @return array + */ + private function getThemes(): array + { + $themes = Theme::all(); + $theme_list = []; + foreach ($themes as $t) { + if (!$t || !$t->name || $t->name === 'false') { + continue; + } + $theme_list[] = $t->name; + } + + return $theme_list; + } + /** * Display the settings. Group them by the setting group */ @@ -22,6 +42,7 @@ class SettingsController extends Controller return view('admin.settings.index', [ 'grouped_settings' => $settings, + 'themes' => $this->getThemes(), ]); } diff --git a/app/Http/Middleware/SetActiveTheme.php b/app/Http/Middleware/SetActiveTheme.php new file mode 100644 index 00000000..e6c872ed --- /dev/null +++ b/app/Http/Middleware/SetActiveTheme.php @@ -0,0 +1,22 @@ + 'Frontend', 'prefix' => '', 'as' => 'frontend.', + 'namespace' => 'Frontend', 'prefix' => '', 'as' => 'frontend.', + 'middleware' => [SetActiveTheme::class], ], function () { Route::get('/', 'HomeController@index')->name('home'); Route::get('r/{id}', 'PirepController@show')->name('pirep.show.public'); @@ -21,7 +24,7 @@ Route::group([ */ Route::group([ 'namespace' => 'Frontend', 'prefix' => '', 'as' => 'frontend.', - 'middleware' => ['role:admin|user'], + 'middleware' => ['role:admin|user', SetActiveTheme::class], ], function () { Route::resource('dashboard', 'DashboardController'); diff --git a/composer.json b/composer.json index cac2a294..9e77c32c 100755 --- a/composer.json +++ b/composer.json @@ -13,7 +13,7 @@ "ext-simplexml": "*", "ext-pdo": "*", "composer/composer": "~1.8.0", - "laravel/framework": "~6.0.0", + "laravel/framework": "~6.0", "akaunting/money": "^1.0", "anhskohbo/no-captcha": "^3.0", "appstract/laravel-opcache": "^2.0", diff --git a/composer.lock b/composer.lock index 5af78180..8ca95243 100644 --- a/composer.lock +++ b/composer.lock @@ -4,20 +4,20 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "65a0339b4ba756f5d21382236bdcc42b", + "content-hash": "646a110be5a7dc5a530dd8f6f634a5de", "packages": [ { "name": "akaunting/money", - "version": "1.0.12", + "version": "1.0.13", "source": { "type": "git", "url": "https://github.com/akaunting/money.git", - "reference": "1ab8060dfd6302be3c1028a2d20f131ece5ce634" + "reference": "da302568d31122b200cbd215622cb0ae47131524" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/akaunting/money/zipball/1ab8060dfd6302be3c1028a2d20f131ece5ce634", - "reference": "1ab8060dfd6302be3c1028a2d20f131ece5ce634", + "url": "https://api.github.com/repos/akaunting/money/zipball/da302568d31122b200cbd215622cb0ae47131524", + "reference": "da302568d31122b200cbd215622cb0ae47131524", "shasum": "" }, "require": { @@ -65,25 +65,25 @@ "laravel", "money" ], - "time": "2019-09-09T05:55:43+00:00" + "time": "2019-09-21T16:15:52+00:00" }, { "name": "anhskohbo/no-captcha", - "version": "3.1.0", + "version": "3.1.1", "source": { "type": "git", "url": "https://github.com/anhskohbo/no-captcha.git", - "reference": "e76c17b64fdbcf9d32b58b1db12175a5966bae2d" + "reference": "3b2f7d461e1fc7153e0c724c3ccac7a2db156733" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/anhskohbo/no-captcha/zipball/e76c17b64fdbcf9d32b58b1db12175a5966bae2d", - "reference": "e76c17b64fdbcf9d32b58b1db12175a5966bae2d", + "url": "https://api.github.com/repos/anhskohbo/no-captcha/zipball/3b2f7d461e1fc7153e0c724c3ccac7a2db156733", + "reference": "3b2f7d461e1fc7153e0c724c3ccac7a2db156733", "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.*|6.0.*", + "illuminate/support": "^5.0|^6.0", "php": ">=5.5.5" }, "require-dev": { @@ -125,7 +125,7 @@ "no-captcha", "recaptcha" ], - "time": "2019-08-27T02:13:31+00:00" + "time": "2019-10-03T06:42:31+00:00" }, { "name": "appstract/laravel-opcache", @@ -860,16 +860,16 @@ }, { "name": "doctrine/cache", - "version": "v1.8.0", + "version": "v1.8.1", "source": { "type": "git", "url": "https://github.com/doctrine/cache.git", - "reference": "d768d58baee9a4862ca783840eca1b9add7a7f57" + "reference": "d4374ae95b36062d02ef310100ed33d78738d76c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/cache/zipball/d768d58baee9a4862ca783840eca1b9add7a7f57", - "reference": "d768d58baee9a4862ca783840eca1b9add7a7f57", + "url": "https://api.github.com/repos/doctrine/cache/zipball/d4374ae95b36062d02ef310100ed33d78738d76c", + "reference": "d4374ae95b36062d02ef310100ed33d78738d76c", "shasum": "" }, "require": { @@ -904,6 +904,10 @@ "MIT" ], "authors": [ + { + "name": "Guilherme Blanco", + "email": "guilhermeblanco@gmail.com" + }, { "name": "Roman Borschel", "email": "roman@code-factory.org" @@ -912,10 +916,6 @@ "name": "Benjamin Eberlei", "email": "kontakt@beberlei.de" }, - { - "name": "Guilherme Blanco", - "email": "guilhermeblanco@gmail.com" - }, { "name": "Jonathan Wage", "email": "jonwage@gmail.com" @@ -931,7 +931,7 @@ "cache", "caching" ], - "time": "2018-08-21T18:01:43+00:00" + "time": "2019-10-28T09:31:32+00:00" }, { "name": "doctrine/dbal", @@ -1435,16 +1435,16 @@ }, { "name": "facade/flare-client-php", - "version": "1.0.4", + "version": "1.1.1", "source": { "type": "git", "url": "https://github.com/facade/flare-client-php.git", - "reference": "7128b251b48f24ef64e5cddd7f8d40cc3a06fd3e" + "reference": "608c2be3157b09f1868ca97ea4ddf3434ee83d63" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/facade/flare-client-php/zipball/7128b251b48f24ef64e5cddd7f8d40cc3a06fd3e", - "reference": "7128b251b48f24ef64e5cddd7f8d40cc3a06fd3e", + "url": "https://api.github.com/repos/facade/flare-client-php/zipball/608c2be3157b09f1868ca97ea4ddf3434ee83d63", + "reference": "608c2be3157b09f1868ca97ea4ddf3434ee83d63", "shasum": "" }, "require": { @@ -1456,7 +1456,7 @@ }, "require-dev": { "larapack/dd": "^1.1", - "phpunit/phpunit": "^7.0", + "phpunit/phpunit": "^7.5.16", "spatie/phpunit-snapshot-assertions": "^2.0" }, "type": "library", @@ -1485,26 +1485,26 @@ "flare", "reporting" ], - "time": "2019-09-11T14:19:56+00:00" + "time": "2019-10-07T19:15:46+00:00" }, { "name": "facade/ignition", - "version": "1.6.5", + "version": "1.11.2", "source": { "type": "git", "url": "https://github.com/facade/ignition.git", - "reference": "97244f6d511332f3574acab8242c09ddcfda892b" + "reference": "862cbc2dfffa1fa28b47822a116e5b2e03b421db" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/facade/ignition/zipball/97244f6d511332f3574acab8242c09ddcfda892b", - "reference": "97244f6d511332f3574acab8242c09ddcfda892b", + "url": "https://api.github.com/repos/facade/ignition/zipball/862cbc2dfffa1fa28b47822a116e5b2e03b421db", + "reference": "862cbc2dfffa1fa28b47822a116e5b2e03b421db", "shasum": "" }, "require": { "ext-json": "*", "ext-mbstring": "*", - "facade/flare-client-php": "^1.0.4", + "facade/flare-client-php": "^1.1", "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", @@ -1539,7 +1539,10 @@ "autoload": { "psr-4": { "Facade\\Ignition\\": "src" - } + }, + "files": [ + "src/helpers.php" + ] }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -1553,7 +1556,7 @@ "laravel", "page" ], - "time": "2019-09-13T13:38:04+00:00" + "time": "2019-10-13T10:42:06+00:00" }, { "name": "facade/ignition-contracts", @@ -1915,16 +1918,16 @@ }, { "name": "igaster/laravel-theme", - "version": "v2.0.13", + "version": "v2.0.14", "source": { "type": "git", "url": "https://github.com/igaster/laravel-theme.git", - "reference": "f089afb4e8d3af393d289f2bf928c4db2c1f3444" + "reference": "0be810b650e8b136874022abb8a54fee4fc94280" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/igaster/laravel-theme/zipball/f089afb4e8d3af393d289f2bf928c4db2c1f3444", - "reference": "f089afb4e8d3af393d289f2bf928c4db2c1f3444", + "url": "https://api.github.com/repos/igaster/laravel-theme/zipball/0be810b650e8b136874022abb8a54fee4fc94280", + "reference": "0be810b650e8b136874022abb8a54fee4fc94280", "shasum": "" }, "require": { @@ -1970,7 +1973,7 @@ "themes", "views" ], - "time": "2019-09-05T07:06:44+00:00" + "time": "2019-10-11T18:14:33+00:00" }, { "name": "intervention/image", @@ -2199,23 +2202,23 @@ }, { "name": "justinrainbow/json-schema", - "version": "5.2.8", + "version": "5.2.9", "source": { "type": "git", "url": "https://github.com/justinrainbow/json-schema.git", - "reference": "dcb6e1006bb5fd1e392b4daa68932880f37550d4" + "reference": "44c6787311242a979fa15c704327c20e7221a0e4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/justinrainbow/json-schema/zipball/dcb6e1006bb5fd1e392b4daa68932880f37550d4", - "reference": "dcb6e1006bb5fd1e392b4daa68932880f37550d4", + "url": "https://api.github.com/repos/justinrainbow/json-schema/zipball/44c6787311242a979fa15c704327c20e7221a0e4", + "reference": "44c6787311242a979fa15c704327c20e7221a0e4", "shasum": "" }, "require": { "php": ">=5.3.3" }, "require-dev": { - "friendsofphp/php-cs-fixer": "~2.2.20", + "friendsofphp/php-cs-fixer": "~2.2.20||~2.15.1", "json-schema/json-schema-test-suite": "1.2.0", "phpunit/phpunit": "^4.8.35" }, @@ -2261,7 +2264,7 @@ "json", "schema" ], - "time": "2019-01-14T23:55:14+00:00" + "time": "2019-09-25T14:49:45+00:00" }, { "name": "kkszymanowski/traitor", @@ -2364,16 +2367,16 @@ }, { "name": "laravel/framework", - "version": "v6.0.3", + "version": "v6.4.1", "source": { "type": "git", "url": "https://github.com/laravel/framework.git", - "reference": "56789e9dec750e0fbe8e9e6ae90a01a4e6887902" + "reference": "ebd8fcc038effa8c5f8791346c48047f7d0ed320" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/framework/zipball/56789e9dec750e0fbe8e9e6ae90a01a4e6887902", - "reference": "56789e9dec750e0fbe8e9e6ae90a01a4e6887902", + "url": "https://api.github.com/repos/laravel/framework/zipball/ebd8fcc038effa8c5f8791346c48047f7d0ed320", + "reference": "ebd8fcc038effa8c5f8791346c48047f7d0ed320", "shasum": "" }, "require": { @@ -2469,7 +2472,8 @@ "league/flysystem-sftp": "Required to use the Flysystem SFTP driver (^1.0).", "moontoast/math": "Required to use ordered UUIDs (^1.1).", "pda/pheanstalk": "Required to use the beanstalk queue driver (^4.0).", - "pusher/pusher-php-server": "Required to use the Pusher broadcast driver (^3.0).", + "psr/http-message": "Required to allow Storage::put to accept a StreamInterface (^1.0)", + "pusher/pusher-php-server": "Required to use the Pusher broadcast driver (^4.0).", "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)." @@ -2505,7 +2509,7 @@ "framework", "laravel" ], - "time": "2019-09-10T18:46:24+00:00" + "time": "2019-10-29T14:30:39+00:00" }, { "name": "laravel/helpers", @@ -2562,28 +2566,28 @@ }, { "name": "laravelcollective/html", - "version": "v6.0.1", + "version": "v6.0.3", "source": { "type": "git", "url": "https://github.com/LaravelCollective/html.git", - "reference": "4aecb0bb71013d1218c70ee02b011944840dcb60" + "reference": "bcc317d21a7e04eebcc81c4109fa84feaab63590" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/LaravelCollective/html/zipball/4aecb0bb71013d1218c70ee02b011944840dcb60", - "reference": "4aecb0bb71013d1218c70ee02b011944840dcb60", + "url": "https://api.github.com/repos/LaravelCollective/html/zipball/bcc317d21a7e04eebcc81c4109fa84feaab63590", + "reference": "bcc317d21a7e04eebcc81c4109fa84feaab63590", "shasum": "" }, "require": { - "illuminate/http": "6.0.*", - "illuminate/routing": "6.0.*", - "illuminate/session": "6.0.*", - "illuminate/support": "6.0.*", - "illuminate/view": "6.0.*", + "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": "6.0.*", + "illuminate/database": "^6.0", "mockery/mockery": "~1.0", "phpunit/phpunit": "~7.1" }, @@ -2626,7 +2630,7 @@ ], "description": "HTML and Form Builders for the Laravel Framework", "homepage": "https://laravelcollective.com", - "time": "2019-09-05T12:33:18+00:00" + "time": "2019-10-02T00:37:39+00:00" }, { "name": "league/csv", @@ -2697,16 +2701,16 @@ }, { "name": "league/flysystem", - "version": "1.0.55", + "version": "1.0.57", "source": { "type": "git", "url": "https://github.com/thephpleague/flysystem.git", - "reference": "33c91155537c6dc899eacdc54a13ac6303f156e6" + "reference": "0e9db7f0b96b9f12dcf6f65bc34b72b1a30ea55a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/33c91155537c6dc899eacdc54a13ac6303f156e6", - "reference": "33c91155537c6dc899eacdc54a13ac6303f156e6", + "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/0e9db7f0b96b9f12dcf6f65bc34b72b1a30ea55a", + "reference": "0e9db7f0b96b9f12dcf6f65bc34b72b1a30ea55a", "shasum": "" }, "require": { @@ -2777,7 +2781,7 @@ "sftp", "storage" ], - "time": "2019-08-24T11:17:19+00:00" + "time": "2019-10-16T21:01:05+00:00" }, { "name": "league/geotools", @@ -2855,16 +2859,16 @@ }, { "name": "league/iso3166", - "version": "2.1.2", + "version": "2.1.4", "source": { "type": "git", "url": "https://github.com/thephpleague/iso3166.git", - "reference": "5e8f504eea3f13e45fa397da86313371b3eb20d5" + "reference": "f2dca0b179e3ea4486f8089d0f910716b2896033" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/iso3166/zipball/5e8f504eea3f13e45fa397da86313371b3eb20d5", - "reference": "5e8f504eea3f13e45fa397da86313371b3eb20d5", + "url": "https://api.github.com/repos/thephpleague/iso3166/zipball/f2dca0b179e3ea4486f8089d0f910716b2896033", + "reference": "f2dca0b179e3ea4486f8089d0f910716b2896033", "shasum": "" }, "require": { @@ -2905,7 +2909,7 @@ "iso", "library" ], - "time": "2019-03-14T08:34:44+00:00" + "time": "2019-10-23T06:57:59+00:00" }, { "name": "markrogoyski/math-php", @@ -3103,21 +3107,21 @@ }, { "name": "nabeel/vacentral", - "version": "2.0.2", + "version": "2.0.3", "source": { "type": "git", "url": "https://github.com/nabeelio/vacentral-library.git", - "reference": "a1fa76db3c276c724b1c2cc5d872732b868880f6" + "reference": "a6e9dcc0f20b729634d2a27651f5feba472d4937" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nabeelio/vacentral-library/zipball/a1fa76db3c276c724b1c2cc5d872732b868880f6", - "reference": "a1fa76db3c276c724b1c2cc5d872732b868880f6", + "url": "https://api.github.com/repos/nabeelio/vacentral-library/zipball/a6e9dcc0f20b729634d2a27651f5feba472d4937", + "reference": "a6e9dcc0f20b729634d2a27651f5feba472d4937", "shasum": "" }, "require": { "guzzlehttp/guzzle": "~6.0", - "php": ">= 7.0.0" + "php": ">= 7.2" }, "require-dev": { "atoum/atoum": "^3.2", @@ -3136,20 +3140,20 @@ "license": [ "MIT" ], - "time": "2019-09-05T12:03:49+00:00" + "time": "2019-10-01T16:32:12+00:00" }, { "name": "nesbot/carbon", - "version": "2.24.0", + "version": "2.25.3", "source": { "type": "git", "url": "https://github.com/briannesbitt/Carbon.git", - "reference": "934459c5ac0658bc765ad1e53512c7c77adcac29" + "reference": "d07636581795383e2fea2d711212d30f941f2039" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/934459c5ac0658bc765ad1e53512c7c77adcac29", - "reference": "934459c5ac0658bc765ad1e53512c7c77adcac29", + "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/d07636581795383e2fea2d711212d30f941f2039", + "reference": "d07636581795383e2fea2d711212d30f941f2039", "shasum": "" }, "require": { @@ -3196,27 +3200,27 @@ "homepage": "http://github.com/kylekatarnls" } ], - "description": "A API extension for DateTime that supports 281 different languages.", + "description": "An API extension for DateTime that supports 281 different languages.", "homepage": "http://carbon.nesbot.com", "keywords": [ "date", "datetime", "time" ], - "time": "2019-08-31T16:37:55+00:00" + "time": "2019-10-20T11:05:44+00:00" }, { "name": "nikic/php-parser", - "version": "v4.2.4", + "version": "v4.2.5", "source": { "type": "git", "url": "https://github.com/nikic/PHP-Parser.git", - "reference": "97e59c7a16464196a8b9c77c47df68e4a39a45c4" + "reference": "b76bbc3c51f22c570648de48e8c2d941ed5e2cf2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/97e59c7a16464196a8b9c77c47df68e4a39a45c4", - "reference": "97e59c7a16464196a8b9c77c47df68e4a39a45c4", + "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/b76bbc3c51f22c570648de48e8c2d941ed5e2cf2", + "reference": "b76bbc3c51f22c570648de48e8c2d941ed5e2cf2", "shasum": "" }, "require": { @@ -3224,6 +3228,7 @@ "php": ">=7.0" }, "require-dev": { + "ircmaxell/php-yacc": "0.0.4", "phpunit/phpunit": "^6.5 || ^7.0 || ^8.0" }, "bin": [ @@ -3254,7 +3259,7 @@ "parser", "php" ], - "time": "2019-09-01T07:51:21+00:00" + "time": "2019-10-25T18:33:07+00:00" }, { "name": "nwidart/laravel-modules", @@ -3328,16 +3333,16 @@ }, { "name": "opis/closure", - "version": "3.4.0", + "version": "3.4.1", "source": { "type": "git", "url": "https://github.com/opis/closure.git", - "reference": "60a97fff133b1669a5b1776aa8ab06db3f3962b7" + "reference": "e79f851749c3caa836d7ccc01ede5828feb762c7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/opis/closure/zipball/60a97fff133b1669a5b1776aa8ab06db3f3962b7", - "reference": "60a97fff133b1669a5b1776aa8ab06db3f3962b7", + "url": "https://api.github.com/repos/opis/closure/zipball/e79f851749c3caa836d7ccc01ede5828feb762c7", + "reference": "e79f851749c3caa836d7ccc01ede5828feb762c7", "shasum": "" }, "require": { @@ -3385,7 +3390,7 @@ "serialization", "serialize" ], - "time": "2019-09-02T21:07:33+00:00" + "time": "2019-10-19T18:38:51+00:00" }, { "name": "paragonie/random_compat", @@ -3974,16 +3979,16 @@ }, { "name": "psr/log", - "version": "1.1.0", + "version": "1.1.1", "source": { "type": "git", "url": "https://github.com/php-fig/log.git", - "reference": "6c001f1daafa3a3ac1d8ff69ee4db8e799a654dd" + "reference": "bf73deb2b3b896a9d9c75f3f0d88185d2faa27e2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/log/zipball/6c001f1daafa3a3ac1d8ff69ee4db8e799a654dd", - "reference": "6c001f1daafa3a3ac1d8ff69ee4db8e799a654dd", + "url": "https://api.github.com/repos/php-fig/log/zipball/bf73deb2b3b896a9d9c75f3f0d88185d2faa27e2", + "reference": "bf73deb2b3b896a9d9c75f3f0d88185d2faa27e2", "shasum": "" }, "require": { @@ -3992,7 +3997,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.0.x-dev" + "dev-master": "1.1.x-dev" } }, "autoload": { @@ -4017,7 +4022,7 @@ "psr", "psr-3" ], - "time": "2018-11-20T15:27:04+00:00" + "time": "2019-10-25T08:06:51+00:00" }, { "name": "psr/simple-cache", @@ -4279,16 +4284,16 @@ }, { "name": "santigarcor/laratrust", - "version": "5.2.4", + "version": "5.2.5", "source": { "type": "git", "url": "https://github.com/santigarcor/laratrust.git", - "reference": "43d2354b149485731a9214014baf3421a6a56b9a" + "reference": "084cf15a0710657c203616f27309971f8a38ccd3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/santigarcor/laratrust/zipball/43d2354b149485731a9214014baf3421a6a56b9a", - "reference": "43d2354b149485731a9214014baf3421a6a56b9a", + "url": "https://api.github.com/repos/santigarcor/laratrust/zipball/084cf15a0710657c203616f27309971f8a38ccd3", + "reference": "084cf15a0710657c203616f27309971f8a38ccd3", "shasum": "" }, "require": { @@ -4340,7 +4345,7 @@ "rbac", "roles" ], - "time": "2019-09-16T15:50:06+00:00" + "time": "2019-10-22T14:41:04+00:00" }, { "name": "scrivo/highlight.php", @@ -4478,16 +4483,16 @@ }, { "name": "seld/jsonlint", - "version": "1.7.1", + "version": "1.7.2", "source": { "type": "git", "url": "https://github.com/Seldaek/jsonlint.git", - "reference": "d15f59a67ff805a44c50ea0516d2341740f81a38" + "reference": "e2e5d290e4d2a4f0eb449f510071392e00e10d19" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Seldaek/jsonlint/zipball/d15f59a67ff805a44c50ea0516d2341740f81a38", - "reference": "d15f59a67ff805a44c50ea0516d2341740f81a38", + "url": "https://api.github.com/repos/Seldaek/jsonlint/zipball/e2e5d290e4d2a4f0eb449f510071392e00e10d19", + "reference": "e2e5d290e4d2a4f0eb449f510071392e00e10d19", "shasum": "" }, "require": { @@ -4523,7 +4528,7 @@ "parser", "validator" ], - "time": "2018-01-24T12:46:19+00:00" + "time": "2019-10-24T14:27:39+00:00" }, { "name": "seld/phar-utils", @@ -4669,25 +4674,25 @@ }, { "name": "spatie/laravel-backup", - "version": "6.4.0", + "version": "6.7.2", "source": { "type": "git", "url": "https://github.com/spatie/laravel-backup.git", - "reference": "933c90957932dabf43b33bf91661bf3c8db8bc6a" + "reference": "ab48ebb31388e004dfac9d6203033e29db9a24a9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spatie/laravel-backup/zipball/933c90957932dabf43b33bf91661bf3c8db8bc6a", - "reference": "933c90957932dabf43b33bf91661bf3c8db8bc6a", + "url": "https://api.github.com/repos/spatie/laravel-backup/zipball/ab48ebb31388e004dfac9d6203033e29db9a24a9", + "reference": "ab48ebb31388e004dfac9d6203033e29db9a24a9", "shasum": "" }, "require": { - "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", + "illuminate/console": "^5.8.15|^6.0", + "illuminate/contracts": "^5.8.15|^6.0", + "illuminate/events": "^5.8.15|^6.0", + "illuminate/filesystem": "^5.8.15|^6.0", + "illuminate/notifications": "^5.8.15|^6.0", + "illuminate/support": "^5.8.15|^6.0", "league/flysystem": "^1.0.49", "php": "^7.2", "spatie/db-dumper": "^2.12", @@ -4698,7 +4703,7 @@ "laravel/slack-notification-channel": "^1.0", "league/flysystem-aws-s3-v3": "^1.0", "mockery/mockery": "^1.0", - "orchestra/testbench": "~3.8.0|^4.0", + "orchestra/testbench": "3.8.*|4.*", "phpunit/phpunit": "^8.0" }, "suggest": { @@ -4740,7 +4745,7 @@ "laravel-backup", "spatie" ], - "time": "2019-09-04T06:42:31+00:00" + "time": "2019-10-29T03:46:02+00:00" }, { "name": "spatie/temporary-directory", @@ -4905,16 +4910,16 @@ }, { "name": "symfony/console", - "version": "v4.3.4", + "version": "v4.3.5", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "de63799239b3881b8a08f8481b22348f77ed7b36" + "reference": "929ddf360d401b958f611d44e726094ab46a7369" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/de63799239b3881b8a08f8481b22348f77ed7b36", - "reference": "de63799239b3881b8a08f8481b22348f77ed7b36", + "url": "https://api.github.com/repos/symfony/console/zipball/929ddf360d401b958f611d44e726094ab46a7369", + "reference": "929ddf360d401b958f611d44e726094ab46a7369", "shasum": "" }, "require": { @@ -4976,20 +4981,20 @@ ], "description": "Symfony Console Component", "homepage": "https://symfony.com", - "time": "2019-08-26T08:26:39+00:00" + "time": "2019-10-07T12:36:49+00:00" }, { "name": "symfony/css-selector", - "version": "v4.3.4", + "version": "v4.3.5", "source": { "type": "git", "url": "https://github.com/symfony/css-selector.git", - "reference": "c6e5e2a00db768c92c3ae131532af4e1acc7bd03" + "reference": "f4b3ff6a549d9ed28b2b0ecd1781bf67cf220ee9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/css-selector/zipball/c6e5e2a00db768c92c3ae131532af4e1acc7bd03", - "reference": "c6e5e2a00db768c92c3ae131532af4e1acc7bd03", + "url": "https://api.github.com/repos/symfony/css-selector/zipball/f4b3ff6a549d9ed28b2b0ecd1781bf67cf220ee9", + "reference": "f4b3ff6a549d9ed28b2b0ecd1781bf67cf220ee9", "shasum": "" }, "require": { @@ -5029,20 +5034,20 @@ ], "description": "Symfony CssSelector Component", "homepage": "https://symfony.com", - "time": "2019-08-20T14:07:54+00:00" + "time": "2019-10-02T08:36:26+00:00" }, { "name": "symfony/debug", - "version": "v4.3.4", + "version": "v4.3.5", "source": { "type": "git", "url": "https://github.com/symfony/debug.git", - "reference": "afcdea44a2e399c1e4b52246ec8d54c715393ced" + "reference": "cc5c1efd0edfcfd10b354750594a46b3dd2afbbe" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/debug/zipball/afcdea44a2e399c1e4b52246ec8d54c715393ced", - "reference": "afcdea44a2e399c1e4b52246ec8d54c715393ced", + "url": "https://api.github.com/repos/symfony/debug/zipball/cc5c1efd0edfcfd10b354750594a46b3dd2afbbe", + "reference": "cc5c1efd0edfcfd10b354750594a46b3dd2afbbe", "shasum": "" }, "require": { @@ -5085,20 +5090,20 @@ ], "description": "Symfony Debug Component", "homepage": "https://symfony.com", - "time": "2019-08-20T14:27:59+00:00" + "time": "2019-09-19T15:51:53+00:00" }, { "name": "symfony/event-dispatcher", - "version": "v4.3.4", + "version": "v4.3.5", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher.git", - "reference": "429d0a1451d4c9c4abe1959b2986b88794b9b7d2" + "reference": "6229f58993e5a157f6096fc7145c0717d0be8807" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/429d0a1451d4c9c4abe1959b2986b88794b9b7d2", - "reference": "429d0a1451d4c9c4abe1959b2986b88794b9b7d2", + "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/6229f58993e5a157f6096fc7145c0717d0be8807", + "reference": "6229f58993e5a157f6096fc7145c0717d0be8807", "shasum": "" }, "require": { @@ -5155,20 +5160,20 @@ ], "description": "Symfony EventDispatcher Component", "homepage": "https://symfony.com", - "time": "2019-08-26T08:55:16+00:00" + "time": "2019-10-01T16:40:32+00:00" }, { "name": "symfony/event-dispatcher-contracts", - "version": "v1.1.5", + "version": "v1.1.7", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher-contracts.git", - "reference": "c61766f4440ca687de1084a5c00b08e167a2575c" + "reference": "c43ab685673fb6c8d84220c77897b1d6cdbe1d18" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/c61766f4440ca687de1084a5c00b08e167a2575c", - "reference": "c61766f4440ca687de1084a5c00b08e167a2575c", + "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/c43ab685673fb6c8d84220c77897b1d6cdbe1d18", + "reference": "c43ab685673fb6c8d84220c77897b1d6cdbe1d18", "shasum": "" }, "require": { @@ -5213,11 +5218,11 @@ "interoperability", "standards" ], - "time": "2019-06-20T06:46:26+00:00" + "time": "2019-09-17T09:54:03+00:00" }, { "name": "symfony/filesystem", - "version": "v4.3.4", + "version": "v4.3.5", "source": { "type": "git", "url": "https://github.com/symfony/filesystem.git", @@ -5267,16 +5272,16 @@ }, { "name": "symfony/finder", - "version": "v4.3.4", + "version": "v4.3.5", "source": { "type": "git", "url": "https://github.com/symfony/finder.git", - "reference": "86c1c929f0a4b24812e1eb109262fc3372c8e9f2" + "reference": "5e575faa95548d0586f6bedaeabec259714e44d1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/finder/zipball/86c1c929f0a4b24812e1eb109262fc3372c8e9f2", - "reference": "86c1c929f0a4b24812e1eb109262fc3372c8e9f2", + "url": "https://api.github.com/repos/symfony/finder/zipball/5e575faa95548d0586f6bedaeabec259714e44d1", + "reference": "5e575faa95548d0586f6bedaeabec259714e44d1", "shasum": "" }, "require": { @@ -5312,20 +5317,20 @@ ], "description": "Symfony Finder Component", "homepage": "https://symfony.com", - "time": "2019-08-14T12:26:46+00:00" + "time": "2019-09-16T11:29:48+00:00" }, { "name": "symfony/http-foundation", - "version": "v4.3.4", + "version": "v4.3.5", "source": { "type": "git", "url": "https://github.com/symfony/http-foundation.git", - "reference": "d804bea118ff340a12e22a79f9c7e7eb56b35adc" + "reference": "76590ced16d4674780863471bae10452b79210a5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-foundation/zipball/d804bea118ff340a12e22a79f9c7e7eb56b35adc", - "reference": "d804bea118ff340a12e22a79f9c7e7eb56b35adc", + "url": "https://api.github.com/repos/symfony/http-foundation/zipball/76590ced16d4674780863471bae10452b79210a5", + "reference": "76590ced16d4674780863471bae10452b79210a5", "shasum": "" }, "require": { @@ -5367,20 +5372,20 @@ ], "description": "Symfony HttpFoundation Component", "homepage": "https://symfony.com", - "time": "2019-08-26T08:55:16+00:00" + "time": "2019-10-04T19:48:13+00:00" }, { "name": "symfony/http-kernel", - "version": "v4.3.4", + "version": "v4.3.5", "source": { "type": "git", "url": "https://github.com/symfony/http-kernel.git", - "reference": "5e0fc71be03d52cd00c423061cfd300bd6f92a52" + "reference": "5f08141850932e8019c01d8988bf3ed6367d2991" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-kernel/zipball/5e0fc71be03d52cd00c423061cfd300bd6f92a52", - "reference": "5e0fc71be03d52cd00c423061cfd300bd6f92a52", + "url": "https://api.github.com/repos/symfony/http-kernel/zipball/5f08141850932e8019c01d8988bf3ed6367d2991", + "reference": "5f08141850932e8019c01d8988bf3ed6367d2991", "shasum": "" }, "require": { @@ -5459,20 +5464,20 @@ ], "description": "Symfony HttpKernel Component", "homepage": "https://symfony.com", - "time": "2019-08-26T16:47:42+00:00" + "time": "2019-10-07T15:06:41+00:00" }, { "name": "symfony/inflector", - "version": "v4.3.4", + "version": "v4.3.5", "source": { "type": "git", "url": "https://github.com/symfony/inflector.git", - "reference": "b25a8dc15fada858432efa083c1ecd2cef5991a7" + "reference": "fc488a52c79b2bbe848fa9def35f2cccb47c4798" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/inflector/zipball/b25a8dc15fada858432efa083c1ecd2cef5991a7", - "reference": "b25a8dc15fada858432efa083c1ecd2cef5991a7", + "url": "https://api.github.com/repos/symfony/inflector/zipball/fc488a52c79b2bbe848fa9def35f2cccb47c4798", + "reference": "fc488a52c79b2bbe848fa9def35f2cccb47c4798", "shasum": "" }, "require": { @@ -5517,20 +5522,20 @@ "symfony", "words" ], - "time": "2019-08-06T18:44:23+00:00" + "time": "2019-09-17T11:12:06+00:00" }, { "name": "symfony/mime", - "version": "v4.3.4", + "version": "v4.3.5", "source": { "type": "git", "url": "https://github.com/symfony/mime.git", - "reference": "987a05df1c6ac259b34008b932551353f4f408df" + "reference": "32f71570547b91879fdbd9cf50317d556ae86916" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/mime/zipball/987a05df1c6ac259b34008b932551353f4f408df", - "reference": "987a05df1c6ac259b34008b932551353f4f408df", + "url": "https://api.github.com/repos/symfony/mime/zipball/32f71570547b91879fdbd9cf50317d556ae86916", + "reference": "32f71570547b91879fdbd9cf50317d556ae86916", "shasum": "" }, "require": { @@ -5576,7 +5581,7 @@ "mime", "mime-type" ], - "time": "2019-08-22T08:16:11+00:00" + "time": "2019-09-19T17:00:15+00:00" }, { "name": "symfony/polyfill-ctype", @@ -5931,16 +5936,16 @@ }, { "name": "symfony/process", - "version": "v4.3.4", + "version": "v4.3.5", "source": { "type": "git", "url": "https://github.com/symfony/process.git", - "reference": "e89969c00d762349f078db1128506f7f3dcc0d4a" + "reference": "50556892f3cc47d4200bfd1075314139c4c9ff4b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/process/zipball/e89969c00d762349f078db1128506f7f3dcc0d4a", - "reference": "e89969c00d762349f078db1128506f7f3dcc0d4a", + "url": "https://api.github.com/repos/symfony/process/zipball/50556892f3cc47d4200bfd1075314139c4c9ff4b", + "reference": "50556892f3cc47d4200bfd1075314139c4c9ff4b", "shasum": "" }, "require": { @@ -5976,11 +5981,11 @@ ], "description": "Symfony Process Component", "homepage": "https://symfony.com", - "time": "2019-08-26T08:26:39+00:00" + "time": "2019-09-26T21:17:10+00:00" }, { "name": "symfony/property-access", - "version": "v4.3.4", + "version": "v4.3.5", "source": { "type": "git", "url": "https://github.com/symfony/property-access.git", @@ -6047,16 +6052,16 @@ }, { "name": "symfony/routing", - "version": "v4.3.4", + "version": "v4.3.5", "source": { "type": "git", "url": "https://github.com/symfony/routing.git", - "reference": "ff1049f6232dc5b6023b1ff1c6de56f82bcd264f" + "reference": "3b174ef04fe66696524efad1e5f7a6c663d822ea" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/routing/zipball/ff1049f6232dc5b6023b1ff1c6de56f82bcd264f", - "reference": "ff1049f6232dc5b6023b1ff1c6de56f82bcd264f", + "url": "https://api.github.com/repos/symfony/routing/zipball/3b174ef04fe66696524efad1e5f7a6c663d822ea", + "reference": "3b174ef04fe66696524efad1e5f7a6c663d822ea", "shasum": "" }, "require": { @@ -6119,20 +6124,20 @@ "uri", "url" ], - "time": "2019-08-26T08:26:39+00:00" + "time": "2019-10-04T20:57:10+00:00" }, { "name": "symfony/serializer", - "version": "v4.3.4", + "version": "v4.3.5", "source": { "type": "git", "url": "https://github.com/symfony/serializer.git", - "reference": "702900654e0ceed9ca7a9eccffb1d6ec69d7c8b6" + "reference": "805eacc72d28e237ef31659344a4d72acef335ec" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/serializer/zipball/702900654e0ceed9ca7a9eccffb1d6ec69d7c8b6", - "reference": "702900654e0ceed9ca7a9eccffb1d6ec69d7c8b6", + "url": "https://api.github.com/repos/symfony/serializer/zipball/805eacc72d28e237ef31659344a4d72acef335ec", + "reference": "805eacc72d28e237ef31659344a4d72acef335ec", "shasum": "" }, "require": { @@ -6199,20 +6204,20 @@ ], "description": "Symfony Serializer Component", "homepage": "https://symfony.com", - "time": "2019-08-26T08:55:16+00:00" + "time": "2019-10-02T15:03:35+00:00" }, { "name": "symfony/service-contracts", - "version": "v1.1.6", + "version": "v1.1.7", "source": { "type": "git", "url": "https://github.com/symfony/service-contracts.git", - "reference": "ea7263d6b6d5f798b56a45a5b8d686725f2719a3" + "reference": "ffcde9615dc5bb4825b9f6aed07716f1f57faae0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/service-contracts/zipball/ea7263d6b6d5f798b56a45a5b8d686725f2719a3", - "reference": "ea7263d6b6d5f798b56a45a5b8d686725f2719a3", + "url": "https://api.github.com/repos/symfony/service-contracts/zipball/ffcde9615dc5bb4825b9f6aed07716f1f57faae0", + "reference": "ffcde9615dc5bb4825b9f6aed07716f1f57faae0", "shasum": "" }, "require": { @@ -6257,20 +6262,20 @@ "interoperability", "standards" ], - "time": "2019-08-20T14:44:19+00:00" + "time": "2019-09-17T11:12:18+00:00" }, { "name": "symfony/translation", - "version": "v4.3.4", + "version": "v4.3.5", "source": { "type": "git", "url": "https://github.com/symfony/translation.git", - "reference": "28498169dd334095fa981827992f3a24d50fed0f" + "reference": "fe6193b066c457c144333c06aaa869a2d42a167f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/translation/zipball/28498169dd334095fa981827992f3a24d50fed0f", - "reference": "28498169dd334095fa981827992f3a24d50fed0f", + "url": "https://api.github.com/repos/symfony/translation/zipball/fe6193b066c457c144333c06aaa869a2d42a167f", + "reference": "fe6193b066c457c144333c06aaa869a2d42a167f", "shasum": "" }, "require": { @@ -6333,20 +6338,20 @@ ], "description": "Symfony Translation Component", "homepage": "https://symfony.com", - "time": "2019-08-26T08:55:16+00:00" + "time": "2019-09-27T14:37:39+00:00" }, { "name": "symfony/translation-contracts", - "version": "v1.1.6", + "version": "v1.1.7", "source": { "type": "git", "url": "https://github.com/symfony/translation-contracts.git", - "reference": "325b17c24f3ee23cbecfa63ba809c6d89b5fa04a" + "reference": "364518c132c95642e530d9b2d217acbc2ccac3e6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/translation-contracts/zipball/325b17c24f3ee23cbecfa63ba809c6d89b5fa04a", - "reference": "325b17c24f3ee23cbecfa63ba809c6d89b5fa04a", + "url": "https://api.github.com/repos/symfony/translation-contracts/zipball/364518c132c95642e530d9b2d217acbc2ccac3e6", + "reference": "364518c132c95642e530d9b2d217acbc2ccac3e6", "shasum": "" }, "require": { @@ -6390,20 +6395,20 @@ "interoperability", "standards" ], - "time": "2019-08-02T12:15:04+00:00" + "time": "2019-09-17T11:12:18+00:00" }, { "name": "symfony/var-dumper", - "version": "v4.3.4", + "version": "v4.3.5", "source": { "type": "git", "url": "https://github.com/symfony/var-dumper.git", - "reference": "641043e0f3e615990a0f29479f9c117e8a6698c6" + "reference": "bde8957fc415fdc6964f33916a3755737744ff05" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/var-dumper/zipball/641043e0f3e615990a0f29479f9c117e8a6698c6", - "reference": "641043e0f3e615990a0f29479f9c117e8a6698c6", + "url": "https://api.github.com/repos/symfony/var-dumper/zipball/bde8957fc415fdc6964f33916a3755737744ff05", + "reference": "bde8957fc415fdc6964f33916a3755737744ff05", "shasum": "" }, "require": { @@ -6466,20 +6471,20 @@ "debug", "dump" ], - "time": "2019-08-26T08:26:39+00:00" + "time": "2019-10-04T19:48:13+00:00" }, { "name": "symfony/yaml", - "version": "v4.3.4", + "version": "v4.3.5", "source": { "type": "git", "url": "https://github.com/symfony/yaml.git", - "reference": "5a0b7c32dc3ec56fd4abae8a4a71b0cf05013686" + "reference": "41e16350a2a1c7383c4735aa2f9fce74cf3d1178" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/yaml/zipball/5a0b7c32dc3ec56fd4abae8a4a71b0cf05013686", - "reference": "5a0b7c32dc3ec56fd4abae8a4a71b0cf05013686", + "url": "https://api.github.com/repos/symfony/yaml/zipball/41e16350a2a1c7383c4735aa2f9fce74cf3d1178", + "reference": "41e16350a2a1c7383c4735aa2f9fce74cf3d1178", "shasum": "" }, "require": { @@ -6525,7 +6530,7 @@ ], "description": "Symfony Yaml Component", "homepage": "https://symfony.com", - "time": "2019-08-20T14:27:59+00:00" + "time": "2019-09-11T15:41:19+00:00" }, { "name": "theiconic/php-ga-measurement-protocol", @@ -6570,21 +6575,23 @@ }, { "name": "tijsverkoyen/css-to-inline-styles", - "version": "2.2.1", + "version": "2.2.2", "source": { "type": "git", "url": "https://github.com/tijsverkoyen/CssToInlineStyles.git", - "reference": "0ed4a2ea4e0902dac0489e6436ebcd5bbcae9757" + "reference": "dda2ee426acd6d801d5b7fd1001cde9b5f790e15" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/tijsverkoyen/CssToInlineStyles/zipball/0ed4a2ea4e0902dac0489e6436ebcd5bbcae9757", - "reference": "0ed4a2ea4e0902dac0489e6436ebcd5bbcae9757", + "url": "https://api.github.com/repos/tijsverkoyen/CssToInlineStyles/zipball/dda2ee426acd6d801d5b7fd1001cde9b5f790e15", + "reference": "dda2ee426acd6d801d5b7fd1001cde9b5f790e15", "shasum": "" }, "require": { + "ext-dom": "*", + "ext-libxml": "*", "php": "^5.5 || ^7.0", - "symfony/css-selector": "^2.7 || ^3.0 || ^4.0" + "symfony/css-selector": "^2.7 || ^3.0 || ^4.0 || ^5.0" }, "require-dev": { "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.0" @@ -6600,7 +6607,7 @@ "TijsVerkoyen\\CssToInlineStyles\\": "src" } }, - "notification-url": "http://packagist.org/downloads/", + "notification-url": "https://packagist.org/downloads/", "license": [ "BSD-3-Clause" ], @@ -6613,7 +6620,7 @@ ], "description": "CssToInlineStyles is a class that enables you to convert HTML-pages/files into HTML-pages/files with inline styles. This is very useful when you're sending emails.", "homepage": "https://github.com/tijsverkoyen/CssToInlineStyles", - "time": "2017-11-27T11:13:29+00:00" + "time": "2019-10-24T08:53:34+00:00" }, { "name": "tivie/php-os-detector", @@ -7171,16 +7178,16 @@ }, { "name": "doctrine/annotations", - "version": "v1.7.0", + "version": "v1.8.0", "source": { "type": "git", "url": "https://github.com/doctrine/annotations.git", - "reference": "fa4c4e861e809d6a1103bd620cce63ed91aedfeb" + "reference": "904dca4eb10715b92569fbcd79e201d5c349b6bc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/annotations/zipball/fa4c4e861e809d6a1103bd620cce63ed91aedfeb", - "reference": "fa4c4e861e809d6a1103bd620cce63ed91aedfeb", + "url": "https://api.github.com/repos/doctrine/annotations/zipball/904dca4eb10715b92569fbcd79e201d5c349b6bc", + "reference": "904dca4eb10715b92569fbcd79e201d5c349b6bc", "shasum": "" }, "require": { @@ -7189,7 +7196,7 @@ }, "require-dev": { "doctrine/cache": "1.*", - "phpunit/phpunit": "^7.5@dev" + "phpunit/phpunit": "^7.5" }, "type": "library", "extra": { @@ -7235,7 +7242,7 @@ "docblock", "parser" ], - "time": "2019-08-08T18:11:40+00:00" + "time": "2019-10-01T18:55:10+00:00" }, { "name": "doctrine/instantiator", @@ -7624,25 +7631,25 @@ }, { "name": "maximebf/debugbar", - "version": "v1.15.0", + "version": "v1.15.1", "source": { "type": "git", "url": "https://github.com/maximebf/php-debugbar.git", - "reference": "30e7d60937ee5f1320975ca9bc7bcdd44d500f07" + "reference": "6c4277f6117e4864966c9cb58fb835cee8c74a1e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/maximebf/php-debugbar/zipball/30e7d60937ee5f1320975ca9bc7bcdd44d500f07", - "reference": "30e7d60937ee5f1320975ca9bc7bcdd44d500f07", + "url": "https://api.github.com/repos/maximebf/php-debugbar/zipball/6c4277f6117e4864966c9cb58fb835cee8c74a1e", + "reference": "6c4277f6117e4864966c9cb58fb835cee8c74a1e", "shasum": "" }, "require": { - "php": ">=5.3.0", + "php": ">=5.6", "psr/log": "^1.0", - "symfony/var-dumper": "^2.6|^3.0|^4.0" + "symfony/var-dumper": "^2.6|^3|^4" }, "require-dev": { - "phpunit/phpunit": "^4.0|^5.0" + "phpunit/phpunit": "^5" }, "suggest": { "kriswallsmith/assetic": "The best way to manage assets", @@ -7652,7 +7659,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.14-dev" + "dev-master": "1.15-dev" } }, "autoload": { @@ -7681,7 +7688,7 @@ "debug", "debugbar" ], - "time": "2017-12-15T11:13:46+00:00" + "time": "2019-09-24T14:55:42+00:00" }, { "name": "mockery/mockery", @@ -8117,22 +8124,22 @@ }, { "name": "phpspec/prophecy", - "version": "1.8.1", + "version": "1.9.0", "source": { "type": "git", "url": "https://github.com/phpspec/prophecy.git", - "reference": "1927e75f4ed19131ec9bcc3b002e07fb1173ee76" + "reference": "f6811d96d97bdf400077a0cc100ae56aa32b9203" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpspec/prophecy/zipball/1927e75f4ed19131ec9bcc3b002e07fb1173ee76", - "reference": "1927e75f4ed19131ec9bcc3b002e07fb1173ee76", + "url": "https://api.github.com/repos/phpspec/prophecy/zipball/f6811d96d97bdf400077a0cc100ae56aa32b9203", + "reference": "f6811d96d97bdf400077a0cc100ae56aa32b9203", "shasum": "" }, "require": { "doctrine/instantiator": "^1.0.2", "php": "^5.3|^7.0", - "phpdocumentor/reflection-docblock": "^2.0|^3.0.2|^4.0", + "phpdocumentor/reflection-docblock": "^2.0|^3.0.2|^4.0|^5.0", "sebastian/comparator": "^1.1|^2.0|^3.0", "sebastian/recursion-context": "^1.0|^2.0|^3.0" }, @@ -8176,20 +8183,20 @@ "spy", "stub" ], - "time": "2019-06-13T12:50:23+00:00" + "time": "2019-10-03T11:07:50+00:00" }, { "name": "phpunit/php-code-coverage", - "version": "7.0.7", + "version": "7.0.8", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-code-coverage.git", - "reference": "7743bbcfff2a907e9ee4a25be13d0f8ec5e73800" + "reference": "aa0d179a13284c7420fc281fc32750e6cc7c9e2f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/7743bbcfff2a907e9ee4a25be13d0f8ec5e73800", - "reference": "7743bbcfff2a907e9ee4a25be13d0f8ec5e73800", + "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/aa0d179a13284c7420fc281fc32750e6cc7c9e2f", + "reference": "aa0d179a13284c7420fc281fc32750e6cc7c9e2f", "shasum": "" }, "require": { @@ -8198,7 +8205,7 @@ "php": "^7.2", "phpunit/php-file-iterator": "^2.0.2", "phpunit/php-text-template": "^1.2.1", - "phpunit/php-token-stream": "^3.1.0", + "phpunit/php-token-stream": "^3.1.1", "sebastian/code-unit-reverse-lookup": "^1.0.1", "sebastian/environment": "^4.2.2", "sebastian/version": "^2.0.1", @@ -8239,7 +8246,7 @@ "testing", "xunit" ], - "time": "2019-07-25T05:31:54+00:00" + "time": "2019-09-17T06:24:36+00:00" }, { "name": "phpunit/php-file-iterator", @@ -8383,16 +8390,16 @@ }, { "name": "phpunit/php-token-stream", - "version": "3.1.0", + "version": "3.1.1", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-token-stream.git", - "reference": "e899757bb3df5ff6e95089132f32cd59aac2220a" + "reference": "995192df77f63a59e47f025390d2d1fdf8f425ff" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/e899757bb3df5ff6e95089132f32cd59aac2220a", - "reference": "e899757bb3df5ff6e95089132f32cd59aac2220a", + "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/995192df77f63a59e47f025390d2d1fdf8f425ff", + "reference": "995192df77f63a59e47f025390d2d1fdf8f425ff", "shasum": "" }, "require": { @@ -8428,20 +8435,20 @@ "keywords": [ "tokenizer" ], - "time": "2019-07-25T05:29:42+00:00" + "time": "2019-09-17T06:23:10+00:00" }, { "name": "phpunit/phpunit", - "version": "8.3.5", + "version": "8.4.2", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "302faed7059fde575cf3403a78c730c5e3a62750" + "reference": "a142a7e66c0ea7b5b6c04ee27f08d10d1137cd9b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/302faed7059fde575cf3403a78c730c5e3a62750", - "reference": "302faed7059fde575cf3403a78c730c5e3a62750", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/a142a7e66c0ea7b5b6c04ee27f08d10d1137cd9b", + "reference": "a142a7e66c0ea7b5b6c04ee27f08d10d1137cd9b", "shasum": "" }, "require": { @@ -8485,7 +8492,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "8.3-dev" + "dev-master": "8.4-dev" } }, "autoload": { @@ -8511,7 +8518,7 @@ "testing", "xunit" ], - "time": "2019-09-14T09:12:03+00:00" + "time": "2019-10-28T10:39:51+00:00" }, { "name": "sebastian/code-unit-reverse-lookup", @@ -9130,16 +9137,16 @@ }, { "name": "squizlabs/php_codesniffer", - "version": "3.4.2", + "version": "3.5.2", "source": { "type": "git", "url": "https://github.com/squizlabs/PHP_CodeSniffer.git", - "reference": "b8a7362af1cc1aadb5bd36c3defc4dda2cf5f0a8" + "reference": "65b12cdeaaa6cd276d4c3033a95b9b88b12701e7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/b8a7362af1cc1aadb5bd36c3defc4dda2cf5f0a8", - "reference": "b8a7362af1cc1aadb5bd36c3defc4dda2cf5f0a8", + "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/65b12cdeaaa6cd276d4c3033a95b9b88b12701e7", + "reference": "65b12cdeaaa6cd276d4c3033a95b9b88b12701e7", "shasum": "" }, "require": { @@ -9177,11 +9184,11 @@ "phpcs", "standards" ], - "time": "2019-04-10T23:49:02+00:00" + "time": "2019-10-28T04:36:32+00:00" }, { "name": "symfony/options-resolver", - "version": "v4.3.4", + "version": "v4.3.5", "source": { "type": "git", "url": "https://github.com/symfony/options-resolver.git", @@ -9294,7 +9301,7 @@ }, { "name": "symfony/stopwatch", - "version": "v4.3.4", + "version": "v4.3.5", "source": { "type": "git", "url": "https://github.com/symfony/stopwatch.git", diff --git a/resources/stubs/installer/config.stub b/resources/stubs/installer/config.stub index 1c7bb1f9..e2fb21a9 100644 --- a/resources/stubs/installer/config.stub +++ b/resources/stubs/installer/config.stub @@ -31,17 +31,6 @@ return [ 'currency' => 'USD', ], - // This is the name of the active theme - // Overrides config/themes.php - 'themes' => [ - 'default' => 'default', - ], - - // Overrides config/vacentral.php - 'vacentral' => [ - 'api_key' => '', - ], - // // Other settings and configuration you might not need to modify // diff --git a/resources/views/admin/settings/table.blade.php b/resources/views/admin/settings/table.blade.php index d079d541..5f4bd49f 100644 --- a/resources/views/admin/settings/table.blade.php +++ b/resources/views/admin/settings/table.blade.php @@ -1,63 +1,72 @@ {{ Form::model($grouped_settings, ['route' => ['admin.settings.update'], 'method' => 'post']) }} @foreach($grouped_settings as $group => $settings) -
-
- - - - +
+
+
-
{{ $group }}
-
+ + + - @foreach($settings as $setting) - - - + + - - @endforeach -
+
{{ $group }}
+
-

{{ $setting->name }}

-

- @component('admin.components.info') - {{$setting->description}} - @endcomponent -

- @if($setting->type === 'date') - {{ Form::input('text', $setting->id, $setting->value, ['class' => 'form-control', 'id' => 'datepicker']) }} - @elseif($setting->type === 'boolean' || $setting->type === 'bool') - {{ Form::hidden($setting->id, 0) }} - {{ Form::checkbox($setting->id, null, $setting->value) }} - @elseif($setting->type === 'int') - {{ Form::number($setting->id, $setting->value, ['class'=>'form-control']) }} - @elseif($setting->type === 'number') - {{ Form::number($setting->id, $setting->value, ['class'=>'form-control', 'step' => '0.01']) }} - @elseif($setting->type === 'select') - {{ Form::select( - $setting->id, - list_to_assoc(explode(',', $setting->options)), - $setting->value, - ['class' => 'select2', 'style' => 'width: 100%; text-align: left;']) }} - @else - {{ Form::input('text', $setting->id, $setting->value, ['class' => 'form-control']) }} - @endif + @foreach($settings as $setting) +
+

{{ $setting->name }}

+

+ @component('admin.components.info') + {{$setting->description}} + @endcomponent +

+ @if($setting->type === 'date') + {{ Form::input('text', $setting->id, $setting->value, ['class' => 'form-control', 'id' => 'datepicker']) }} + @elseif($setting->type === 'boolean' || $setting->type === 'bool') + {{ Form::hidden($setting->id, 0) }} + {{ Form::checkbox($setting->id, null, $setting->value) }} + @elseif($setting->type === 'int') + {{ Form::number($setting->id, $setting->value, ['class'=>'form-control']) }} + @elseif($setting->type === 'number') + {{ Form::number($setting->id, $setting->value, ['class'=>'form-control', 'step' => '0.01']) }} + @elseif($setting->type === 'select') -
-
+ @if($setting->id === 'general_theme') + {{ Form::select( + $setting->id, + list_to_assoc($themes), + $setting->value, + ['class' => 'select2', 'style' => 'width: 100%; text-align: left;']) }} + @else + {{ Form::select( + $setting->id, + list_to_assoc(explode(',', $setting->options)), + $setting->value, + ['class' => 'select2', 'style' => 'width: 100%; text-align: left;']) }} + @endif + @else + {{ Form::input('text', $setting->id, $setting->value, ['class' => 'form-control']) }} + @endif + + + + @endforeach +
+ @endforeach
-
-
- {{ Form::button('Save', ['type' => 'submit', 'class' => 'btn btn-success']) }} - Cancel -
+
+
+ {{ Form::button('Save', ['type' => 'submit', 'class' => 'btn btn-success']) }} + Cancel
+
{{ Form::close() }}