diff --git a/composer.lock b/composer.lock index e46268a38..f015857dc 100644 --- a/composer.lock +++ b/composer.lock @@ -804,16 +804,16 @@ }, { "name": "laravel/framework", - "version": "v5.8.17", + "version": "v5.8.18", "source": { "type": "git", "url": "https://github.com/laravel/framework.git", - "reference": "33c04dd2a431adeeb49926a4f2b20590cc033ca2" + "reference": "9f571be04435883dab6f23ecfadb204273b7f527" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/framework/zipball/33c04dd2a431adeeb49926a4f2b20590cc033ca2", - "reference": "33c04dd2a431adeeb49926a4f2b20590cc033ca2", + "url": "https://api.github.com/repos/laravel/framework/zipball/9f571be04435883dab6f23ecfadb204273b7f527", + "reference": "9f571be04435883dab6f23ecfadb204273b7f527", "shasum": "" }, "require": { @@ -947,20 +947,20 @@ "framework", "laravel" ], - "time": "2019-05-14T16:02:41+00:00" + "time": "2019-05-21T16:40:34+00:00" }, { "name": "laravel/horizon", - "version": "v3.1.2", + "version": "v3.2.1", "source": { "type": "git", "url": "https://github.com/laravel/horizon.git", - "reference": "32313d787a7a7575c1866e8ed12ec944c1513b7f" + "reference": "a9204280f72a1c6d3874e0f98b68e354b212311a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/horizon/zipball/32313d787a7a7575c1866e8ed12ec944c1513b7f", - "reference": "32313d787a7a7575c1866e8ed12ec944c1513b7f", + "url": "https://api.github.com/repos/laravel/horizon/zipball/a9204280f72a1c6d3874e0f98b68e354b212311a", + "reference": "a9204280f72a1c6d3874e0f98b68e354b212311a", "shasum": "" }, "require": { @@ -1016,7 +1016,7 @@ "laravel", "queue" ], - "time": "2019-04-30T15:20:11+00:00" + "time": "2019-05-21T19:58:03+00:00" }, { "name": "laravel/socialite", @@ -1214,16 +1214,16 @@ }, { "name": "league/flysystem", - "version": "1.0.51", + "version": "1.0.52", "source": { "type": "git", "url": "https://github.com/thephpleague/flysystem.git", - "reference": "755ba7bf3fb9031e6581d091db84d78275874396" + "reference": "c5a5097156387970e6f0ccfcdf03f752856f3391" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/755ba7bf3fb9031e6581d091db84d78275874396", - "reference": "755ba7bf3fb9031e6581d091db84d78275874396", + "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/c5a5097156387970e6f0ccfcdf03f752856f3391", + "reference": "c5a5097156387970e6f0ccfcdf03f752856f3391", "shasum": "" }, "require": { @@ -1294,7 +1294,7 @@ "sftp", "storage" ], - "time": "2019-03-30T13:22:34+00:00" + "time": "2019-05-20T20:21:14+00:00" }, { "name": "league/oauth1-client", diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json index e52d4282e..76fb07833 100644 --- a/vendor/composer/installed.json +++ b/vendor/composer/installed.json @@ -1113,17 +1113,17 @@ }, { "name": "laravel/framework", - "version": "v5.8.17", - "version_normalized": "5.8.17.0", + "version": "v5.8.18", + "version_normalized": "5.8.18.0", "source": { "type": "git", "url": "https://github.com/laravel/framework.git", - "reference": "33c04dd2a431adeeb49926a4f2b20590cc033ca2" + "reference": "9f571be04435883dab6f23ecfadb204273b7f527" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/framework/zipball/33c04dd2a431adeeb49926a4f2b20590cc033ca2", - "reference": "33c04dd2a431adeeb49926a4f2b20590cc033ca2", + "url": "https://api.github.com/repos/laravel/framework/zipball/9f571be04435883dab6f23ecfadb204273b7f527", + "reference": "9f571be04435883dab6f23ecfadb204273b7f527", "shasum": "" }, "require": { @@ -1226,7 +1226,7 @@ "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)." }, - "time": "2019-05-14T16:02:41+00:00", + "time": "2019-05-21T16:40:34+00:00", "type": "library", "extra": { "branch-alias": { @@ -1262,17 +1262,17 @@ }, { "name": "laravel/horizon", - "version": "v3.1.2", - "version_normalized": "3.1.2.0", + "version": "v3.2.1", + "version_normalized": "3.2.1.0", "source": { "type": "git", "url": "https://github.com/laravel/horizon.git", - "reference": "32313d787a7a7575c1866e8ed12ec944c1513b7f" + "reference": "a9204280f72a1c6d3874e0f98b68e354b212311a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/horizon/zipball/32313d787a7a7575c1866e8ed12ec944c1513b7f", - "reference": "32313d787a7a7575c1866e8ed12ec944c1513b7f", + "url": "https://api.github.com/repos/laravel/horizon/zipball/a9204280f72a1c6d3874e0f98b68e354b212311a", + "reference": "a9204280f72a1c6d3874e0f98b68e354b212311a", "shasum": "" }, "require": { @@ -1294,7 +1294,7 @@ "orchestra/testbench": "^3.7", "phpunit/phpunit": "^7.0" }, - "time": "2019-04-30T15:20:11+00:00", + "time": "2019-05-21T19:58:03+00:00", "type": "library", "extra": { "branch-alias": { @@ -1533,17 +1533,17 @@ }, { "name": "league/flysystem", - "version": "1.0.51", - "version_normalized": "1.0.51.0", + "version": "1.0.52", + "version_normalized": "1.0.52.0", "source": { "type": "git", "url": "https://github.com/thephpleague/flysystem.git", - "reference": "755ba7bf3fb9031e6581d091db84d78275874396" + "reference": "c5a5097156387970e6f0ccfcdf03f752856f3391" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/755ba7bf3fb9031e6581d091db84d78275874396", - "reference": "755ba7bf3fb9031e6581d091db84d78275874396", + "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/c5a5097156387970e6f0ccfcdf03f752856f3391", + "reference": "c5a5097156387970e6f0ccfcdf03f752856f3391", "shasum": "" }, "require": { @@ -1573,7 +1573,7 @@ "spatie/flysystem-dropbox": "Allows you to use Dropbox storage", "srmklive/flysystem-dropbox-v2": "Allows you to use Dropbox storage for PHP 5 applications" }, - "time": "2019-03-30T13:22:34+00:00", + "time": "2019-05-20T20:21:14+00:00", "type": "library", "extra": { "branch-alias": { diff --git a/vendor/laravel/framework/src/Illuminate/Auth/Access/Gate.php b/vendor/laravel/framework/src/Illuminate/Auth/Access/Gate.php index 58d26e729..c407dac97 100644 --- a/vendor/laravel/framework/src/Illuminate/Auth/Access/Gate.php +++ b/vendor/laravel/framework/src/Illuminate/Auth/Access/Gate.php @@ -417,6 +417,8 @@ class Gate implements GateContract * * @param callable $callback * @return bool + * + * @throws \ReflectionException */ protected function callbackAllowsGuests($callback) { @@ -598,6 +600,8 @@ class Gate implements GateContract * * @param object|string $class * @return mixed + * + * @throws \Illuminate\Contracts\Container\BindingResolutionException */ public function resolvePolicy($class) { diff --git a/vendor/laravel/framework/src/Illuminate/Auth/Console/AuthMakeCommand.php b/vendor/laravel/framework/src/Illuminate/Auth/Console/AuthMakeCommand.php index 67dbf9a0e..5214a5cf6 100644 --- a/vendor/laravel/framework/src/Illuminate/Auth/Console/AuthMakeCommand.php +++ b/vendor/laravel/framework/src/Illuminate/Auth/Console/AuthMakeCommand.php @@ -121,6 +121,7 @@ class AuthMakeCommand extends Command /** * Get full view path relative to the app's configured view path. * + * @param string $path * @return string */ protected function getViewPath($path) diff --git a/vendor/laravel/framework/src/Illuminate/Auth/Console/stubs/make/views/layouts/app.stub b/vendor/laravel/framework/src/Illuminate/Auth/Console/stubs/make/views/layouts/app.stub index e6aeac140..9224ba381 100644 --- a/vendor/laravel/framework/src/Illuminate/Auth/Console/stubs/make/views/layouts/app.stub +++ b/vendor/laravel/framework/src/Illuminate/Auth/Console/stubs/make/views/layouts/app.stub @@ -14,7 +14,7 @@ - + diff --git a/vendor/laravel/framework/src/Illuminate/Cache/FileStore.php b/vendor/laravel/framework/src/Illuminate/Cache/FileStore.php index f48ebc2b1..228d69976 100755 --- a/vendor/laravel/framework/src/Illuminate/Cache/FileStore.php +++ b/vendor/laravel/framework/src/Illuminate/Cache/FileStore.php @@ -186,7 +186,13 @@ class FileStore implements Store return $this->emptyPayload(); } - $data = unserialize(substr($contents, 10)); + try { + $data = unserialize(substr($contents, 10)); + } catch (Exception $e) { + $this->forget($key); + + return $this->emptyPayload(); + } // Next, we'll extract the number of seconds that are remaining for a cache // so that we can properly retain the time for things like the increment diff --git a/vendor/laravel/framework/src/Illuminate/Contracts/Auth/Guard.php b/vendor/laravel/framework/src/Illuminate/Contracts/Auth/Guard.php index 2a2ed3d9a..2a27fb5f5 100644 --- a/vendor/laravel/framework/src/Illuminate/Contracts/Auth/Guard.php +++ b/vendor/laravel/framework/src/Illuminate/Contracts/Auth/Guard.php @@ -28,7 +28,7 @@ interface Guard /** * Get the ID for the currently authenticated user. * - * @return int|null + * @return int|string|null */ public function id(); diff --git a/vendor/laravel/framework/src/Illuminate/Database/Query/Builder.php b/vendor/laravel/framework/src/Illuminate/Database/Query/Builder.php index 3311c1ad6..670ea25d5 100755 --- a/vendor/laravel/framework/src/Illuminate/Database/Query/Builder.php +++ b/vendor/laravel/framework/src/Illuminate/Database/Query/Builder.php @@ -2078,7 +2078,7 @@ class Builder /** * Execute a query for a single record by ID. * - * @param int $id + * @param int|string $id * @param array $columns * @return mixed|static */ diff --git a/vendor/laravel/framework/src/Illuminate/Filesystem/FilesystemAdapter.php b/vendor/laravel/framework/src/Illuminate/Filesystem/FilesystemAdapter.php index 62f2b6732..6734ae18f 100644 --- a/vendor/laravel/framework/src/Illuminate/Filesystem/FilesystemAdapter.php +++ b/vendor/laravel/framework/src/Illuminate/Filesystem/FilesystemAdapter.php @@ -138,7 +138,11 @@ class FilesystemAdapter implements FilesystemContract, CloudFilesystemContract { $response = new StreamedResponse; - $disposition = $response->headers->makeDisposition($disposition, $name ?? basename($path)); + $filename = $name ?? basename($path); + + $disposition = $response->headers->makeDisposition( + $disposition, $filename, Str::ascii($filename) + ); $response->headers->replace($headers + [ 'Content-Type' => $this->mimeType($path), diff --git a/vendor/laravel/framework/src/Illuminate/Foundation/Application.php b/vendor/laravel/framework/src/Illuminate/Foundation/Application.php index 0c4dc35ee..7eb19c795 100755 --- a/vendor/laravel/framework/src/Illuminate/Foundation/Application.php +++ b/vendor/laravel/framework/src/Illuminate/Foundation/Application.php @@ -29,7 +29,7 @@ class Application extends Container implements ApplicationContract, HttpKernelIn * * @var string */ - const VERSION = '5.8.17'; + const VERSION = '5.8.18'; /** * The base path for the Laravel installation. diff --git a/vendor/laravel/framework/src/Illuminate/Foundation/Exceptions/views/illustrated-layout.blade.php b/vendor/laravel/framework/src/Illuminate/Foundation/Exceptions/views/illustrated-layout.blade.php index 5fab02b92..64eb7cbb8 100644 --- a/vendor/laravel/framework/src/Illuminate/Foundation/Exceptions/views/illustrated-layout.blade.php +++ b/vendor/laravel/framework/src/Illuminate/Foundation/Exceptions/views/illustrated-layout.blade.php @@ -1,459 +1,459 @@ - + - @yield('title') - + @yield('title') + - + diff --git a/vendor/laravel/framework/src/Illuminate/Foundation/Exceptions/views/minimal.blade.php b/vendor/laravel/framework/src/Illuminate/Foundation/Exceptions/views/minimal.blade.php index 1157501dc..b63ac2b37 100644 --- a/vendor/laravel/framework/src/Illuminate/Foundation/Exceptions/views/minimal.blade.php +++ b/vendor/laravel/framework/src/Illuminate/Foundation/Exceptions/views/minimal.blade.php @@ -8,7 +8,7 @@ - +