diff --git a/app/Http/Controllers/AuthController.php b/app/Http/Controllers/AuthController.php index 2ab6014a..05f6e016 100644 --- a/app/Http/Controllers/AuthController.php +++ b/app/Http/Controllers/AuthController.php @@ -61,7 +61,7 @@ class AuthController extends Controller return json(trans('auth.login.success'), 0); } else { // Increase the counter - Cache::put($loginFailsCacheKey, ++$loginFails, 60); + Cache::put($loginFailsCacheKey, ++$loginFails, 3600); return json(trans('auth.validation.password'), 1, [ 'login_fails' => $loginFails @@ -201,7 +201,7 @@ class AuthController extends Controller return json(trans('auth.forgot.failed', ['msg' => $e->getMessage()]), 2); } - Cache::put($lastMailCacheKey, time(), 60); + Cache::put($lastMailCacheKey, time(), 3600); return json(trans('auth.forgot.success'), 0); } diff --git a/app/Http/Controllers/MarketController.php b/app/Http/Controllers/MarketController.php index 6f395d9b..c78d73e7 100644 --- a/app/Http/Controllers/MarketController.php +++ b/app/Http/Controllers/MarketController.php @@ -4,6 +4,7 @@ namespace App\Http\Controllers; use Exception; use ZipArchive; +use Illuminate\Support\Arr; use Illuminate\Http\Request; use Composer\Semver\Comparator; use App\Services\PluginManager; @@ -54,7 +55,7 @@ class MarketController extends Controller $item['installed'] = false; } - $requirements = array_get($item, 'require', []); + $requirements = Arr::get($item, 'require', []); unset($item['require']); $item['dependencies'] = [ @@ -93,7 +94,7 @@ class MarketController extends Controller // Gather plugin distribution URL $url = $metadata['dist']['url']; - $filename = array_last(explode('/', $url)); + $filename = Arr::last(explode('/', $url)); $plugins_dir = $manager->getPluginsDir(); $tmp_path = $plugins_dir.DIRECTORY_SEPARATOR.$filename; @@ -152,6 +153,6 @@ class MarketController extends Controller $this->registryCache = json_decode($pluginsJson, true); } - return array_get($this->registryCache, 'packages', []); + return Arr::get($this->registryCache, 'packages', []); } } diff --git a/app/Http/Controllers/UpdateController.php b/app/Http/Controllers/UpdateController.php index 9f653d1f..4a003601 100644 --- a/app/Http/Controllers/UpdateController.php +++ b/app/Http/Controllers/UpdateController.php @@ -9,6 +9,7 @@ use Option; use Storage; use Exception; use ZipArchive; +use Illuminate\Support\Arr; use App\Services\OptionForm; use Illuminate\Http\Request; use Composer\Semver\Comparator; @@ -92,7 +93,7 @@ class UpdateController extends Controller ); if ($detail = $this->getReleaseInfo($info['latest_version'])) { - $info = array_merge($info, array_only($detail, [ + $info = array_merge($info, Arr::only($detail, [ 'release_note', 'release_url', 'release_time', @@ -104,7 +105,7 @@ class UpdateController extends Controller } if (! $info['new_version_available']) { - $info['release_time'] = array_get($this->getReleaseInfo($this->currentVersion), 'release_time'); + $info['release_time'] = Arr::get($this->getReleaseInfo($this->currentVersion), 'release_time'); } } @@ -157,7 +158,7 @@ class UpdateController extends Controller // Set temporary path for the update package $tmp_path = $update_cache.'/update_'.time().'.zip'; - Cache::put('tmp_path', $tmp_path, 60); + Cache::put('tmp_path', $tmp_path, 3600); Log::info('[Update Wizard] Prepare to download update package', compact('release_url', 'tmp_path')); // We won't get remote file size here since HTTP HEAD method is not always reliable @@ -184,7 +185,7 @@ class UpdateController extends Controller if ($total == $downloaded || floor($downloaded / 102400) > floor($GLOBALS['last_downloaded'] / 102400)) { $GLOBALS['last_downloaded'] = $downloaded; Log::info('[Update Wizard] Download progress (in bytes):', [$total, $downloaded]); - Cache::put('download-progress', compact('total', 'downloaded'), 60); + Cache::put('download-progress', compact('total', 'downloaded'), 3600); } // @codeCoverageIgnoreEnd } @@ -278,10 +279,10 @@ class UpdateController extends Controller } } - $this->latestVersion = array_get($this->updateInfo, 'latest_version', $this->currentVersion); + $this->latestVersion = Arr::get($this->updateInfo, 'latest_version', $this->currentVersion); if (! is_null($key)) { - return array_get($this->updateInfo, $key); + return Arr::get($this->updateInfo, $key); } return $this->updateInfo; @@ -289,7 +290,7 @@ class UpdateController extends Controller protected function getReleaseInfo($version) { - return array_get($this->getUpdateInfo('releases'), $version); + return Arr::get($this->getUpdateInfo('releases'), $version); } } diff --git a/app/Http/Middleware/DetectLanguagePrefer.php b/app/Http/Middleware/DetectLanguagePrefer.php index 23f63e4c..1a270404 100644 --- a/app/Http/Middleware/DetectLanguagePrefer.php +++ b/app/Http/Middleware/DetectLanguagePrefer.php @@ -2,6 +2,7 @@ namespace App\Http\Middleware; +use Illuminate\Support\Arr; use Illuminate\Http\Request; use Illuminate\Http\Response; @@ -23,7 +24,7 @@ class DetectLanguagePrefer $locale = $request->input('lang') ?: ($request->cookie('locale') ?: $request->getPreferredLanguage()); // If current locale is an alias of other locale - if (($info = array_get(config('locales'), $locale)) && ($alias = array_get($info, 'alias'))) { + if (($info = Arr::get(config('locales'), $locale)) && ($alias = Arr::get($info, 'alias'))) { $locale = $alias; } diff --git a/app/Models/Player.php b/app/Models/Player.php index 09d4ceb3..fd826da7 100644 --- a/app/Models/Player.php +++ b/app/Models/Player.php @@ -221,7 +221,7 @@ class Player extends Model // Support both CustomSkinLoader API & UniSkinAPI if ($api_type == self::CSL_API || $api_type == self::USM_API) { - $responses = Event::fire(new GetPlayerJson($this, $api_type)); + $responses = Event::dispatch(new GetPlayerJson($this, $api_type)); // If listeners return nothing if (isset($responses[0]) && $responses[0] !== null) { diff --git a/app/Models/User.php b/app/Models/User.php index ccd662ea..2c7992a2 100644 --- a/app/Models/User.php +++ b/app/Models/User.php @@ -4,6 +4,7 @@ namespace App\Models; use DB; use Carbon\Carbon; +use Illuminate\Support\Arr; use App\Events\EncryptUserPassword; use Illuminate\Foundation\Auth\User as Authenticatable; @@ -101,7 +102,7 @@ class User extends Authenticatable { $responses = event(new EncryptUserPassword($rawPasswd, $user)); - return array_get($responses, 0); + return Arr::get($responses, 0); } /** diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php index fe9ae5bd..eca5c8b8 100644 --- a/app/Providers/AppServiceProvider.php +++ b/app/Providers/AppServiceProvider.php @@ -8,6 +8,7 @@ use Event; use App\Events; use App\Models\User; use ReflectionException; +use Illuminate\Support\Arr; use Illuminate\Support\ServiceProvider; use App\Exceptions\PrettyPageException; use App\Services\Repositories\OptionRepository; @@ -24,9 +25,13 @@ class AppServiceProvider extends ServiceProvider // Control the URL generated by url() function $this->configureUrlGenerator(); + Blade::if('admin', function (User $user) { + return $user->isAdmin(); + }); + Event::listen(Events\RenderingHeader::class, function($event) { // Provide some application information for javascript - $blessing = array_merge(array_except(config('app'), ['key', 'providers', 'aliases', 'cipher', 'log', 'url']), [ + $blessing = array_merge(Arr::except(config('app'), ['key', 'providers', 'aliases', 'cipher', 'log', 'url']), [ 'base_url' => url('/'), 'site_name' => option_localized('site_name'), 'route' => request()->path(), @@ -53,10 +58,6 @@ class AppServiceProvider extends ServiceProvider $this->app->singleton('users', \App\Services\Repositories\UserRepository::class); $this->app->singleton('options', OptionRepository::class); - Blade::if('admin', function (User $user) { - return $user->isAdmin(); - }); - if ($this->app->environment() !== 'production') { $this->app->register(\Barryvdh\LaravelIdeHelper\IdeHelperServiceProvider::class); } diff --git a/app/Providers/PluginServiceProvider.php b/app/Providers/PluginServiceProvider.php index 58657854..eb0f15b2 100644 --- a/app/Providers/PluginServiceProvider.php +++ b/app/Providers/PluginServiceProvider.php @@ -4,6 +4,7 @@ namespace App\Providers; use Event; use App\Events; +use Illuminate\Support\Arr; use Illuminate\Support\Str; use App\Services\PluginManager; use Illuminate\Support\ServiceProvider; @@ -75,7 +76,7 @@ class PluginServiceProvider extends ServiceProvider if (file_exists($filename = $event->plugin->getPath()."/callbacks.php")) { $callbacks = require $filename; - $callback = array_get($callbacks, get_class($event)); + $callback = Arr::get($callbacks, get_class($event)); return $callback ? app()->call($callback, [$event->plugin]) : null; } diff --git a/app/Services/OptionForm.php b/app/Services/OptionForm.php index 2703dfa2..a09306a7 100644 --- a/app/Services/OptionForm.php +++ b/app/Services/OptionForm.php @@ -634,7 +634,7 @@ class OptionFormGroup extends OptionFormItem $rendered[] = view('common.option-form.'.$item['type'])->with([ 'id' => $item['id'], 'value' => $item['value'], - 'placeholder' => array_get($item, 'placeholder') + 'placeholder' => Arr::get($item, 'placeholder') ]); } diff --git a/app/Services/PluginManager.php b/app/Services/PluginManager.php index 9a716724..9a857807 100644 --- a/app/Services/PluginManager.php +++ b/app/Services/PluginManager.php @@ -165,7 +165,7 @@ class PluginManager $plugin->setEnabled(true); - $this->dispatcher->fire(new Events\PluginWasEnabled($plugin)); + $this->dispatcher->dispatch(new Events\PluginWasEnabled($plugin)); } } @@ -191,7 +191,7 @@ class PluginManager $this->enabled = $rejected; $this->saveEnabled(); - $this->dispatcher->fire(new Events\PluginWasDisabled($plugin)); + $this->dispatcher->dispatch(new Events\PluginWasDisabled($plugin)); } } @@ -206,8 +206,8 @@ class PluginManager $this->disable($name); - // fire event before deleting plugin files - $this->dispatcher->fire(new Events\PluginWasDeleted($plugin)); + // dispatch event before deleting plugin files + $this->dispatcher->dispatch(new Events\PluginWasDeleted($plugin)); $this->filesystem->deleteDirectory($plugin->getPath()); diff --git a/app/helpers.php b/app/helpers.php index 7293465c..5a88db59 100644 --- a/app/helpers.php +++ b/app/helpers.php @@ -130,7 +130,7 @@ if (! function_exists('bs_footer_extra')) { { $extraContents = []; - Event::fire(new App\Events\RenderingFooter($extraContents)); + Event::dispatch(new App\Events\RenderingFooter($extraContents)); return implode("\n", $extraContents); } @@ -142,7 +142,7 @@ if (! function_exists('bs_header_extra')) { { $extraContents = []; - Event::fire(new App\Events\RenderingHeader($extraContents)); + Event::dispatch(new App\Events\RenderingHeader($extraContents)); return implode("\n", $extraContents); } @@ -169,7 +169,7 @@ if (! function_exists('bs_menu')) { { $menu = config('menu'); - Event::fire($type == "user" ? new App\Events\ConfigureUserMenu($menu) + Event::dispatch($type == "user" ? new App\Events\ConfigureUserMenu($menu) : new App\Events\ConfigureAdminMenu($menu)); if (! isset($menu[$type])) { @@ -345,57 +345,6 @@ if (! function_exists('option_localized')) { } } -if (! function_exists('menv')) { - /** - * Gets the value of an environment variable by getenv() or $_ENV. - * - * @param string $key - * @param mixed $default - * @return mixed - */ - function menv($key, $default = null) - { - if (function_exists('putenv') && function_exists('getenv')) { - // try to read by getenv() - $value = getenv($key); - - if ($value === false) { - return value($default); - } - } else { - // try to read from $_ENV or $_SERVER - if (isset($_ENV[$key])) { - $value = $_ENV[$key]; - } elseif (isset($_SERVER[$key])) { - $value = $_SERVER[$key]; - } else { - return value($default); - } - } - - switch (strtolower($value)) { - case 'true': - case '(true)': - return true; - case 'false': - case '(false)': - return false; - case 'empty': - case '(empty)': - return ''; - case 'null': - case '(null)': - return; - } - - if (strlen($value) > 1 && Str::startsWith($value, '"') && Str::endsWith($value, '"')) { - return substr($value, 1, -1); - } - - return $value; - } -} - if (! function_exists('validate')) { function validate($value, $type) @@ -476,19 +425,19 @@ if (! function_exists('get_client_ip')) { function get_client_ip() { if (option('ip_get_method') == "0") { // Use `HTTP_X_FORWARDED_FOR` if available first - $ip = array_get( + $ip = Arr::get( $_SERVER, 'HTTP_X_FORWARDED_FOR', // Fallback to `HTTP_CLIENT_IP` - array_get( + Arr::get( $_SERVER, 'HTTP_CLIENT_IP', // Fallback to `REMOTE_ADDR` - array_get($_SERVER, 'REMOTE_ADDR') + Arr::get($_SERVER, 'REMOTE_ADDR') ) ); } else { - $ip = array_get($_SERVER, 'REMOTE_ADDR'); + $ip = Arr::get($_SERVER, 'REMOTE_ADDR'); } return $ip; @@ -524,13 +473,13 @@ if (! function_exists('is_request_secure')) { */ function is_request_secure() { - if (array_get($_SERVER, 'HTTPS') == 'on') + if (Arr::get($_SERVER, 'HTTPS') == 'on') return true; - if (array_get($_SERVER, 'HTTP_X_FORWARDED_PROTO') == 'https') + if (Arr::get($_SERVER, 'HTTP_X_FORWARDED_PROTO') == 'https') return true; - if (array_get($_SERVER, 'HTTP_X_FORWARDED_SSL') == 'on') + if (Arr::get($_SERVER, 'HTTP_X_FORWARDED_SSL') == 'on') return true; return false; diff --git a/composer.json b/composer.json index 84218a37..010f6ece 100644 --- a/composer.json +++ b/composer.json @@ -6,11 +6,10 @@ "php": ">=7.1.3", "filp/whoops": "^2.1", "predis/predis": "~1.0", - "erusev/parsedown": "^1.6", "swiggles/memcache": "^2.0", "doctrine/inflector": "1.1.0", - "laravel/framework": "5.7.*", - "nesbot/carbon": "^1.32.0", + "laravel/framework": "5.8.*", + "nesbot/carbon": "^2.0", "devitek/yaml-translation": "^4.1.0", "composer/semver": "^1.4", "mews/captcha": "^2.2", @@ -23,8 +22,8 @@ "phpunit/phpunit": "~7.0", "laravel/browser-kit-testing": "~4.0", "league/flysystem-memory": "^1.0", - "mikey179/vfsStream": "^1.6.5", - "barryvdh/laravel-ide-helper": "^2.4" + "mikey179/vfsstream": "^1.6.5", + "barryvdh/laravel-ide-helper": "^2.6" }, "autoload": { "classmap": [ diff --git a/composer.lock b/composer.lock index 8034d6a8..5ef1e17b 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": "55442798efbb3e23a014da2b2bae1367", + "content-hash": "5696b59b0b307b4953fcee021d090afc", "packages": [ { "name": "composer/semver", @@ -286,16 +286,16 @@ }, { "name": "egulias/email-validator", - "version": "2.1.5", + "version": "2.1.7", "source": { "type": "git", "url": "https://github.com/egulias/EmailValidator.git", - "reference": "54859fabea8b3beecbb1a282888d5c990036b9e3" + "reference": "709f21f92707308cdf8f9bcfa1af4cb26586521e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/egulias/EmailValidator/zipball/54859fabea8b3beecbb1a282888d5c990036b9e3", - "reference": "54859fabea8b3beecbb1a282888d5c990036b9e3", + "url": "https://api.github.com/repos/egulias/EmailValidator/zipball/709f21f92707308cdf8f9bcfa1af4cb26586521e", + "reference": "709f21f92707308cdf8f9bcfa1af4cb26586521e", "shasum": "" }, "require": { @@ -339,7 +339,7 @@ "validation", "validator" ], - "time": "2018-08-16T20:49:45+00:00" + "time": "2018-12-04T22:38:24+00:00" }, { "name": "erusev/parsedown", @@ -389,16 +389,16 @@ }, { "name": "filp/whoops", - "version": "2.2.0", + "version": "2.3.1", "source": { "type": "git", "url": "https://github.com/filp/whoops.git", - "reference": "181c4502d8f34db7aed7bfe88d4f87875b8e947a" + "reference": "bc0fd11bc455cc20ee4b5edabc63ebbf859324c7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/filp/whoops/zipball/181c4502d8f34db7aed7bfe88d4f87875b8e947a", - "reference": "181c4502d8f34db7aed7bfe88d4f87875b8e947a", + "url": "https://api.github.com/repos/filp/whoops/zipball/bc0fd11bc455cc20ee4b5edabc63ebbf859324c7", + "reference": "bc0fd11bc455cc20ee4b5edabc63ebbf859324c7", "shasum": "" }, "require": { @@ -417,7 +417,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "2.1-dev" + "dev-master": "2.2-dev" } }, "autoload": { @@ -446,7 +446,7 @@ "throwable", "whoops" ], - "time": "2018-03-03T17:56:25+00:00" + "time": "2018-10-23T09:00:00+00:00" }, { "name": "guzzlehttp/guzzle", @@ -566,32 +566,33 @@ }, { "name": "guzzlehttp/psr7", - "version": "1.4.2", + "version": "1.5.2", "source": { "type": "git", "url": "https://github.com/guzzle/psr7.git", - "reference": "f5b8a8512e2b58b0071a7280e39f14f72e05d87c" + "reference": "9f83dded91781a01c63574e387eaa769be769115" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/psr7/zipball/f5b8a8512e2b58b0071a7280e39f14f72e05d87c", - "reference": "f5b8a8512e2b58b0071a7280e39f14f72e05d87c", + "url": "https://api.github.com/repos/guzzle/psr7/zipball/9f83dded91781a01c63574e387eaa769be769115", + "reference": "9f83dded91781a01c63574e387eaa769be769115", "shasum": "" }, "require": { "php": ">=5.4.0", - "psr/http-message": "~1.0" + "psr/http-message": "~1.0", + "ralouphie/getallheaders": "^2.0.5" }, "provide": { "psr/http-message-implementation": "1.0" }, "require-dev": { - "phpunit/phpunit": "~4.0" + "phpunit/phpunit": "~4.8.36 || ^5.7.27 || ^6.5.8" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.4-dev" + "dev-master": "1.5-dev" } }, "autoload": { @@ -621,13 +622,14 @@ "keywords": [ "http", "message", + "psr-7", "request", "response", "stream", "uri", "url" ], - "time": "2017-03-20T17:10:46+00:00" + "time": "2018-12-04T20:46:45+00:00" }, { "name": "intervention/image", @@ -701,45 +703,45 @@ }, { "name": "laravel/framework", - "version": "v5.7.26", + "version": "v5.8.0", "source": { "type": "git", "url": "https://github.com/laravel/framework.git", - "reference": "ca3bc9769969e8af3bd9878a3e0242051c74dae4" + "reference": "e6c8aa0e39d8f91068ad1c299546536e9f25ef63" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/framework/zipball/ca3bc9769969e8af3bd9878a3e0242051c74dae4", - "reference": "ca3bc9769969e8af3bd9878a3e0242051c74dae4", + "url": "https://api.github.com/repos/laravel/framework/zipball/e6c8aa0e39d8f91068ad1c299546536e9f25ef63", + "reference": "e6c8aa0e39d8f91068ad1c299546536e9f25ef63", "shasum": "" }, "require": { "doctrine/inflector": "^1.1", "dragonmantank/cron-expression": "^2.0", + "egulias/email-validator": "^2.0", "erusev/parsedown": "^1.7", + "ext-json": "*", "ext-mbstring": "*", "ext-openssl": "*", - "laravel/nexmo-notification-channel": "^1.0", - "laravel/slack-notification-channel": "^1.0", "league/flysystem": "^1.0.8", "monolog/monolog": "^1.12", - "nesbot/carbon": "^1.26.3", + "nesbot/carbon": "^1.26.3 || ^2.0", "opis/closure": "^3.1", "php": "^7.1.3", "psr/container": "^1.0", "psr/simple-cache": "^1.0", "ramsey/uuid": "^3.7", "swiftmailer/swiftmailer": "^6.0", - "symfony/console": "^4.1", - "symfony/debug": "^4.1", - "symfony/finder": "^4.1", - "symfony/http-foundation": "^4.1", - "symfony/http-kernel": "^4.1", - "symfony/process": "^4.1", - "symfony/routing": "^4.1", - "symfony/var-dumper": "^4.1", + "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", "tijsverkoyen/css-to-inline-styles": "^2.2.1", - "vlucas/phpdotenv": "^2.2" + "vlucas/phpdotenv": "^3.3" }, "conflict": { "tightenco/collect": "<5.5.33" @@ -782,12 +784,12 @@ "league/flysystem-cached-adapter": "^1.0", "mockery/mockery": "^1.0", "moontoast/math": "^1.1", - "orchestra/testbench-core": "3.7.*", - "pda/pheanstalk": "^3.0", - "phpunit/phpunit": "^7.5", + "orchestra/testbench-core": "3.8.*", + "pda/pheanstalk": "^4.0", + "phpunit/phpunit": "^7.5|^8.0", "predis/predis": "^1.1.1", - "symfony/css-selector": "^4.1", - "symfony/dom-crawler": "^4.1", + "symfony/css-selector": "^4.2", + "symfony/dom-crawler": "^4.2", "true/punycode": "^2.1" }, "suggest": { @@ -805,17 +807,18 @@ "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 (^3.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.1).", - "symfony/dom-crawler": "Required to use most of the crawler integration testing tools (^4.1).", - "symfony/psr-http-message-bridge": "Required to psr7 bridging features (^1.0)." + "symfony/css-selector": "Required to use some of the crawler integration testing tools (^4.2).", + "symfony/dom-crawler": "Required to use most of the crawler integration testing tools (^4.2).", + "symfony/psr-http-message-bridge": "Required to use PSR-7 bridging features (^1.1).", + "wildbit/swiftmailer-postmark": "Required to use Postmark mail driver (^3.0)." }, "type": "library", "extra": { "branch-alias": { - "dev-master": "5.7-dev" + "dev-master": "5.8-dev" } }, "autoload": { @@ -843,202 +846,30 @@ "framework", "laravel" ], - "time": "2019-02-12T14:52:21+00:00" - }, - { - "name": "laravel/nexmo-notification-channel", - "version": "v1.0.1", - "source": { - "type": "git", - "url": "https://github.com/laravel/nexmo-notification-channel.git", - "reference": "03edd42a55b306ff980c9950899d5a2b03260d48" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/laravel/nexmo-notification-channel/zipball/03edd42a55b306ff980c9950899d5a2b03260d48", - "reference": "03edd42a55b306ff980c9950899d5a2b03260d48", - "shasum": "" - }, - "require": { - "nexmo/client": "^1.0", - "php": "^7.1.3" - }, - "require-dev": { - "illuminate/notifications": "~5.7", - "mockery/mockery": "^1.0", - "phpunit/phpunit": "^7.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.0-dev" - }, - "laravel": { - "providers": [ - "Illuminate\\Notifications\\NexmoChannelServiceProvider" - ] - } - }, - "autoload": { - "psr-4": { - "Illuminate\\Notifications\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Taylor Otwell", - "email": "taylor@laravel.com" - } - ], - "description": "Nexmo Notification Channel for laravel.", - "keywords": [ - "laravel", - "nexmo", - "notifications" - ], - "time": "2018-12-04T12:57:08+00:00" - }, - { - "name": "laravel/slack-notification-channel", - "version": "v1.0.3", - "source": { - "type": "git", - "url": "https://github.com/laravel/slack-notification-channel.git", - "reference": "6e164293b754a95f246faf50ab2bbea3e4923cc9" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/laravel/slack-notification-channel/zipball/6e164293b754a95f246faf50ab2bbea3e4923cc9", - "reference": "6e164293b754a95f246faf50ab2bbea3e4923cc9", - "shasum": "" - }, - "require": { - "guzzlehttp/guzzle": "^6.0", - "php": "^7.1.3" - }, - "require-dev": { - "illuminate/notifications": "~5.7", - "mockery/mockery": "^1.0", - "phpunit/phpunit": "^7.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.0-dev" - }, - "laravel": { - "providers": [ - "Illuminate\\Notifications\\SlackChannelServiceProvider" - ] - } - }, - "autoload": { - "psr-4": { - "Illuminate\\Notifications\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Taylor Otwell", - "email": "taylor@laravel.com" - } - ], - "description": "Slack Notification Channel for laravel.", - "keywords": [ - "laravel", - "notifications", - "slack" - ], - "time": "2018-12-12T13:12:06+00:00" - }, - { - "name": "lcobucci/jwt", - "version": "3.2.5", - "source": { - "type": "git", - "url": "https://github.com/lcobucci/jwt.git", - "reference": "82be04b4753f8b7693b62852b7eab30f97524f9b" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/lcobucci/jwt/zipball/82be04b4753f8b7693b62852b7eab30f97524f9b", - "reference": "82be04b4753f8b7693b62852b7eab30f97524f9b", - "shasum": "" - }, - "require": { - "ext-openssl": "*", - "php": ">=5.5" - }, - "require-dev": { - "mdanter/ecc": "~0.3.1", - "mikey179/vfsstream": "~1.5", - "phpmd/phpmd": "~2.2", - "phpunit/php-invoker": "~1.1", - "phpunit/phpunit": "~4.5", - "squizlabs/php_codesniffer": "~2.3" - }, - "suggest": { - "mdanter/ecc": "Required to use Elliptic Curves based algorithms." - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "3.1-dev" - } - }, - "autoload": { - "psr-4": { - "Lcobucci\\JWT\\": "src" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Luís Otávio Cobucci Oblonczyk", - "email": "lcobucci@gmail.com", - "role": "Developer" - } - ], - "description": "A simple library to work with JSON Web Token and JSON Web Signature", - "keywords": [ - "JWS", - "jwt" - ], - "time": "2018-11-11T12:22:26+00:00" + "time": "2019-02-26T15:42:06+00:00" }, { "name": "league/flysystem", - "version": "1.0.46", + "version": "1.0.50", "source": { "type": "git", "url": "https://github.com/thephpleague/flysystem.git", - "reference": "f3e0d925c18b92cf3ce84ea5cc58d62a1762a2b2" + "reference": "dab4e7624efa543a943be978008f439c333f2249" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/f3e0d925c18b92cf3ce84ea5cc58d62a1762a2b2", - "reference": "f3e0d925c18b92cf3ce84ea5cc58d62a1762a2b2", + "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/dab4e7624efa543a943be978008f439c333f2249", + "reference": "dab4e7624efa543a943be978008f439c333f2249", "shasum": "" }, "require": { + "ext-fileinfo": "*", "php": ">=5.5.9" }, "conflict": { "league/flysystem-sftp": "<1.0.6" }, "require-dev": { - "ext-fileinfo": "*", "phpspec/phpspec": "^3.4", "phpunit/phpunit": "^5.7.10" }, @@ -1099,20 +930,20 @@ "sftp", "storage" ], - "time": "2018-08-22T07:45:22+00:00" + "time": "2019-02-01T08:50:36+00:00" }, { "name": "mews/captcha", - "version": "2.2.0", + "version": "2.2.5", "source": { "type": "git", "url": "https://github.com/mewebstudio/captcha.git", - "reference": "c9885e31bb2c30fe185c1af6078a53a3bef5db8f" + "reference": "44ed8d66aa6f27443ff51bbf48a5b28cb958d75f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/mewebstudio/captcha/zipball/c9885e31bb2c30fe185c1af6078a53a3bef5db8f", - "reference": "c9885e31bb2c30fe185c1af6078a53a3bef5db8f", + "url": "https://api.github.com/repos/mewebstudio/captcha/zipball/44ed8d66aa6f27443ff51bbf48a5b28cb958d75f", + "reference": "44ed8d66aa6f27443ff51bbf48a5b28cb958d75f", "shasum": "" }, "require": { @@ -1166,20 +997,20 @@ "laravel5 Captcha", "laravel5 Security" ], - "time": "2018-04-25T13:44:49+00:00" + "time": "2019-01-21T08:00:11+00:00" }, { "name": "monolog/monolog", - "version": "1.23.0", + "version": "1.24.0", "source": { "type": "git", "url": "https://github.com/Seldaek/monolog.git", - "reference": "fd8c787753b3a2ad11bc60c063cff1358a32a3b4" + "reference": "bfc9ebb28f97e7a24c45bdc3f0ff482e47bb0266" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Seldaek/monolog/zipball/fd8c787753b3a2ad11bc60c063cff1358a32a3b4", - "reference": "fd8c787753b3a2ad11bc60c063cff1358a32a3b4", + "url": "https://api.github.com/repos/Seldaek/monolog/zipball/bfc9ebb28f97e7a24c45bdc3f0ff482e47bb0266", + "reference": "bfc9ebb28f97e7a24c45bdc3f0ff482e47bb0266", "shasum": "" }, "require": { @@ -1244,32 +1075,34 @@ "logging", "psr-3" ], - "time": "2017-06-19T01:22:40+00:00" + "time": "2018-11-05T09:00:11+00:00" }, { "name": "nesbot/carbon", - "version": "1.36.2", + "version": "2.14.0", "source": { "type": "git", "url": "https://github.com/briannesbitt/Carbon.git", - "reference": "cd324b98bc30290f233dd0e75e6ce49f7ab2a6c9" + "reference": "7a748bc397bd14b8a43b13beca73a8ffec554fd9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/cd324b98bc30290f233dd0e75e6ce49f7ab2a6c9", - "reference": "cd324b98bc30290f233dd0e75e6ce49f7ab2a6c9", + "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/7a748bc397bd14b8a43b13beca73a8ffec554fd9", + "reference": "7a748bc397bd14b8a43b13beca73a8ffec554fd9", "shasum": "" }, "require": { - "php": ">=5.3.9", - "symfony/translation": "~2.6 || ~3.0 || ~4.0" + "ext-json": "*", + "php": "^7.1.8 || ^8.0", + "symfony/translation": "^3.4 || ^4.0" }, "require-dev": { - "phpunit/phpunit": "^4.8.35 || ^5.7" - }, - "suggest": { - "friendsofphp/php-cs-fixer": "Needed for the `composer phpcs` command. Allow to automatically fix code style.", - "phpstan/phpstan": "Needed for the `composer phpstan` command. Allow to detect potential errors." + "friendsofphp/php-cs-fixer": "^2.14 || ^3.0", + "kylekatarnls/multi-tester": "^0.1", + "phpmd/phpmd": "^2.6", + "phpstan/phpstan": "^0.10.8", + "phpunit/phpunit": "^7.5 || ^8.0", + "squizlabs/php_codesniffer": "^3.4" }, "type": "library", "extra": { @@ -1281,7 +1114,7 @@ }, "autoload": { "psr-4": { - "": "src/" + "Carbon\\": "src/Carbon/" } }, "notification-url": "https://packagist.org/downloads/", @@ -1302,68 +1135,20 @@ "datetime", "time" ], - "time": "2018-12-28T10:07:33+00:00" - }, - { - "name": "nexmo/client", - "version": "1.6.2", - "source": { - "type": "git", - "url": "https://github.com/Nexmo/nexmo-php.git", - "reference": "2f79f67f24225ea627ee14578e98c96276cdd4c5" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/Nexmo/nexmo-php/zipball/2f79f67f24225ea627ee14578e98c96276cdd4c5", - "reference": "2f79f67f24225ea627ee14578e98c96276cdd4c5", - "shasum": "" - }, - "require": { - "lcobucci/jwt": "^3.2", - "php": ">=5.6", - "php-http/client-implementation": "^1.0", - "php-http/guzzle6-adapter": "^1.0", - "zendframework/zend-diactoros": "^1.3" - }, - "require-dev": { - "estahn/phpunit-json-assertions": "^1.0.0", - "php-http/mock-client": "^0.3.0", - "phpunit/phpunit": "^5.7", - "squizlabs/php_codesniffer": "^3.1" - }, - "type": "library", - "autoload": { - "psr-4": { - "Nexmo\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Tim Lytle", - "email": "tim@nexmo.com", - "homepage": "http://twitter.com/tjlytle", - "role": "Developer" - } - ], - "description": "PHP Client for using Nexmo's API.", - "time": "2019-02-07T11:14:34+00:00" + "time": "2019-02-25T20:57:37+00:00" }, { "name": "opis/closure", - "version": "3.1.5", + "version": "3.1.6", "source": { "type": "git", "url": "https://github.com/opis/closure.git", - "reference": "41f5da65d75cf473e5ee582df8fc7f2c733ce9d6" + "reference": "ccb8e3928c5c8181c76cdd0ed9366c5bcaafd91b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/opis/closure/zipball/41f5da65d75cf473e5ee582df8fc7f2c733ce9d6", - "reference": "41f5da65d75cf473e5ee582df8fc7f2c733ce9d6", + "url": "https://api.github.com/repos/opis/closure/zipball/ccb8e3928c5c8181c76cdd0ed9366c5bcaafd91b", + "reference": "ccb8e3928c5c8181c76cdd0ed9366c5bcaafd91b", "shasum": "" }, "require": { @@ -1411,7 +1196,7 @@ "serialization", "serialize" ], - "time": "2019-01-14T14:45:33+00:00" + "time": "2019-02-22T10:30:00+00:00" }, { "name": "paragonie/random_compat", @@ -1459,170 +1244,54 @@ "time": "2018-07-02T15:55:56+00:00" }, { - "name": "php-http/guzzle6-adapter", - "version": "v1.1.1", + "name": "phpoption/phpoption", + "version": "1.5.0", "source": { "type": "git", - "url": "https://github.com/php-http/guzzle6-adapter.git", - "reference": "a56941f9dc6110409cfcddc91546ee97039277ab" + "url": "https://github.com/schmittjoh/php-option.git", + "reference": "94e644f7d2051a5f0fcf77d81605f152eecff0ed" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-http/guzzle6-adapter/zipball/a56941f9dc6110409cfcddc91546ee97039277ab", - "reference": "a56941f9dc6110409cfcddc91546ee97039277ab", + "url": "https://api.github.com/repos/schmittjoh/php-option/zipball/94e644f7d2051a5f0fcf77d81605f152eecff0ed", + "reference": "94e644f7d2051a5f0fcf77d81605f152eecff0ed", "shasum": "" }, "require": { - "guzzlehttp/guzzle": "^6.0", - "php": ">=5.5.0", - "php-http/httplug": "^1.0" - }, - "provide": { - "php-http/async-client-implementation": "1.0", - "php-http/client-implementation": "1.0" + "php": ">=5.3.0" }, "require-dev": { - "ext-curl": "*", - "php-http/adapter-integration-tests": "^0.4" + "phpunit/phpunit": "4.7.*" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.2-dev" + "dev-master": "1.3-dev" } }, "autoload": { - "psr-4": { - "Http\\Adapter\\Guzzle6\\": "src/" + "psr-0": { + "PhpOption\\": "src/" } }, "notification-url": "https://packagist.org/downloads/", "license": [ - "MIT" + "Apache2" ], "authors": [ { - "name": "Márk Sági-Kazár", - "email": "mark.sagikazar@gmail.com" - }, - { - "name": "David de Boer", - "email": "david@ddeboer.nl" + "name": "Johannes M. Schmitt", + "email": "schmittjoh@gmail.com" } ], - "description": "Guzzle 6 HTTP Adapter", - "homepage": "http://httplug.io", + "description": "Option Type for PHP", "keywords": [ - "Guzzle", - "http" + "language", + "option", + "php", + "type" ], - "time": "2016-05-10T06:13:32+00:00" - }, - { - "name": "php-http/httplug", - "version": "v1.1.0", - "source": { - "type": "git", - "url": "https://github.com/php-http/httplug.git", - "reference": "1c6381726c18579c4ca2ef1ec1498fdae8bdf018" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/php-http/httplug/zipball/1c6381726c18579c4ca2ef1ec1498fdae8bdf018", - "reference": "1c6381726c18579c4ca2ef1ec1498fdae8bdf018", - "shasum": "" - }, - "require": { - "php": ">=5.4", - "php-http/promise": "^1.0", - "psr/http-message": "^1.0" - }, - "require-dev": { - "henrikbjorn/phpspec-code-coverage": "^1.0", - "phpspec/phpspec": "^2.4" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.1-dev" - } - }, - "autoload": { - "psr-4": { - "Http\\Client\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Eric GELOEN", - "email": "geloen.eric@gmail.com" - }, - { - "name": "Márk Sági-Kazár", - "email": "mark.sagikazar@gmail.com" - } - ], - "description": "HTTPlug, the HTTP client abstraction for PHP", - "homepage": "http://httplug.io", - "keywords": [ - "client", - "http" - ], - "time": "2016-08-31T08:30:17+00:00" - }, - { - "name": "php-http/promise", - "version": "v1.0.0", - "source": { - "type": "git", - "url": "https://github.com/php-http/promise.git", - "reference": "dc494cdc9d7160b9a09bd5573272195242ce7980" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/php-http/promise/zipball/dc494cdc9d7160b9a09bd5573272195242ce7980", - "reference": "dc494cdc9d7160b9a09bd5573272195242ce7980", - "shasum": "" - }, - "require-dev": { - "henrikbjorn/phpspec-code-coverage": "^1.0", - "phpspec/phpspec": "^2.4" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.1-dev" - } - }, - "autoload": { - "psr-4": { - "Http\\Promise\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Márk Sági-Kazár", - "email": "mark.sagikazar@gmail.com" - }, - { - "name": "Joel Wurtz", - "email": "joel.wurtz@gmail.com" - } - ], - "description": "Promise used for asynchronous HTTP requests", - "homepage": "http://httplug.io", - "keywords": [ - "promise" - ], - "time": "2016-01-26T13:27:02+00:00" + "time": "2015-07-25T16:39:46+00:00" }, { "name": "predis/predis", @@ -1775,16 +1444,16 @@ }, { "name": "psr/log", - "version": "1.0.2", + "version": "1.1.0", "source": { "type": "git", "url": "https://github.com/php-fig/log.git", - "reference": "4ebe3a8bf773a19edfe0a84b6585ba3d401b724d" + "reference": "6c001f1daafa3a3ac1d8ff69ee4db8e799a654dd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/log/zipball/4ebe3a8bf773a19edfe0a84b6585ba3d401b724d", - "reference": "4ebe3a8bf773a19edfe0a84b6585ba3d401b724d", + "url": "https://api.github.com/repos/php-fig/log/zipball/6c001f1daafa3a3ac1d8ff69ee4db8e799a654dd", + "reference": "6c001f1daafa3a3ac1d8ff69ee4db8e799a654dd", "shasum": "" }, "require": { @@ -1818,7 +1487,7 @@ "psr", "psr-3" ], - "time": "2016-10-10T12:19:37+00:00" + "time": "2018-11-20T15:27:04+00:00" }, { "name": "psr/simple-cache", @@ -1868,6 +1537,46 @@ ], "time": "2017-10-23T01:57:42+00:00" }, + { + "name": "ralouphie/getallheaders", + "version": "2.0.5", + "source": { + "type": "git", + "url": "https://github.com/ralouphie/getallheaders.git", + "reference": "5601c8a83fbba7ef674a7369456d12f1e0d0eafa" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/ralouphie/getallheaders/zipball/5601c8a83fbba7ef674a7369456d12f1e0d0eafa", + "reference": "5601c8a83fbba7ef674a7369456d12f1e0d0eafa", + "shasum": "" + }, + "require": { + "php": ">=5.3" + }, + "require-dev": { + "phpunit/phpunit": "~3.7.0", + "satooshi/php-coveralls": ">=1.0" + }, + "type": "library", + "autoload": { + "files": [ + "src/getallheaders.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Ralph Khattar", + "email": "ralph.khattar@gmail.com" + } + ], + "description": "A polyfill for getallheaders.", + "time": "2016-02-11T07:05:27+00:00" + }, { "name": "ramsey/uuid", "version": "3.8.0", @@ -1952,16 +1661,16 @@ }, { "name": "swiftmailer/swiftmailer", - "version": "v6.1.2", + "version": "v6.1.3", "source": { "type": "git", "url": "https://github.com/swiftmailer/swiftmailer.git", - "reference": "7d760881d266d63c5e7a1155cbcf2ac656a31ca8" + "reference": "8ddcb66ac10c392d3beb54829eef8ac1438595f4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/swiftmailer/swiftmailer/zipball/7d760881d266d63c5e7a1155cbcf2ac656a31ca8", - "reference": "7d760881d266d63c5e7a1155cbcf2ac656a31ca8", + "url": "https://api.github.com/repos/swiftmailer/swiftmailer/zipball/8ddcb66ac10c392d3beb54829eef8ac1438595f4", + "reference": "8ddcb66ac10c392d3beb54829eef8ac1438595f4", "shasum": "" }, "require": { @@ -2007,7 +1716,7 @@ "mail", "mailer" ], - "time": "2018-07-13T07:04:35+00:00" + "time": "2018-09-11T07:12:52+00:00" }, { "name": "swiggles/memcache", @@ -2062,26 +1771,30 @@ }, { "name": "symfony/console", - "version": "v4.1.4", + "version": "v4.2.3", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "ca80b8ced97cf07390078b29773dc384c39eee1f" + "reference": "1f0ad51dfde4da8a6070f06adc58b4e37cbb37a4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/ca80b8ced97cf07390078b29773dc384c39eee1f", - "reference": "ca80b8ced97cf07390078b29773dc384c39eee1f", + "url": "https://api.github.com/repos/symfony/console/zipball/1f0ad51dfde4da8a6070f06adc58b4e37cbb37a4", + "reference": "1f0ad51dfde4da8a6070f06adc58b4e37cbb37a4", "shasum": "" }, "require": { "php": "^7.1.3", + "symfony/contracts": "^1.0", "symfony/polyfill-mbstring": "~1.0" }, "conflict": { "symfony/dependency-injection": "<3.4", "symfony/process": "<3.3" }, + "provide": { + "psr/log-implementation": "1.0" + }, "require-dev": { "psr/log": "~1.0", "symfony/config": "~3.4|~4.0", @@ -2091,7 +1804,7 @@ "symfony/process": "~3.4|~4.0" }, "suggest": { - "psr/log-implementation": "For using the console logger", + "psr/log": "For using the console logger", "symfony/event-dispatcher": "", "symfony/lock": "", "symfony/process": "" @@ -2099,7 +1812,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "4.1-dev" + "dev-master": "4.2-dev" } }, "autoload": { @@ -2126,20 +1839,88 @@ ], "description": "Symfony Console Component", "homepage": "https://symfony.com", - "time": "2018-07-26T11:24:31+00:00" + "time": "2019-01-25T14:35:16+00:00" }, { - "name": "symfony/css-selector", - "version": "v4.1.4", + "name": "symfony/contracts", + "version": "v1.0.2", "source": { "type": "git", - "url": "https://github.com/symfony/css-selector.git", - "reference": "2a4df7618f869b456f9096781e78c57b509d76c7" + "url": "https://github.com/symfony/contracts.git", + "reference": "1aa7ab2429c3d594dd70689604b5cf7421254cdf" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/css-selector/zipball/2a4df7618f869b456f9096781e78c57b509d76c7", - "reference": "2a4df7618f869b456f9096781e78c57b509d76c7", + "url": "https://api.github.com/repos/symfony/contracts/zipball/1aa7ab2429c3d594dd70689604b5cf7421254cdf", + "reference": "1aa7ab2429c3d594dd70689604b5cf7421254cdf", + "shasum": "" + }, + "require": { + "php": "^7.1.3" + }, + "require-dev": { + "psr/cache": "^1.0", + "psr/container": "^1.0" + }, + "suggest": { + "psr/cache": "When using the Cache contracts", + "psr/container": "When using the Service contracts", + "symfony/cache-contracts-implementation": "", + "symfony/service-contracts-implementation": "", + "symfony/translation-contracts-implementation": "" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0-dev" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Contracts\\": "" + }, + "exclude-from-classmap": [ + "**/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "A set of abstractions extracted out of the Symfony components", + "homepage": "https://symfony.com", + "keywords": [ + "abstractions", + "contracts", + "decoupling", + "interfaces", + "interoperability", + "standards" + ], + "time": "2018-12-05T08:06:11+00:00" + }, + { + "name": "symfony/css-selector", + "version": "v4.2.3", + "source": { + "type": "git", + "url": "https://github.com/symfony/css-selector.git", + "reference": "48eddf66950fa57996e1be4a55916d65c10c604a" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/css-selector/zipball/48eddf66950fa57996e1be4a55916d65c10c604a", + "reference": "48eddf66950fa57996e1be4a55916d65c10c604a", "shasum": "" }, "require": { @@ -2148,7 +1929,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "4.1-dev" + "dev-master": "4.2-dev" } }, "autoload": { @@ -2179,20 +1960,20 @@ ], "description": "Symfony CssSelector Component", "homepage": "https://symfony.com", - "time": "2018-07-26T09:10:45+00:00" + "time": "2019-01-16T20:31:39+00:00" }, { "name": "symfony/debug", - "version": "v4.1.4", + "version": "v4.2.3", "source": { "type": "git", "url": "https://github.com/symfony/debug.git", - "reference": "47ead688f1f2877f3f14219670f52e4722ee7052" + "reference": "cf9b2e33f757deb884ce474e06d2647c1c769b65" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/debug/zipball/47ead688f1f2877f3f14219670f52e4722ee7052", - "reference": "47ead688f1f2877f3f14219670f52e4722ee7052", + "url": "https://api.github.com/repos/symfony/debug/zipball/cf9b2e33f757deb884ce474e06d2647c1c769b65", + "reference": "cf9b2e33f757deb884ce474e06d2647c1c769b65", "shasum": "" }, "require": { @@ -2208,7 +1989,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "4.1-dev" + "dev-master": "4.2-dev" } }, "autoload": { @@ -2235,24 +2016,25 @@ ], "description": "Symfony Debug Component", "homepage": "https://symfony.com", - "time": "2018-08-03T11:13:38+00:00" + "time": "2019-01-25T14:35:16+00:00" }, { "name": "symfony/event-dispatcher", - "version": "v4.1.4", + "version": "v4.2.3", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher.git", - "reference": "bfb30c2ad377615a463ebbc875eba64a99f6aa3e" + "reference": "bd09ad265cd50b2b9d09d65ce6aba2d29bc81fe1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/bfb30c2ad377615a463ebbc875eba64a99f6aa3e", - "reference": "bfb30c2ad377615a463ebbc875eba64a99f6aa3e", + "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/bd09ad265cd50b2b9d09d65ce6aba2d29bc81fe1", + "reference": "bd09ad265cd50b2b9d09d65ce6aba2d29bc81fe1", "shasum": "" }, "require": { - "php": "^7.1.3" + "php": "^7.1.3", + "symfony/contracts": "^1.0" }, "conflict": { "symfony/dependency-injection": "<3.4" @@ -2271,7 +2053,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "4.1-dev" + "dev-master": "4.2-dev" } }, "autoload": { @@ -2298,20 +2080,20 @@ ], "description": "Symfony EventDispatcher Component", "homepage": "https://symfony.com", - "time": "2018-07-26T09:10:45+00:00" + "time": "2019-01-16T20:35:37+00:00" }, { "name": "symfony/finder", - "version": "v4.1.4", + "version": "v4.2.3", "source": { "type": "git", "url": "https://github.com/symfony/finder.git", - "reference": "e162f1df3102d0b7472805a5a9d5db9fcf0a8068" + "reference": "ef71816cbb264988bb57fe6a73f610888b9aa70c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/finder/zipball/e162f1df3102d0b7472805a5a9d5db9fcf0a8068", - "reference": "e162f1df3102d0b7472805a5a9d5db9fcf0a8068", + "url": "https://api.github.com/repos/symfony/finder/zipball/ef71816cbb264988bb57fe6a73f610888b9aa70c", + "reference": "ef71816cbb264988bb57fe6a73f610888b9aa70c", "shasum": "" }, "require": { @@ -2320,7 +2102,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "4.1-dev" + "dev-master": "4.2-dev" } }, "autoload": { @@ -2347,20 +2129,20 @@ ], "description": "Symfony Finder Component", "homepage": "https://symfony.com", - "time": "2018-07-26T11:24:31+00:00" + "time": "2019-01-16T20:35:37+00:00" }, { "name": "symfony/http-foundation", - "version": "v4.1.4", + "version": "v4.2.3", "source": { "type": "git", "url": "https://github.com/symfony/http-foundation.git", - "reference": "3a5c91e133b220bb882b3cd773ba91bf39989345" + "reference": "8d2318b73e0a1bc75baa699d00ebe2ae8b595a39" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-foundation/zipball/3a5c91e133b220bb882b3cd773ba91bf39989345", - "reference": "3a5c91e133b220bb882b3cd773ba91bf39989345", + "url": "https://api.github.com/repos/symfony/http-foundation/zipball/8d2318b73e0a1bc75baa699d00ebe2ae8b595a39", + "reference": "8d2318b73e0a1bc75baa699d00ebe2ae8b595a39", "shasum": "" }, "require": { @@ -2374,7 +2156,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "4.1-dev" + "dev-master": "4.2-dev" } }, "autoload": { @@ -2401,25 +2183,26 @@ ], "description": "Symfony HttpFoundation Component", "homepage": "https://symfony.com", - "time": "2018-08-27T17:47:02+00:00" + "time": "2019-01-29T09:49:29+00:00" }, { "name": "symfony/http-kernel", - "version": "v4.1.4", + "version": "v4.2.3", "source": { "type": "git", "url": "https://github.com/symfony/http-kernel.git", - "reference": "33de0a1ff2e1720096189e3ced682d7a4e8f5e35" + "reference": "d56b1706abaa771eb6acd894c6787cb88f1dc97d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-kernel/zipball/33de0a1ff2e1720096189e3ced682d7a4e8f5e35", - "reference": "33de0a1ff2e1720096189e3ced682d7a4e8f5e35", + "url": "https://api.github.com/repos/symfony/http-kernel/zipball/d56b1706abaa771eb6acd894c6787cb88f1dc97d", + "reference": "d56b1706abaa771eb6acd894c6787cb88f1dc97d", "shasum": "" }, "require": { "php": "^7.1.3", "psr/log": "~1.0", + "symfony/contracts": "^1.0.2", "symfony/debug": "~3.4|~4.0", "symfony/event-dispatcher": "~4.1", "symfony/http-foundation": "^4.1.1", @@ -2427,7 +2210,8 @@ }, "conflict": { "symfony/config": "<3.4", - "symfony/dependency-injection": "<4.1", + "symfony/dependency-injection": "<4.2", + "symfony/translation": "<4.2", "symfony/var-dumper": "<4.1.1", "twig/twig": "<1.34|<2.4,>=2" }, @@ -2440,7 +2224,7 @@ "symfony/config": "~3.4|~4.0", "symfony/console": "~3.4|~4.0", "symfony/css-selector": "~3.4|~4.0", - "symfony/dependency-injection": "^4.1", + "symfony/dependency-injection": "^4.2", "symfony/dom-crawler": "~3.4|~4.0", "symfony/expression-language": "~3.4|~4.0", "symfony/finder": "~3.4|~4.0", @@ -2448,7 +2232,7 @@ "symfony/routing": "~3.4|~4.0", "symfony/stopwatch": "~3.4|~4.0", "symfony/templating": "~3.4|~4.0", - "symfony/translation": "~3.4|~4.0", + "symfony/translation": "~4.2", "symfony/var-dumper": "^4.1.1" }, "suggest": { @@ -2461,7 +2245,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "4.1-dev" + "dev-master": "4.2-dev" } }, "autoload": { @@ -2488,11 +2272,11 @@ ], "description": "Symfony HttpKernel Component", "homepage": "https://symfony.com", - "time": "2018-08-28T06:17:42+00:00" + "time": "2019-02-03T12:47:33+00:00" }, { "name": "symfony/polyfill-ctype", - "version": "v1.9.0", + "version": "v1.10.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-ctype.git", @@ -2550,16 +2334,16 @@ }, { "name": "symfony/polyfill-mbstring", - "version": "v1.9.0", + "version": "v1.10.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-mbstring.git", - "reference": "d0cd638f4634c16d8df4508e847f14e9e43168b8" + "reference": "c79c051f5b3a46be09205c73b80b346e4153e494" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/d0cd638f4634c16d8df4508e847f14e9e43168b8", - "reference": "d0cd638f4634c16d8df4508e847f14e9e43168b8", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/c79c051f5b3a46be09205c73b80b346e4153e494", + "reference": "c79c051f5b3a46be09205c73b80b346e4153e494", "shasum": "" }, "require": { @@ -2605,20 +2389,20 @@ "portable", "shim" ], - "time": "2018-08-06T14:22:27+00:00" + "time": "2018-09-21T13:07:52+00:00" }, { "name": "symfony/polyfill-php72", - "version": "v1.9.0", + "version": "v1.10.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php72.git", - "reference": "95c50420b0baed23852452a7f0c7b527303ed5ae" + "reference": "9050816e2ca34a8e916c3a0ae8b9c2fccf68b631" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/95c50420b0baed23852452a7f0c7b527303ed5ae", - "reference": "95c50420b0baed23852452a7f0c7b527303ed5ae", + "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/9050816e2ca34a8e916c3a0ae8b9c2fccf68b631", + "reference": "9050816e2ca34a8e916c3a0ae8b9c2fccf68b631", "shasum": "" }, "require": { @@ -2660,20 +2444,20 @@ "portable", "shim" ], - "time": "2018-08-06T14:22:27+00:00" + "time": "2018-09-21T13:07:52+00:00" }, { "name": "symfony/process", - "version": "v4.1.4", + "version": "v4.2.3", "source": { "type": "git", "url": "https://github.com/symfony/process.git", - "reference": "86cdb930a6a855b0ab35fb60c1504cb36184f843" + "reference": "6c05edb11fbeff9e2b324b4270ecb17911a8b7ad" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/process/zipball/86cdb930a6a855b0ab35fb60c1504cb36184f843", - "reference": "86cdb930a6a855b0ab35fb60c1504cb36184f843", + "url": "https://api.github.com/repos/symfony/process/zipball/6c05edb11fbeff9e2b324b4270ecb17911a8b7ad", + "reference": "6c05edb11fbeff9e2b324b4270ecb17911a8b7ad", "shasum": "" }, "require": { @@ -2682,7 +2466,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "4.1-dev" + "dev-master": "4.2-dev" } }, "autoload": { @@ -2709,34 +2493,34 @@ ], "description": "Symfony Process Component", "homepage": "https://symfony.com", - "time": "2018-08-03T11:13:38+00:00" + "time": "2019-01-24T22:05:03+00:00" }, { "name": "symfony/routing", - "version": "v4.1.4", + "version": "v4.2.3", "source": { "type": "git", "url": "https://github.com/symfony/routing.git", - "reference": "a5784c2ec4168018c87b38f0e4f39d2278499f51" + "reference": "7f8e44fc498972466f0841c3e48dc555f23bdf53" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/routing/zipball/a5784c2ec4168018c87b38f0e4f39d2278499f51", - "reference": "a5784c2ec4168018c87b38f0e4f39d2278499f51", + "url": "https://api.github.com/repos/symfony/routing/zipball/7f8e44fc498972466f0841c3e48dc555f23bdf53", + "reference": "7f8e44fc498972466f0841c3e48dc555f23bdf53", "shasum": "" }, "require": { "php": "^7.1.3" }, "conflict": { - "symfony/config": "<3.4", + "symfony/config": "<4.2", "symfony/dependency-injection": "<3.4", "symfony/yaml": "<3.4" }, "require-dev": { "doctrine/annotations": "~1.0", "psr/log": "~1.0", - "symfony/config": "~3.4|~4.0", + "symfony/config": "~4.2", "symfony/dependency-injection": "~3.4|~4.0", "symfony/expression-language": "~3.4|~4.0", "symfony/http-foundation": "~3.4|~4.0", @@ -2753,7 +2537,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "4.1-dev" + "dev-master": "4.2-dev" } }, "autoload": { @@ -2786,24 +2570,25 @@ "uri", "url" ], - "time": "2018-08-03T07:58:40+00:00" + "time": "2019-01-29T09:49:29+00:00" }, { "name": "symfony/translation", - "version": "v4.1.4", + "version": "v4.2.3", "source": { "type": "git", "url": "https://github.com/symfony/translation.git", - "reference": "fa2182669f7983b7aa5f1a770d053f79f0ef144f" + "reference": "23fd7aac70d99a17a8e6473a41fec8fab3331050" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/translation/zipball/fa2182669f7983b7aa5f1a770d053f79f0ef144f", - "reference": "fa2182669f7983b7aa5f1a770d053f79f0ef144f", + "url": "https://api.github.com/repos/symfony/translation/zipball/23fd7aac70d99a17a8e6473a41fec8fab3331050", + "reference": "23fd7aac70d99a17a8e6473a41fec8fab3331050", "shasum": "" }, "require": { "php": "^7.1.3", + "symfony/contracts": "^1.0.2", "symfony/polyfill-mbstring": "~1.0" }, "conflict": { @@ -2811,6 +2596,9 @@ "symfony/dependency-injection": "<3.4", "symfony/yaml": "<3.4" }, + "provide": { + "symfony/translation-contracts-implementation": "1.0" + }, "require-dev": { "psr/log": "~1.0", "symfony/config": "~3.4|~4.0", @@ -2828,7 +2616,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "4.1-dev" + "dev-master": "4.2-dev" } }, "autoload": { @@ -2855,20 +2643,20 @@ ], "description": "Symfony Translation Component", "homepage": "https://symfony.com", - "time": "2018-08-07T12:45:11+00:00" + "time": "2019-01-27T23:11:39+00:00" }, { "name": "symfony/var-dumper", - "version": "v4.1.4", + "version": "v4.2.3", "source": { "type": "git", "url": "https://github.com/symfony/var-dumper.git", - "reference": "a05426e27294bba7b0226ffc17dd01a3c6ef9777" + "reference": "223bda89f9be41cf7033eeaf11bc61a280489c17" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/var-dumper/zipball/a05426e27294bba7b0226ffc17dd01a3c6ef9777", - "reference": "a05426e27294bba7b0226ffc17dd01a3c6ef9777", + "url": "https://api.github.com/repos/symfony/var-dumper/zipball/223bda89f9be41cf7033eeaf11bc61a280489c17", + "reference": "223bda89f9be41cf7033eeaf11bc61a280489c17", "shasum": "" }, "require": { @@ -2882,6 +2670,7 @@ }, "require-dev": { "ext-iconv": "*", + "symfony/console": "~3.4|~4.0", "symfony/process": "~3.4|~4.0", "twig/twig": "~1.34|~2.4" }, @@ -2896,7 +2685,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "4.1-dev" + "dev-master": "4.2-dev" } }, "autoload": { @@ -2930,20 +2719,20 @@ "debug", "dump" ], - "time": "2018-08-02T09:24:26+00:00" + "time": "2019-01-30T11:44:30+00:00" }, { "name": "symfony/yaml", - "version": "v3.4.15", + "version": "v3.4.22", "source": { "type": "git", "url": "https://github.com/symfony/yaml.git", - "reference": "c2f4812ead9f847cb69e90917ca7502e6892d6b8" + "reference": "ba11776e9e6c15ad5759a07bffb15899bac75c2d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/yaml/zipball/c2f4812ead9f847cb69e90917ca7502e6892d6b8", - "reference": "c2f4812ead9f847cb69e90917ca7502e6892d6b8", + "url": "https://api.github.com/repos/symfony/yaml/zipball/ba11776e9e6c15ad5759a07bffb15899bac75c2d", + "reference": "ba11776e9e6c15ad5759a07bffb15899bac75c2d", "shasum": "" }, "require": { @@ -2989,7 +2778,7 @@ ], "description": "Symfony Yaml Component", "homepage": "https://symfony.com", - "time": "2018-08-10T07:34:36+00:00" + "time": "2019-01-16T10:59:17+00:00" }, { "name": "tijsverkoyen/css-to-inline-styles", @@ -3040,28 +2829,30 @@ }, { "name": "vlucas/phpdotenv", - "version": "v2.5.1", + "version": "v3.3.2", "source": { "type": "git", "url": "https://github.com/vlucas/phpdotenv.git", - "reference": "8abb4f9aa89ddea9d52112c65bbe8d0125e2fa8e" + "reference": "1ee9369cfbf26cfcf1f2515d98f15fab54e9647a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/vlucas/phpdotenv/zipball/8abb4f9aa89ddea9d52112c65bbe8d0125e2fa8e", - "reference": "8abb4f9aa89ddea9d52112c65bbe8d0125e2fa8e", + "url": "https://api.github.com/repos/vlucas/phpdotenv/zipball/1ee9369cfbf26cfcf1f2515d98f15fab54e9647a", + "reference": "1ee9369cfbf26cfcf1f2515d98f15fab54e9647a", "shasum": "" }, "require": { - "php": ">=5.3.9" + "php": "^5.4 || ^7.0", + "phpoption/phpoption": "^1.5", + "symfony/polyfill-ctype": "^1.9" }, "require-dev": { - "phpunit/phpunit": "^4.8.35 || ^5.0" + "phpunit/phpunit": "^4.8.35 || ^5.0 || ^6.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.5-dev" + "dev-master": "3.3-dev" } }, "autoload": { @@ -3086,100 +2877,36 @@ "env", "environment" ], - "time": "2018-07-29T20:33:41+00:00" - }, - { - "name": "zendframework/zend-diactoros", - "version": "1.8.6", - "source": { - "type": "git", - "url": "https://github.com/zendframework/zend-diactoros.git", - "reference": "20da13beba0dde8fb648be3cc19765732790f46e" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/zendframework/zend-diactoros/zipball/20da13beba0dde8fb648be3cc19765732790f46e", - "reference": "20da13beba0dde8fb648be3cc19765732790f46e", - "shasum": "" - }, - "require": { - "php": "^5.6 || ^7.0", - "psr/http-message": "^1.0" - }, - "provide": { - "psr/http-message-implementation": "1.0" - }, - "require-dev": { - "ext-dom": "*", - "ext-libxml": "*", - "php-http/psr7-integration-tests": "dev-master", - "phpunit/phpunit": "^5.7.16 || ^6.0.8 || ^7.2.7", - "zendframework/zend-coding-standard": "~1.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.8.x-dev", - "dev-develop": "1.9.x-dev", - "dev-release-2.0": "2.0.x-dev" - } - }, - "autoload": { - "files": [ - "src/functions/create_uploaded_file.php", - "src/functions/marshal_headers_from_sapi.php", - "src/functions/marshal_method_from_sapi.php", - "src/functions/marshal_protocol_version_from_sapi.php", - "src/functions/marshal_uri_from_sapi.php", - "src/functions/normalize_server.php", - "src/functions/normalize_uploaded_files.php", - "src/functions/parse_cookie_header.php" - ], - "psr-4": { - "Zend\\Diactoros\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-2-Clause" - ], - "description": "PSR HTTP Message implementations", - "homepage": "https://github.com/zendframework/zend-diactoros", - "keywords": [ - "http", - "psr", - "psr-7" - ], - "time": "2018-09-05T19:29:37+00:00" + "time": "2019-01-30T10:43:17+00:00" } ], "packages-dev": [ { "name": "barryvdh/laravel-ide-helper", - "version": "v2.5.0", + "version": "v2.6.0", "source": { "type": "git", "url": "https://github.com/barryvdh/laravel-ide-helper.git", - "reference": "09db8c9a76711e98c61af0795934fb15955223fb" + "reference": "754bb4d075d7fb2b23b1a416802c0e45884df495" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/barryvdh/laravel-ide-helper/zipball/09db8c9a76711e98c61af0795934fb15955223fb", - "reference": "09db8c9a76711e98c61af0795934fb15955223fb", + "url": "https://api.github.com/repos/barryvdh/laravel-ide-helper/zipball/754bb4d075d7fb2b23b1a416802c0e45884df495", + "reference": "754bb4d075d7fb2b23b1a416802c0e45884df495", "shasum": "" }, "require": { - "barryvdh/reflection-docblock": "^2.0.4", + "barryvdh/reflection-docblock": "^2.0.6", "composer/composer": "^1.6", - "illuminate/console": "^5.5,<5.8", - "illuminate/filesystem": "^5.5,<5.8", - "illuminate/support": "^5.5,<5.8", + "illuminate/console": "^5.5,<5.9", + "illuminate/filesystem": "^5.5,<5.9", + "illuminate/support": "^5.5,<5.9", "php": ">=7" }, "require-dev": { "doctrine/dbal": "~2.3", - "illuminate/config": "^5.1,<5.8", - "illuminate/view": "^5.1,<5.8", + "illuminate/config": "^5.1,<5.9", + "illuminate/view": "^5.1,<5.9", "phpro/grumphp": "^0.14", "phpunit/phpunit": "4.*", "scrutinizer/ocular": "~1.1", @@ -3191,7 +2918,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "2.5-dev" + "dev-master": "2.6-dev" }, "laravel": { "providers": [ @@ -3226,20 +2953,20 @@ "phpstorm", "sublime" ], - "time": "2018-08-31T13:28:09+00:00" + "time": "2019-02-18T19:54:27+00:00" }, { "name": "barryvdh/reflection-docblock", - "version": "v2.0.4", + "version": "v2.0.6", "source": { "type": "git", "url": "https://github.com/barryvdh/ReflectionDocBlock.git", - "reference": "3dcbd98b5d9384a5357266efba8fd29884458e5c" + "reference": "6b69015d83d3daf9004a71a89f26e27d27ef6a16" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/barryvdh/ReflectionDocBlock/zipball/3dcbd98b5d9384a5357266efba8fd29884458e5c", - "reference": "3dcbd98b5d9384a5357266efba8fd29884458e5c", + "url": "https://api.github.com/repos/barryvdh/ReflectionDocBlock/zipball/6b69015d83d3daf9004a71a89f26e27d27ef6a16", + "reference": "6b69015d83d3daf9004a71a89f26e27d27ef6a16", "shasum": "" }, "require": { @@ -3275,20 +3002,20 @@ "email": "mike.vanriel@naenius.com" } ], - "time": "2016-06-13T19:28:20+00:00" + "time": "2018-12-13T10:34:14+00:00" }, { "name": "composer/ca-bundle", - "version": "1.1.2", + "version": "1.1.4", "source": { "type": "git", "url": "https://github.com/composer/ca-bundle.git", - "reference": "46afded9720f40b9dc63542af4e3e43a1177acb0" + "reference": "558f321c52faeb4828c03e7dc0cfe39a09e09a2d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/ca-bundle/zipball/46afded9720f40b9dc63542af4e3e43a1177acb0", - "reference": "46afded9720f40b9dc63542af4e3e43a1177acb0", + "url": "https://api.github.com/repos/composer/ca-bundle/zipball/558f321c52faeb4828c03e7dc0cfe39a09e09a2d", + "reference": "558f321c52faeb4828c03e7dc0cfe39a09e09a2d", "shasum": "" }, "require": { @@ -3331,20 +3058,20 @@ "ssl", "tls" ], - "time": "2018-08-08T08:57:40+00:00" + "time": "2019-01-28T09:30:10+00:00" }, { "name": "composer/composer", - "version": "1.7.2", + "version": "1.8.4", "source": { "type": "git", "url": "https://github.com/composer/composer.git", - "reference": "576aab9b5abb2ed11a1c52353a759363216a4ad2" + "reference": "bc364c2480c17941e2135cfc568fa41794392534" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/composer/zipball/576aab9b5abb2ed11a1c52353a759363216a4ad2", - "reference": "576aab9b5abb2ed11a1c52353a759363216a4ad2", + "url": "https://api.github.com/repos/composer/composer/zipball/bc364c2480c17941e2135cfc568fa41794392534", + "reference": "bc364c2480c17941e2135cfc568fa41794392534", "shasum": "" }, "require": { @@ -3380,7 +3107,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.7-dev" + "dev-master": "1.8-dev" } }, "autoload": { @@ -3411,20 +3138,20 @@ "dependency", "package" ], - "time": "2018-08-16T14:57:12+00:00" + "time": "2019-02-11T09:52:10+00:00" }, { "name": "composer/spdx-licenses", - "version": "1.4.0", + "version": "1.5.0", "source": { "type": "git", "url": "https://github.com/composer/spdx-licenses.git", - "reference": "cb17687e9f936acd7e7245ad3890f953770dec1b" + "reference": "7a9556b22bd9d4df7cad89876b00af58ef20d3a2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/spdx-licenses/zipball/cb17687e9f936acd7e7245ad3890f953770dec1b", - "reference": "cb17687e9f936acd7e7245ad3890f953770dec1b", + "url": "https://api.github.com/repos/composer/spdx-licenses/zipball/7a9556b22bd9d4df7cad89876b00af58ef20d3a2", + "reference": "7a9556b22bd9d4df7cad89876b00af58ef20d3a2", "shasum": "" }, "require": { @@ -3472,20 +3199,20 @@ "spdx", "validator" ], - "time": "2018-04-30T10:33:04+00:00" + "time": "2018-11-01T09:45:54+00:00" }, { "name": "composer/xdebug-handler", - "version": "1.3.0", + "version": "1.3.2", "source": { "type": "git", "url": "https://github.com/composer/xdebug-handler.git", - "reference": "b8e9745fb9b06ea6664d8872c4505fb16df4611c" + "reference": "d17708133b6c276d6e42ef887a877866b909d892" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/b8e9745fb9b06ea6664d8872c4505fb16df4611c", - "reference": "b8e9745fb9b06ea6664d8872c4505fb16df4611c", + "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/d17708133b6c276d6e42ef887a877866b909d892", + "reference": "d17708133b6c276d6e42ef887a877866b909d892", "shasum": "" }, "require": { @@ -3516,7 +3243,7 @@ "Xdebug", "performance" ], - "time": "2018-08-31T19:07:57+00:00" + "time": "2019-01-28T20:25:53+00:00" }, { "name": "doctrine/instantiator", @@ -3672,23 +3399,23 @@ }, { "name": "justinrainbow/json-schema", - "version": "5.2.7", + "version": "5.2.8", "source": { "type": "git", "url": "https://github.com/justinrainbow/json-schema.git", - "reference": "8560d4314577199ba51bf2032f02cd1315587c23" + "reference": "dcb6e1006bb5fd1e392b4daa68932880f37550d4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/justinrainbow/json-schema/zipball/8560d4314577199ba51bf2032f02cd1315587c23", - "reference": "8560d4314577199ba51bf2032f02cd1315587c23", + "url": "https://api.github.com/repos/justinrainbow/json-schema/zipball/dcb6e1006bb5fd1e392b4daa68932880f37550d4", + "reference": "dcb6e1006bb5fd1e392b4daa68932880f37550d4", "shasum": "" }, "require": { "php": ">=5.3.3" }, "require-dev": { - "friendsofphp/php-cs-fixer": "^2.1", + "friendsofphp/php-cs-fixer": "~2.2.20", "json-schema/json-schema-test-suite": "1.2.0", "phpunit/phpunit": "^4.8.35" }, @@ -3734,25 +3461,27 @@ "json", "schema" ], - "time": "2018-02-14T22:26:30+00:00" + "time": "2019-01-14T23:55:14+00:00" }, { "name": "laravel/browser-kit-testing", - "version": "v4.0.1", + "version": "v4.2.1", "source": { "type": "git", "url": "https://github.com/laravel/browser-kit-testing.git", - "reference": "d70283fd29ee9ec09d07a9c94cc5518b569cfeaf" + "reference": "b042ed965910a4ba69c0ebe8863d4029af3e242e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/browser-kit-testing/zipball/d70283fd29ee9ec09d07a9c94cc5518b569cfeaf", - "reference": "d70283fd29ee9ec09d07a9c94cc5518b569cfeaf", + "url": "https://api.github.com/repos/laravel/browser-kit-testing/zipball/b042ed965910a4ba69c0ebe8863d4029af3e242e", + "reference": "b042ed965910a4ba69c0ebe8863d4029af3e242e", "shasum": "" }, "require": { + "illuminate/support": "^5.6", + "mockery/mockery": "^1.0", "php": ">=7.1.3", - "phpunit/phpunit": "~7.0", + "phpunit/phpunit": "^7.0", "symfony/css-selector": "~4.0", "symfony/dom-crawler": "~4.0" }, @@ -3777,12 +3506,12 @@ "email": "taylor@laravel.com" } ], - "description": "Provides backwards compatibility for BrowserKit testing in Laravel 5.4.", + "description": "Provides backwards compatibility for BrowserKit testing in the latest Laravel release.", "keywords": [ "laravel", "testing" ], - "time": "2018-03-13T18:07:36+00:00" + "time": "2019-02-05T13:27:14+00:00" }, { "name": "league/flysystem-memory", @@ -3883,16 +3612,16 @@ }, { "name": "mockery/mockery", - "version": "1.1.0", + "version": "1.2.2", "source": { "type": "git", "url": "https://github.com/mockery/mockery.git", - "reference": "99e29d3596b16dabe4982548527d5ddf90232e99" + "reference": "0eb0b48c3f07b3b89f5169ce005b7d05b18cf1d2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/mockery/mockery/zipball/99e29d3596b16dabe4982548527d5ddf90232e99", - "reference": "99e29d3596b16dabe4982548527d5ddf90232e99", + "url": "https://api.github.com/repos/mockery/mockery/zipball/0eb0b48c3f07b3b89f5169ce005b7d05b18cf1d2", + "reference": "0eb0b48c3f07b3b89f5169ce005b7d05b18cf1d2", "shasum": "" }, "require": { @@ -3901,8 +3630,7 @@ "php": ">=5.6.0" }, "require-dev": { - "phpdocumentor/phpdocumentor": "^2.9", - "phpunit/phpunit": "~5.7.10|~6.5" + "phpunit/phpunit": "~5.7.10|~6.5|~7.0|~8.0" }, "type": "library", "extra": { @@ -3945,7 +3673,7 @@ "test double", "testing" ], - "time": "2018-05-08T08:54:48+00:00" + "time": "2019-02-13T09:37:52+00:00" }, { "name": "myclabs/deep-copy", @@ -4308,16 +4036,16 @@ }, { "name": "phpunit/php-code-coverage", - "version": "6.0.7", + "version": "6.1.4", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-code-coverage.git", - "reference": "865662550c384bc1db7e51d29aeda1c2c161d69a" + "reference": "807e6013b00af69b6c5d9ceb4282d0393dbb9d8d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/865662550c384bc1db7e51d29aeda1c2c161d69a", - "reference": "865662550c384bc1db7e51d29aeda1c2c161d69a", + "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/807e6013b00af69b6c5d9ceb4282d0393dbb9d8d", + "reference": "807e6013b00af69b6c5d9ceb4282d0393dbb9d8d", "shasum": "" }, "require": { @@ -4328,7 +4056,7 @@ "phpunit/php-text-template": "^1.2.1", "phpunit/php-token-stream": "^3.0", "sebastian/code-unit-reverse-lookup": "^1.0.1", - "sebastian/environment": "^3.1", + "sebastian/environment": "^3.1 || ^4.0", "sebastian/version": "^2.0.1", "theseer/tokenizer": "^1.1" }, @@ -4341,7 +4069,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "6.0-dev" + "dev-master": "6.1-dev" } }, "autoload": { @@ -4367,25 +4095,28 @@ "testing", "xunit" ], - "time": "2018-06-01T07:51:50+00:00" + "time": "2018-10-31T16:06:48+00:00" }, { "name": "phpunit/php-file-iterator", - "version": "2.0.1", + "version": "2.0.2", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-file-iterator.git", - "reference": "cecbc684605bb0cc288828eb5d65d93d5c676d3c" + "reference": "050bedf145a257b1ff02746c31894800e5122946" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/cecbc684605bb0cc288828eb5d65d93d5c676d3c", - "reference": "cecbc684605bb0cc288828eb5d65d93d5c676d3c", + "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/050bedf145a257b1ff02746c31894800e5122946", + "reference": "050bedf145a257b1ff02746c31894800e5122946", "shasum": "" }, "require": { "php": "^7.1" }, + "require-dev": { + "phpunit/phpunit": "^7.1" + }, "type": "library", "extra": { "branch-alias": { @@ -4414,7 +4145,7 @@ "filesystem", "iterator" ], - "time": "2018-06-11T11:44:00+00:00" + "time": "2018-09-13T20:33:42+00:00" }, { "name": "phpunit/php-text-template", @@ -4459,16 +4190,16 @@ }, { "name": "phpunit/php-timer", - "version": "2.0.0", + "version": "2.1.1", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-timer.git", - "reference": "8b8454ea6958c3dee38453d3bd571e023108c91f" + "reference": "8b389aebe1b8b0578430bda0c7c95a829608e059" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/8b8454ea6958c3dee38453d3bd571e023108c91f", - "reference": "8b8454ea6958c3dee38453d3bd571e023108c91f", + "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/8b389aebe1b8b0578430bda0c7c95a829608e059", + "reference": "8b389aebe1b8b0578430bda0c7c95a829608e059", "shasum": "" }, "require": { @@ -4480,7 +4211,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "2.0-dev" + "dev-master": "2.1-dev" } }, "autoload": { @@ -4504,20 +4235,20 @@ "keywords": [ "timer" ], - "time": "2018-02-01T13:07:23+00:00" + "time": "2019-02-20T10:12:59+00:00" }, { "name": "phpunit/php-token-stream", - "version": "3.0.0", + "version": "3.0.1", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-token-stream.git", - "reference": "21ad88bbba7c3d93530d93994e0a33cd45f02ace" + "reference": "c99e3be9d3e85f60646f152f9002d46ed7770d18" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/21ad88bbba7c3d93530d93994e0a33cd45f02ace", - "reference": "21ad88bbba7c3d93530d93994e0a33cd45f02ace", + "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/c99e3be9d3e85f60646f152f9002d46ed7770d18", + "reference": "c99e3be9d3e85f60646f152f9002d46ed7770d18", "shasum": "" }, "require": { @@ -4553,20 +4284,20 @@ "keywords": [ "tokenizer" ], - "time": "2018-02-01T13:16:43+00:00" + "time": "2018-10-30T05:52:18+00:00" }, { "name": "phpunit/phpunit", - "version": "7.3.4", + "version": "7.5.6", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "0356331bf62896dc56e3a15030b23b73f38b2935" + "reference": "09c85e14994df92e5ff1f5ec0b481bdb7d3d3df9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/0356331bf62896dc56e3a15030b23b73f38b2935", - "reference": "0356331bf62896dc56e3a15030b23b73f38b2935", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/09c85e14994df92e5ff1f5ec0b481bdb7d3d3df9", + "reference": "09c85e14994df92e5ff1f5ec0b481bdb7d3d3df9", "shasum": "" }, "require": { @@ -4587,11 +4318,11 @@ "phpunit/php-timer": "^2.0", "sebastian/comparator": "^3.0", "sebastian/diff": "^3.0", - "sebastian/environment": "^3.1", + "sebastian/environment": "^4.0", "sebastian/exporter": "^3.1", "sebastian/global-state": "^2.0", "sebastian/object-enumerator": "^3.0.3", - "sebastian/resource-operations": "^1.0", + "sebastian/resource-operations": "^2.0", "sebastian/version": "^2.0.1" }, "conflict": { @@ -4611,7 +4342,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "7.3-dev" + "dev-master": "7.5-dev" } }, "autoload": { @@ -4637,7 +4368,7 @@ "testing", "xunit" ], - "time": "2018-09-05T09:58:53+00:00" + "time": "2019-02-18T09:24:50+00:00" }, { "name": "sebastian/code-unit-reverse-lookup", @@ -4750,23 +4481,23 @@ }, { "name": "sebastian/diff", - "version": "3.0.1", + "version": "3.0.2", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/diff.git", - "reference": "366541b989927187c4ca70490a35615d3fef2dce" + "reference": "720fcc7e9b5cf384ea68d9d930d480907a0c1a29" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/366541b989927187c4ca70490a35615d3fef2dce", - "reference": "366541b989927187c4ca70490a35615d3fef2dce", + "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/720fcc7e9b5cf384ea68d9d930d480907a0c1a29", + "reference": "720fcc7e9b5cf384ea68d9d930d480907a0c1a29", "shasum": "" }, "require": { "php": "^7.1" }, "require-dev": { - "phpunit/phpunit": "^7.0", + "phpunit/phpunit": "^7.5 || ^8.0", "symfony/process": "^2 || ^3.3 || ^4" }, "type": "library", @@ -4802,32 +4533,35 @@ "unidiff", "unified diff" ], - "time": "2018-06-10T07:54:39+00:00" + "time": "2019-02-04T06:01:07+00:00" }, { "name": "sebastian/environment", - "version": "3.1.0", + "version": "4.1.0", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/environment.git", - "reference": "cd0871b3975fb7fc44d11314fd1ee20925fce4f5" + "reference": "6fda8ce1974b62b14935adc02a9ed38252eca656" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/cd0871b3975fb7fc44d11314fd1ee20925fce4f5", - "reference": "cd0871b3975fb7fc44d11314fd1ee20925fce4f5", + "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/6fda8ce1974b62b14935adc02a9ed38252eca656", + "reference": "6fda8ce1974b62b14935adc02a9ed38252eca656", "shasum": "" }, "require": { - "php": "^7.0" + "php": "^7.1" }, "require-dev": { - "phpunit/phpunit": "^6.1" + "phpunit/phpunit": "^7.5" + }, + "suggest": { + "ext-posix": "*" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "3.1.x-dev" + "dev-master": "4.1-dev" } }, "autoload": { @@ -4852,7 +4586,7 @@ "environment", "hhvm" ], - "time": "2017-07-01T08:51:00+00:00" + "time": "2019-02-01T05:27:49+00:00" }, { "name": "sebastian/exporter", @@ -5119,25 +4853,25 @@ }, { "name": "sebastian/resource-operations", - "version": "1.0.0", + "version": "2.0.1", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/resource-operations.git", - "reference": "ce990bb21759f94aeafd30209e8cfcdfa8bc3f52" + "reference": "4d7a795d35b889bf80a0cc04e08d77cedfa917a9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/resource-operations/zipball/ce990bb21759f94aeafd30209e8cfcdfa8bc3f52", - "reference": "ce990bb21759f94aeafd30209e8cfcdfa8bc3f52", + "url": "https://api.github.com/repos/sebastianbergmann/resource-operations/zipball/4d7a795d35b889bf80a0cc04e08d77cedfa917a9", + "reference": "4d7a795d35b889bf80a0cc04e08d77cedfa917a9", "shasum": "" }, "require": { - "php": ">=5.6.0" + "php": "^7.1" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.0.x-dev" + "dev-master": "2.0-dev" } }, "autoload": { @@ -5157,7 +4891,7 @@ ], "description": "Provides a list of PHP built-in functions that operate on resources", "homepage": "https://www.github.com/sebastianbergmann/resource-operations", - "time": "2015-07-28T20:34:47+00:00" + "time": "2018-10-04T04:07:39+00:00" }, { "name": "sebastian/version", @@ -5297,16 +5031,16 @@ }, { "name": "symfony/dom-crawler", - "version": "v4.1.4", + "version": "v4.2.3", "source": { "type": "git", "url": "https://github.com/symfony/dom-crawler.git", - "reference": "1c4519d257e652404c3aa550207ccd8ada66b38e" + "reference": "d8476760b04cdf7b499c8718aa437c20a9155103" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/1c4519d257e652404c3aa550207ccd8ada66b38e", - "reference": "1c4519d257e652404c3aa550207ccd8ada66b38e", + "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/d8476760b04cdf7b499c8718aa437c20a9155103", + "reference": "d8476760b04cdf7b499c8718aa437c20a9155103", "shasum": "" }, "require": { @@ -5323,7 +5057,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "4.1-dev" + "dev-master": "4.2-dev" } }, "autoload": { @@ -5350,20 +5084,20 @@ ], "description": "Symfony DomCrawler Component", "homepage": "https://symfony.com", - "time": "2018-07-26T11:00:49+00:00" + "time": "2019-01-16T20:35:37+00:00" }, { "name": "symfony/filesystem", - "version": "v4.1.4", + "version": "v4.2.3", "source": { "type": "git", "url": "https://github.com/symfony/filesystem.git", - "reference": "c0f5f62db218fa72195b8b8700e4b9b9cf52eb5e" + "reference": "7c16ebc2629827d4ec915a52ac809768d060a4ee" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/filesystem/zipball/c0f5f62db218fa72195b8b8700e4b9b9cf52eb5e", - "reference": "c0f5f62db218fa72195b8b8700e4b9b9cf52eb5e", + "url": "https://api.github.com/repos/symfony/filesystem/zipball/7c16ebc2629827d4ec915a52ac809768d060a4ee", + "reference": "7c16ebc2629827d4ec915a52ac809768d060a4ee", "shasum": "" }, "require": { @@ -5373,7 +5107,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "4.1-dev" + "dev-master": "4.2-dev" } }, "autoload": { @@ -5400,7 +5134,7 @@ ], "description": "Symfony Filesystem Component", "homepage": "https://symfony.com", - "time": "2018-08-18T16:52:46+00:00" + "time": "2019-01-16T20:35:37+00:00" }, { "name": "theseer/tokenizer", @@ -5444,20 +5178,21 @@ }, { "name": "webmozart/assert", - "version": "1.3.0", + "version": "1.4.0", "source": { "type": "git", "url": "https://github.com/webmozart/assert.git", - "reference": "0df1908962e7a3071564e857d86874dad1ef204a" + "reference": "83e253c8e0be5b0257b881e1827274667c5c17a9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/webmozart/assert/zipball/0df1908962e7a3071564e857d86874dad1ef204a", - "reference": "0df1908962e7a3071564e857d86874dad1ef204a", + "url": "https://api.github.com/repos/webmozart/assert/zipball/83e253c8e0be5b0257b881e1827274667c5c17a9", + "reference": "83e253c8e0be5b0257b881e1827274667c5c17a9", "shasum": "" }, "require": { - "php": "^5.3.3 || ^7.0" + "php": "^5.3.3 || ^7.0", + "symfony/polyfill-ctype": "^1.8" }, "require-dev": { "phpunit/phpunit": "^4.6", @@ -5490,7 +5225,7 @@ "check", "validate" ], - "time": "2018-01-29T19:49:41+00:00" + "time": "2018-12-25T11:19:39+00:00" } ], "aliases": [], diff --git a/config/app.php b/config/app.php index 703a5362..c9ef6a44 100644 --- a/config/app.php +++ b/config/app.php @@ -19,7 +19,7 @@ return [ | Where to get information of new versions. | */ - 'update_source' => menv( + 'update_source' => env( 'UPDATE_SOURCE', 'https://work.prinzeugen.net/blessing-skin-server/update.json' ), @@ -35,7 +35,7 @@ return [ | */ - 'env' => menv('APP_ENV', 'production'), + 'env' => env('APP_ENV', 'production'), /* |-------------------------------------------------------------------------- @@ -48,7 +48,7 @@ return [ | */ - 'debug' => menv('APP_DEBUG', false), + 'debug' => env('APP_DEBUG', false), /* |-------------------------------------------------------------------------- @@ -61,7 +61,7 @@ return [ | */ - 'url' => menv('APP_URL', 'http://localhost'), + 'url' => env('APP_URL', 'http://localhost'), /* |-------------------------------------------------------------------------- @@ -113,7 +113,7 @@ return [ | */ - 'key' => menv('APP_KEY', 'base64:MfnScX0W/ViN8bZtRt0P481rWP3igcOK80QstjbXUxI='), + 'key' => env('APP_KEY', 'base64:MfnScX0W/ViN8bZtRt0P481rWP3igcOK80QstjbXUxI='), 'cipher' => 'AES-256-CBC', @@ -130,7 +130,7 @@ return [ | */ - 'log' => menv('APP_LOG', 'single'), + 'log' => env('APP_LOG', 'single'), /* |-------------------------------------------------------------------------- diff --git a/config/cache.php b/config/cache.php index b6353a74..3ffa840b 100644 --- a/config/cache.php +++ b/config/cache.php @@ -13,7 +13,7 @@ return [ | */ - 'default' => menv('CACHE_DRIVER', 'file'), + 'default' => env('CACHE_DRIVER', 'file'), /* |-------------------------------------------------------------------------- @@ -51,8 +51,8 @@ return [ 'driver' => 'memcached', 'servers' => [ [ - 'host' => menv('MEMCACHED_HOST', '127.0.0.1'), - 'port' => menv('MEMCACHED_PORT', 11211), + 'host' => env('MEMCACHED_HOST', '127.0.0.1'), + 'port' => env('MEMCACHED_PORT', 11211), 'weight' => 100, ], ], diff --git a/config/database.php b/config/database.php index 3db98a70..42a37690 100644 --- a/config/database.php +++ b/config/database.php @@ -26,7 +26,7 @@ return [ | */ - 'default' => menv('DB_CONNECTION', 'mysql'), + 'default' => env('DB_CONNECTION', 'mysql'), /* |-------------------------------------------------------------------------- @@ -48,33 +48,33 @@ return [ 'sqlite' => [ 'driver' => 'sqlite', - 'database' => menv('DB_DATABASE', database_path('database.sqlite')), - 'prefix' => menv('DB_PREFIX', ''), + 'database' => env('DB_DATABASE', database_path('database.sqlite')), + 'prefix' => env('DB_PREFIX', ''), ], 'mysql' => [ 'driver' => 'mysql', - 'host' => menv('DB_HOST', 'localhost'), - 'port' => menv('DB_PORT', '3306'), - 'database' => menv('DB_DATABASE', 'forge'), - 'username' => menv('DB_USERNAME', 'forge'), - 'password' => menv('DB_PASSWORD', ''), + 'host' => env('DB_HOST', 'localhost'), + 'port' => env('DB_PORT', '3306'), + 'database' => env('DB_DATABASE', 'forge'), + 'username' => env('DB_USERNAME', 'forge'), + 'password' => env('DB_PASSWORD', ''), 'charset' => 'utf8', 'collation' => 'utf8_unicode_ci', - 'prefix' => menv('DB_PREFIX', ''), + 'prefix' => env('DB_PREFIX', ''), 'strict' => false, 'engine' => null, ], 'pgsql' => [ 'driver' => 'pgsql', - 'host' => menv('DB_HOST', 'localhost'), - 'port' => menv('DB_PORT', '5432'), - 'database' => menv('DB_DATABASE', 'forge'), - 'username' => menv('DB_USERNAME', 'forge'), - 'password' => menv('DB_PASSWORD', ''), + 'host' => env('DB_HOST', 'localhost'), + 'port' => env('DB_PORT', '5432'), + 'database' => env('DB_DATABASE', 'forge'), + 'username' => env('DB_USERNAME', 'forge'), + 'password' => env('DB_PASSWORD', ''), 'charset' => 'utf8', - 'prefix' => menv('DB_PREFIX', ''), + 'prefix' => env('DB_PREFIX', ''), 'schema' => 'public', ], @@ -109,11 +109,11 @@ return [ 'cluster' => false, 'default' => [ - 'scheme' => menv('REDIS_SCHEME', 'tcp'), - 'host' => menv('REDIS_HOST', 'localhost'), - 'port' => menv('REDIS_PORT', 6379), - 'path' => menv('REDIS_SOCKET_PATH'), - 'password' => menv('REDIS_PASSWORD', null), + 'scheme' => env('REDIS_SCHEME', 'tcp'), + 'host' => env('REDIS_HOST', 'localhost'), + 'port' => env('REDIS_PORT', 6379), + 'path' => env('REDIS_SOCKET_PATH'), + 'password' => env('REDIS_PASSWORD', null), 'database' => 0, ], diff --git a/config/filesystems.php b/config/filesystems.php index 08d83f64..c4cb3694 100644 --- a/config/filesystems.php +++ b/config/filesystems.php @@ -54,7 +54,7 @@ return [ ], 'textures' => [ - 'driver' => menv('FS_DRIVER', 'local'), + 'driver' => env('FS_DRIVER', 'local'), 'root' => storage_path('textures'), ], diff --git a/config/mail.php b/config/mail.php index 8d61494f..ca49d83f 100644 --- a/config/mail.php +++ b/config/mail.php @@ -16,7 +16,7 @@ return [ | */ - 'driver' => menv('MAIL_DRIVER'), + 'driver' => env('MAIL_DRIVER'), /* |-------------------------------------------------------------------------- @@ -29,7 +29,7 @@ return [ | */ - 'host' => menv('MAIL_HOST', ''), + 'host' => env('MAIL_HOST', ''), /* |-------------------------------------------------------------------------- @@ -42,7 +42,7 @@ return [ | */ - 'port' => menv('MAIL_PORT', 587), + 'port' => env('MAIL_PORT', 587), /* |-------------------------------------------------------------------------- @@ -68,7 +68,7 @@ return [ | */ - 'encryption' => menv('MAIL_ENCRYPTION', 'tls'), + 'encryption' => env('MAIL_ENCRYPTION', 'tls'), /* |-------------------------------------------------------------------------- @@ -81,7 +81,7 @@ return [ | */ - 'username' => menv('MAIL_USERNAME'), + 'username' => env('MAIL_USERNAME'), /* |-------------------------------------------------------------------------- @@ -94,7 +94,7 @@ return [ | */ - 'password' => menv('MAIL_PASSWORD'), + 'password' => env('MAIL_PASSWORD'), /* |-------------------------------------------------------------------------- @@ -107,6 +107,6 @@ return [ | */ - 'sendmail' => menv('SENDMAIL_COMMAND', '/usr/sbin/sendmail -bs'), + 'sendmail' => env('SENDMAIL_COMMAND', '/usr/sbin/sendmail -bs'), ]; diff --git a/config/plugins.php b/config/plugins.php index a668388f..2999a5d1 100644 --- a/config/plugins.php +++ b/config/plugins.php @@ -10,7 +10,7 @@ return [ | Defaults to `base_path()."/plugins"`. | */ - 'directory' => menv('PLUGINS_DIR'), + 'directory' => env('PLUGINS_DIR'), /* |-------------------------------------------------------------------------- @@ -21,7 +21,7 @@ return [ | Defaults to `http://site_url/plugins`. | */ - 'url' => menv('PLUGINS_URL'), + 'url' => env('PLUGINS_URL'), /* |-------------------------------------------------------------------------- @@ -31,5 +31,5 @@ return [ | Specify where to get plugins' metadata for plugin market. | */ - 'registry' => menv('PLUGINS_REGISTRY', 'https://work.prinzeugen.net/blessing-skin-server/plugins.json'), + 'registry' => env('PLUGINS_REGISTRY', 'https://work.prinzeugen.net/blessing-skin-server/plugins.json'), ]; diff --git a/config/queue.php b/config/queue.php index 948197d4..d0f732a6 100644 --- a/config/queue.php +++ b/config/queue.php @@ -15,7 +15,7 @@ return [ | */ - 'default' => menv('QUEUE_DRIVER', 'sync'), + 'default' => env('QUEUE_DRIVER', 'sync'), /* |-------------------------------------------------------------------------- @@ -78,7 +78,7 @@ return [ */ 'failed' => [ - 'database' => menv('DB_CONNECTION', 'mysql'), + 'database' => env('DB_CONNECTION', 'mysql'), 'table' => 'failed_jobs', ], diff --git a/config/secure.php b/config/secure.php index 3d865b34..b9a2b067 100644 --- a/config/secure.php +++ b/config/secure.php @@ -9,8 +9,8 @@ return [ | Load them from env to config, preventing cache problems | */ - 'cipher' => menv('PWD_METHOD', 'SALTED2MD5'), - 'salt' => menv('SALT', ''), + 'cipher' => env('PWD_METHOD', 'SALTED2MD5'), + 'salt' => env('SALT', ''), /* |-------------------------------------------------------------------------- @@ -23,6 +23,6 @@ return [ | See: http://docs.guzzlephp.org/en/stable/request-options.html#verify | */ - 'certificates' => menv('SSL_CERT', storage_path('patches/ca-bundle.crt')), - 'user_agent' => menv('USER_AGENT', 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/64.0.3282.140 Safari/537.36'), + 'certificates' => env('SSL_CERT', storage_path('patches/ca-bundle.crt')), + 'user_agent' => env('USER_AGENT', 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/64.0.3282.140 Safari/537.36'), ]; diff --git a/config/services.php b/config/services.php index ee2dd211..842b26bc 100644 --- a/config/services.php +++ b/config/services.php @@ -32,7 +32,7 @@ return [ 'ses' => [ 'key' => env('SES_KEY'), 'secret' => env('SES_SECRET'), - 'region' => menv('SES_REGION'), + 'region' => env('SES_REGION'), 'guzzle' => [ 'verify' => config('secure.certificates') ], diff --git a/config/session.php b/config/session.php index a2820910..c428d389 100644 --- a/config/session.php +++ b/config/session.php @@ -16,7 +16,7 @@ return [ | */ - 'driver' => menv('SESSION_DRIVER', 'file'), + 'driver' => env('SESSION_DRIVER', 'file'), /* |-------------------------------------------------------------------------- diff --git a/database/factories/UserModelFactory.php b/database/factories/UserModelFactory.php index 47bfc759..74862a61 100644 --- a/database/factories/UserModelFactory.php +++ b/database/factories/UserModelFactory.php @@ -1,6 +1,7 @@ define(User::class, function (Faker\Generator $faker) { return [ @@ -8,7 +9,7 @@ $factory->define(User::class, function (Faker\Generator $faker) { 'nickname' => $faker->name, 'score' => 1000, 'avatar' => 0, - 'password' => app('cipher')->hash(str_random(10), config('secure.salt')), + 'password' => app('cipher')->hash(Str::random(10), config('secure.salt')), 'ip' => '127.0.0.1', 'permission' => 0, 'verified' => true, @@ -23,7 +24,7 @@ $factory->defineAs(User::class, 'admin', function (Faker\Generator $faker) { 'nickname' => $faker->name, 'score' => 1000, 'avatar' => 0, - 'password' => app('cipher')->hash(str_random(10), config('secure.salt')), + 'password' => app('cipher')->hash(Str::random(10), config('secure.salt')), 'ip' => '127.0.0.1', 'permission' => 1, 'verified' => true, @@ -38,7 +39,7 @@ $factory->defineAs(User::class, 'superAdmin', function (Faker\Generator $faker) 'nickname' => $faker->name, 'score' => 1000, 'avatar' => 0, - 'password' => app('cipher')->hash(str_random(10), config('secure.salt')), + 'password' => app('cipher')->hash(Str::random(10), config('secure.salt')), 'ip' => '127.0.0.1', 'permission' => 2, 'verified' => true, @@ -53,7 +54,7 @@ $factory->defineAs(User::class, 'banned', function (Faker\Generator $faker) { 'nickname' => $faker->name, 'score' => 1000, 'avatar' => 0, - 'password' => app('cipher')->hash(str_random(10), config('secure.salt')), + 'password' => app('cipher')->hash(Str::random(10), config('secure.salt')), 'ip' => '127.0.0.1', 'permission' => -1, 'verified' => true, diff --git a/tests/AdminControllerTest.php b/tests/AdminControllerTest.php index 08b87e57..b574450a 100644 --- a/tests/AdminControllerTest.php +++ b/tests/AdminControllerTest.php @@ -5,6 +5,7 @@ namespace Tests; use App\Models\User; use App\Models\Player; use App\Models\Texture; +use Illuminate\Support\Str; use Illuminate\Foundation\Testing\WithoutMiddleware; use Illuminate\Foundation\Testing\DatabaseMigrations; use Illuminate\Foundation\Testing\DatabaseTransactions; @@ -13,11 +14,11 @@ class AdminControllerTest extends BrowserKitTestCase { use DatabaseTransactions; - protected function setUp() + protected function setUp(): void { // Do not use `WithoutMiddleware` trait parent::setUp(); - return $this->actAs('admin'); + $this->actAs('admin'); } public function testIndex() @@ -358,7 +359,7 @@ class AdminControllerTest extends BrowserKitTestCase // Set a too long password $this->postJson( '/admin/users', - ['uid' => $user->uid, 'action' => 'password', 'password' => str_random(17)], + ['uid' => $user->uid, 'action' => 'password', 'password' => Str::random(17)], ['Accept' => 'application/json'] )->seeJson([ 'errno' => 1, diff --git a/tests/AuthControllerTest.php b/tests/AuthControllerTest.php index 3846d02d..15f86483 100644 --- a/tests/AuthControllerTest.php +++ b/tests/AuthControllerTest.php @@ -5,6 +5,7 @@ namespace Tests; use App\Events; use App\Models\User; use App\Models\Player; +use Illuminate\Support\Str; use App\Mail\ForgotPassword; use App\Services\Facades\Option; use Illuminate\Support\Facades\URL; @@ -71,7 +72,7 @@ class AuthControllerTest extends TestCase $this->postJson( '/auth/login', [ 'identification' => $user->email, - 'password' => str_random(80) + 'password' => Str::random(80) ], [ 'X-Requested-With' => 'XMLHttpRequest' ])->assertJson([ @@ -245,7 +246,7 @@ class AuthControllerTest extends TestCase '/auth/register', [ 'email' => 'a@b.c', - 'password' => str_random(33) + 'password' => Str::random(33) ] )->assertJson([ 'errno' => 1, @@ -287,7 +288,7 @@ class AuthControllerTest extends TestCase [ 'email' => 'a@b.c', 'password' => '12345678', - 'player_name' => str_random(option('player_name_length_max') + 10), + 'player_name' => Str::random(option('player_name_length_max') + 10), 'captcha' => 'a' ] )->assertJson([ @@ -350,7 +351,7 @@ class AuthControllerTest extends TestCase [ 'email' => 'a@b.c', 'password' => '12345678', - 'nickname' => str_random(256), + 'nickname' => Str::random(256), 'captcha' => 'a' ], ['X-Requested-With' => 'XMLHttpRequest'] @@ -568,7 +569,7 @@ class AuthControllerTest extends TestCase // Should return a warning if `password` is too long $this->postJson( $url, [ - 'password' => str_random(33) + 'password' => Str::random(33) ], [ 'X-Requested-With' => 'XMLHttpRequest' ])->assertJson([ diff --git a/tests/BrowserKitTestCase.php b/tests/BrowserKitTestCase.php index d2caa3d7..683d8895 100644 --- a/tests/BrowserKitTestCase.php +++ b/tests/BrowserKitTestCase.php @@ -52,7 +52,7 @@ class BrowserKitTestCase extends TestCase return $this->actingAs($role); } - protected function tearDown() + protected function tearDown(): void { $this->beforeApplicationDestroyed(function () { DB::disconnect(); diff --git a/tests/ClosetControllerTest.php b/tests/ClosetControllerTest.php index 0e3ebe14..8d42eae2 100644 --- a/tests/ClosetControllerTest.php +++ b/tests/ClosetControllerTest.php @@ -18,11 +18,11 @@ class ClosetControllerTest extends TestCase */ private $user; - protected function setUp() + protected function setUp(): void { parent::setUp(); $this->user = factory(User::class)->create(); - return $this->actAs($this->user); + $this->actAs($this->user); } public function testIndex() diff --git a/tests/Concerns/GeneratesFakePlugins.php b/tests/Concerns/GeneratesFakePlugins.php index e79254d8..67aa24e5 100644 --- a/tests/Concerns/GeneratesFakePlugins.php +++ b/tests/Concerns/GeneratesFakePlugins.php @@ -3,6 +3,8 @@ namespace Tests\Concerns; use ZipArchive; +use Illuminate\Support\Arr; +use Illuminate\Support\Str; trait GeneratesFakePlugins { @@ -15,13 +17,13 @@ trait GeneratesFakePlugins protected function generateFakePlguinInfo($info = []) { return array_replace([ - 'name' => str_random(10), + 'name' => Str::random(10), 'version' => '0.0.'.rand(1, 9), - 'title' => str_random(20), - 'description' => str_random(60), - 'author' => array_get($info, 'author', str_random(10)), - 'url' => 'https://'.str_random(10).'.test', - 'namespace' => str_random(10), + 'title' => Str::random(20), + 'description' => Str::random(60), + 'author' => Arr::get($info, 'author', Str::random(10)), + 'url' => 'https://'.Str::random(10).'.test', + 'namespace' => Str::random(10), 'require' => [ 'blessing-skin-server' => '^3.4.0 || ^4.0.0' ] @@ -39,8 +41,8 @@ trait GeneratesFakePlugins return $this->generateFakePlguinInfo(array_replace([ 'dist' => [ 'type' => 'zip', - 'url' => 'https://plugins-registry.test/'.str_random(10).'.zip', - 'shasum' => strtolower(str_random(40)) + 'url' => 'https://plugins-registry.test/'.Str::random(10).'.zip', + 'shasum' => strtolower(Str::random(40)) ] ], $info)); } @@ -97,14 +99,14 @@ trait GeneratesFakePlugins } // Generate fake config view - if ($config = array_get($info, 'config')) { + if ($config = Arr::get($info, 'config')) { $views_path = "$plugin_dir/views"; if (! is_dir($views_path)) { mkdir($views_path); } - file_put_contents("$views_path/$config", str_random(64)); + file_put_contents("$views_path/$config", Str::random(64)); } file_put_contents("$plugin_dir/package.json", json_encode( @@ -122,8 +124,8 @@ trait GeneratesFakePlugins */ protected function generateFakePluginArchive($info) { - $name = array_get($info, 'name'); - $version = array_get($info, 'version'); + $name = Arr::get($info, 'name'); + $version = Arr::get($info, 'version'); $zipPath = storage_path("testing/{$name}_{$version}.zip"); if (file_exists($zipPath)) { diff --git a/tests/Concerns/InteractsWithCache.php b/tests/Concerns/InteractsWithCache.php index 43e4817a..b66713b9 100644 --- a/tests/Concerns/InteractsWithCache.php +++ b/tests/Concerns/InteractsWithCache.php @@ -13,11 +13,12 @@ trait InteractsWithCache * Set the cache to the given array. * * @param array $data + * @param int $seconds * @return $this */ - public function withCache(array $data, $minutes = 60) + public function withCache(array $data, $seconds = 3600) { - $this->cache($data, $minutes); + $this->cache($data, $seconds); return $this; } @@ -26,12 +27,13 @@ trait InteractsWithCache * Set the cache to the given array. * * @param array $data + * @param int $seconds * @return void */ - public function cache(array $data, $minutes = 60) + public function cache(array $data, $seconds = 3600) { foreach ($data as $key => $value) { - $this->app['cache']->put($key, $value, $minutes); + $this->app['cache']->put($key, $value, $seconds); } } diff --git a/tests/MarketControllerTest.php b/tests/MarketControllerTest.php index 5173364b..4e9890ea 100644 --- a/tests/MarketControllerTest.php +++ b/tests/MarketControllerTest.php @@ -14,10 +14,10 @@ class MarketControllerTest extends TestCase use MocksGuzzleClient; use GeneratesFakePlugins; - protected function setUp() + protected function setUp(): void { parent::setUp(); - return $this->actAs('superAdmin'); + $this->actAs('superAdmin'); } public function testDownload() @@ -171,7 +171,7 @@ class MarketControllerTest extends TestCase File::deleteDirectory(base_path('plugins/' . $package['name'])); } - protected function tearDown() + protected function tearDown(): void { // Clean fake plugins File::deleteDirectory(base_path('plugins/fake-test-download')); diff --git a/tests/PlayerControllerTest.php b/tests/PlayerControllerTest.php index 3d36b696..565a4955 100644 --- a/tests/PlayerControllerTest.php +++ b/tests/PlayerControllerTest.php @@ -14,10 +14,10 @@ class PlayerControllerTest extends TestCase { use DatabaseTransactions; - protected function setUp() + protected function setUp(): void { parent::setUp(); - return $this->actAs('normal'); + $this->actAs('normal'); } public function testIndex() diff --git a/tests/PluginControllerTest.php b/tests/PluginControllerTest.php index 7ff4242d..17d49a98 100644 --- a/tests/PluginControllerTest.php +++ b/tests/PluginControllerTest.php @@ -15,14 +15,14 @@ class PluginControllerTest extends TestCase use DatabaseTransactions; use GeneratesFakePlugins; - protected function setUp() + protected function setUp(): void { parent::setUp(); $this->generateFakePlugin(['name' => 'fake-plugin-for-test', 'version' => '1.1.4']); $this->generateFakePlugin(['name' => 'fake-plugin-with-config-view', 'version' => '5.1.4', 'config' => 'config.blade.php']); - return $this->actAs('superAdmin'); + $this->actAs('superAdmin'); } public function testShowManage() @@ -143,7 +143,7 @@ class PluginControllerTest extends TestCase ]); } - protected function tearDown() + protected function tearDown(): void { // Clean fake plugins File::deleteDirectory(base_path('plugins/fake-plugin-for-test')); diff --git a/tests/ServicesTest/MinecraftTest.php b/tests/ServicesTest/MinecraftTest.php index 3b384c51..107cd4a0 100644 --- a/tests/ServicesTest/MinecraftTest.php +++ b/tests/ServicesTest/MinecraftTest.php @@ -11,7 +11,7 @@ use Illuminate\Foundation\Testing\DatabaseTransactions; class MinecraftTest extends TestCase { - protected function setUp() + protected function setUp(): void { parent::setUp(); vfsStream::setup(); diff --git a/tests/SetupControllerTest.php b/tests/SetupControllerTest.php index 4d3db529..b0217cdf 100644 --- a/tests/SetupControllerTest.php +++ b/tests/SetupControllerTest.php @@ -5,6 +5,7 @@ namespace Tests; use Mockery; use Exception; use CreateAllTables; +use Illuminate\Support\Str; use AddVerificationToUsersTable; use Illuminate\Support\Facades\File; use Illuminate\Support\Facades\Schema; @@ -18,13 +19,13 @@ class SetupControllerTest extends TestCase { use DatabaseTransactions; - protected function setUp() + protected function setUp(): void { parent::setUp(); $this->dropAllTables(); } - protected function tearDown() + protected function tearDown(): void { $this->dropAllTables(); Mockery::close(); @@ -107,7 +108,7 @@ class SetupControllerTest extends TestCase // Too long nickname $this->post('/setup/finish', [ 'email' => 'a@b.c', - 'nickname' => str_random(256) + 'nickname' => Str::random(256) ])->assertDontSee(trans('setup.wizard.finish.title')); // Without `password` field @@ -127,7 +128,7 @@ class SetupControllerTest extends TestCase $this->post('/setup/finish', [ 'email' => 'a@b.c', 'nickname' => 'nickname', - 'password' => str_random(17) + 'password' => Str::random(17) ])->assertDontSee(trans('setup.wizard.finish.title')); // Confirmation is not OK diff --git a/tests/SkinlibControllerTest.php b/tests/SkinlibControllerTest.php index f38108db..1ca5dc9e 100644 --- a/tests/SkinlibControllerTest.php +++ b/tests/SkinlibControllerTest.php @@ -6,6 +6,7 @@ use App\Models\User; use App\Models\Closet; use App\Models\Player; use App\Models\Texture; +use Illuminate\Support\Str; use org\bovigo\vfs\vfsStream; use Illuminate\Http\UploadedFile; use Illuminate\Support\Facades\Storage; @@ -22,7 +23,7 @@ class SkinlibControllerTest extends TestCase */ private $vfs_root; - protected function setUp() + protected function setUp(): void { parent::setUp(); $this->vfs_root = vfsStream::setup(); @@ -130,11 +131,11 @@ class SkinlibControllerTest extends TestCase ]); // Search - $keyword = str_limit($skins->random()->name, 1, ''); + $keyword = Str::limit($skins->random()->name, 1, ''); $expected = $skins ->filter(function ($texture) use ($keyword) { - return str_contains($texture->name, $keyword) || - str_contains($texture->name, strtolower($keyword)); + return Str::contains($texture->name, $keyword) || + Str::contains($texture->name, strtolower($keyword)); }) ->sortByDesc('upload_at') ->values(); @@ -146,11 +147,11 @@ class SkinlibControllerTest extends TestCase ]); // More than one argument - $keyword = str_limit($skins->random()->name, 1, ''); + $keyword = Str::limit($skins->random()->name, 1, ''); $expected = $skins ->filter(function ($texture) use ($keyword) { - return str_contains($texture->name, $keyword) || - str_contains($texture->name, strtolower($keyword)); + return Str::contains($texture->name, $keyword) || + Str::contains($texture->name, strtolower($keyword)); }) ->sortByDesc('likes') ->values(); diff --git a/tests/TestCase.php b/tests/TestCase.php index b754ac43..e99ec32d 100644 --- a/tests/TestCase.php +++ b/tests/TestCase.php @@ -51,7 +51,7 @@ class TestCase extends \Illuminate\Foundation\Testing\TestCase return $this->actingAs($role); } - protected function tearDown() + protected function tearDown(): void { $this->beforeApplicationDestroyed(function () { DB::disconnect(); diff --git a/tests/UpdateControllerTest.php b/tests/UpdateControllerTest.php index e5aeaec9..db488a37 100644 --- a/tests/UpdateControllerTest.php +++ b/tests/UpdateControllerTest.php @@ -20,11 +20,11 @@ class UpdateControllerTest extends TestCase use DatabaseTransactions; use MocksGuzzleClient; - protected function setUp() + protected function setUp(): void { parent::setUp(); - return $this->actAs('superAdmin'); + $this->actAs('superAdmin'); } public function testShowUpdatePage() diff --git a/tests/UserControllerTest.php b/tests/UserControllerTest.php index 0538819c..ec8fdc90 100644 --- a/tests/UserControllerTest.php +++ b/tests/UserControllerTest.php @@ -6,6 +6,7 @@ use Parsedown; use App\Events; use Carbon\Carbon; use App\Models\User; +use Illuminate\Support\Str; use App\Mail\EmailVerification; use Illuminate\Support\Facades\Mail; use Illuminate\Foundation\Testing\WithoutMiddleware; @@ -244,7 +245,7 @@ class UserControllerTest extends TestCase // Too long nickname $this->postJson('/user/profile', [ 'action' => 'nickname', - 'new_nickname' => str_random(256) + 'new_nickname' => Str::random(256) ], [ 'X-Requested-With' => 'XMLHttpRequest' ])->assertJson([ @@ -290,7 +291,7 @@ class UserControllerTest extends TestCase // Too long current password $this->postJson('/user/profile', [ 'action' => 'password', - 'current_password' => str_random(33), + 'current_password' => Str::random(33), 'new_password' => '12345678' ], [ 'X-Requested-With' => 'XMLHttpRequest' @@ -315,7 +316,7 @@ class UserControllerTest extends TestCase $this->postJson('/user/profile', [ 'action' => 'password', 'current_password' => '12345678', - 'new_password' => str_random(33) + 'new_password' => Str::random(33) ], [ 'X-Requested-With' => 'XMLHttpRequest' ])->assertJson([ @@ -390,7 +391,7 @@ class UserControllerTest extends TestCase $this->postJson('/user/profile', [ 'action' => 'email', 'new_email' => 'a@b.c', - 'password' => str_random(33) + 'password' => Str::random(33) ], [ 'X-Requested-With' => 'XMLHttpRequest' ])->assertJson([ @@ -466,7 +467,7 @@ class UserControllerTest extends TestCase // Too long current password $this->postJson('/user/profile', [ 'action' => 'delete', - 'password' => str_random(33) + 'password' => Str::random(33) ], [ 'X-Requested-With' => 'XMLHttpRequest' ])->assertJson([