diff options
| author | Greg Roach <fisharebest@webtrees.net> | 2019-04-03 17:17:02 +0100 |
|---|---|---|
| committer | Greg Roach <fisharebest@webtrees.net> | 2019-04-03 17:19:16 +0100 |
| commit | fe08511b142ebcf03abe6e407f6746de3b4db362 (patch) | |
| tree | 26257d4287110ca9a57c9f5c0e0382c597b0fa98 /vendor | |
| parent | 89d880da80f202b08b9fe837f38a87b48c6d2a97 (diff) | |
| download | webtrees-fe08511b142ebcf03abe6e407f6746de3b4db362.tar.gz webtrees-fe08511b142ebcf03abe6e407f6746de3b4db362.tar.bz2 webtrees-fe08511b142ebcf03abe6e407f6746de3b4db362.zip | |
Update vendor dependencies
Diffstat (limited to 'vendor')
27 files changed, 138 insertions, 109 deletions
diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json index be9e4d64e3..fcace69a83 100644 --- a/vendor/composer/installed.json +++ b/vendor/composer/installed.json @@ -894,17 +894,17 @@ }, { "name": "illuminate/cache", - "version": "v5.8.8", - "version_normalized": "5.8.8.0", + "version": "v5.8.9", + "version_normalized": "5.8.9.0", "source": { "type": "git", "url": "https://github.com/illuminate/cache.git", - "reference": "684bb0f3424c0dc1ff8c2cf9b3bd8429c83eab20" + "reference": "40463fe8f7f49d3f6cf6cf4aa1759fa76f29b797" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/illuminate/cache/zipball/684bb0f3424c0dc1ff8c2cf9b3bd8429c83eab20", - "reference": "684bb0f3424c0dc1ff8c2cf9b3bd8429c83eab20", + "url": "https://api.github.com/repos/illuminate/cache/zipball/40463fe8f7f49d3f6cf6cf4aa1759fa76f29b797", + "reference": "40463fe8f7f49d3f6cf6cf4aa1759fa76f29b797", "shasum": "" }, "require": { @@ -917,7 +917,7 @@ "illuminate/filesystem": "Required to use the file cache driver (5.8.*).", "illuminate/redis": "Required to use the redis cache driver (5.8.*)." }, - "time": "2019-03-21T13:40:24+00:00", + "time": "2019-03-28T14:00:15+00:00", "type": "library", "extra": { "branch-alias": { @@ -945,8 +945,8 @@ }, { "name": "illuminate/container", - "version": "v5.8.8", - "version_normalized": "5.8.8.0", + "version": "v5.8.9", + "version_normalized": "5.8.9.0", "source": { "type": "git", "url": "https://github.com/illuminate/container.git", @@ -992,17 +992,17 @@ }, { "name": "illuminate/contracts", - "version": "v5.8.8", - "version_normalized": "5.8.8.0", + "version": "v5.8.9", + "version_normalized": "5.8.9.0", "source": { "type": "git", "url": "https://github.com/illuminate/contracts.git", - "reference": "3e3a9a654adbf798e05491a5dbf90112df1effde" + "reference": "7224ed316427ae5f67c4888679bbf7f6e7773660" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/illuminate/contracts/zipball/3e3a9a654adbf798e05491a5dbf90112df1effde", - "reference": "3e3a9a654adbf798e05491a5dbf90112df1effde", + "url": "https://api.github.com/repos/illuminate/contracts/zipball/7224ed316427ae5f67c4888679bbf7f6e7773660", + "reference": "7224ed316427ae5f67c4888679bbf7f6e7773660", "shasum": "" }, "require": { @@ -1010,7 +1010,7 @@ "psr/container": "^1.0", "psr/simple-cache": "^1.0" }, - "time": "2019-02-18T18:37:54+00:00", + "time": "2019-03-06T19:39:19+00:00", "type": "library", "extra": { "branch-alias": { @@ -1038,17 +1038,17 @@ }, { "name": "illuminate/database", - "version": "v5.8.8", - "version_normalized": "5.8.8.0", + "version": "v5.8.9", + "version_normalized": "5.8.9.0", "source": { "type": "git", "url": "https://github.com/illuminate/database.git", - "reference": "05a0f0b4588b6376bfc7213e1a781dd8120e7c8e" + "reference": "4d5fd9170c8e8afba599cffd20744b7d8787ac79" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/illuminate/database/zipball/05a0f0b4588b6376bfc7213e1a781dd8120e7c8e", - "reference": "05a0f0b4588b6376bfc7213e1a781dd8120e7c8e", + "url": "https://api.github.com/repos/illuminate/database/zipball/4d5fd9170c8e8afba599cffd20744b7d8787ac79", + "reference": "4d5fd9170c8e8afba599cffd20744b7d8787ac79", "shasum": "" }, "require": { @@ -1066,7 +1066,7 @@ "illuminate/filesystem": "Required to use the migrations (5.8.*).", "illuminate/pagination": "Required to paginate the result set (5.8.*)." }, - "time": "2019-03-26T17:13:31+00:00", + "time": "2019-04-01T05:04:37+00:00", "type": "library", "extra": { "branch-alias": { @@ -1100,17 +1100,17 @@ }, { "name": "illuminate/support", - "version": "v5.8.8", - "version_normalized": "5.8.8.0", + "version": "v5.8.9", + "version_normalized": "5.8.9.0", "source": { "type": "git", "url": "https://github.com/illuminate/support.git", - "reference": "5bce502f0bdb97ebbda0eb4f6cb75455d5a01529" + "reference": "e275519c58246cc4011c798f9b0a0f83aae2aab7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/illuminate/support/zipball/5bce502f0bdb97ebbda0eb4f6cb75455d5a01529", - "reference": "5bce502f0bdb97ebbda0eb4f6cb75455d5a01529", + "url": "https://api.github.com/repos/illuminate/support/zipball/e275519c58246cc4011c798f9b0a0f83aae2aab7", + "reference": "e275519c58246cc4011c798f9b0a0f83aae2aab7", "shasum": "" }, "require": { @@ -1132,7 +1132,7 @@ "symfony/var-dumper": "Required to use the dd function (^4.2).", "vlucas/phpdotenv": "Required to use the env helper (^3.3)." }, - "time": "2019-03-25T21:36:23+00:00", + "time": "2019-04-01T19:02:05+00:00", "type": "library", "extra": { "branch-alias": { @@ -2102,17 +2102,17 @@ }, { "name": "symfony/cache", - "version": "v4.2.4", - "version_normalized": "4.2.4.0", + "version": "v4.2.5", + "version_normalized": "4.2.5.0", "source": { "type": "git", "url": "https://github.com/symfony/cache.git", - "reference": "b5c650406953f2f44a37c4f3ac66152fafc22c66" + "reference": "3172c1e81fab8a21b35732ad8545e09877bb73d9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/cache/zipball/b5c650406953f2f44a37c4f3ac66152fafc22c66", - "reference": "b5c650406953f2f44a37c4f3ac66152fafc22c66", + "url": "https://api.github.com/repos/symfony/cache/zipball/3172c1e81fab8a21b35732ad8545e09877bb73d9", + "reference": "3172c1e81fab8a21b35732ad8545e09877bb73d9", "shasum": "" }, "require": { @@ -2142,7 +2142,7 @@ "symfony/dependency-injection": "~3.4|~4.1", "symfony/var-dumper": "^4.1.1" }, - "time": "2019-02-23T15:17:42+00:00", + "time": "2019-04-01T07:32:59+00:00", "type": "library", "extra": { "branch-alias": { @@ -2251,17 +2251,17 @@ }, { "name": "symfony/debug", - "version": "v4.2.4", - "version_normalized": "4.2.4.0", + "version": "v4.2.5", + "version_normalized": "4.2.5.0", "source": { "type": "git", "url": "https://github.com/symfony/debug.git", - "reference": "de73f48977b8eaf7ce22814d66e43a1662cc864f" + "reference": "43ce8ab34c734dcc8a4af576cb86711daab964c5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/debug/zipball/de73f48977b8eaf7ce22814d66e43a1662cc864f", - "reference": "de73f48977b8eaf7ce22814d66e43a1662cc864f", + "url": "https://api.github.com/repos/symfony/debug/zipball/43ce8ab34c734dcc8a4af576cb86711daab964c5", + "reference": "43ce8ab34c734dcc8a4af576cb86711daab964c5", "shasum": "" }, "require": { @@ -2274,7 +2274,7 @@ "require-dev": { "symfony/http-kernel": "~3.4|~4.0" }, - "time": "2019-03-03T18:11:24+00:00", + "time": "2019-03-10T17:09:50+00:00", "type": "library", "extra": { "branch-alias": { @@ -2309,17 +2309,17 @@ }, { "name": "symfony/event-dispatcher", - "version": "v4.2.4", - "version_normalized": "4.2.4.0", + "version": "v4.2.5", + "version_normalized": "4.2.5.0", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher.git", - "reference": "3354d2e6af986dd71f68b4e5cf4a933ab58697fb" + "reference": "ca5af306fbc37f3cf597e91bc9cfa0c7d3f33544" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/3354d2e6af986dd71f68b4e5cf4a933ab58697fb", - "reference": "3354d2e6af986dd71f68b4e5cf4a933ab58697fb", + "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/ca5af306fbc37f3cf597e91bc9cfa0c7d3f33544", + "reference": "ca5af306fbc37f3cf597e91bc9cfa0c7d3f33544", "shasum": "" }, "require": { @@ -2340,7 +2340,7 @@ "symfony/dependency-injection": "", "symfony/http-kernel": "" }, - "time": "2019-02-23T15:17:42+00:00", + "time": "2019-03-30T15:58:42+00:00", "type": "library", "extra": { "branch-alias": { @@ -2375,8 +2375,8 @@ }, { "name": "symfony/expression-language", - "version": "v4.2.4", - "version_normalized": "4.2.4.0", + "version": "v4.2.5", + "version_normalized": "4.2.5.0", "source": { "type": "git", "url": "https://github.com/symfony/expression-language.git", @@ -2428,17 +2428,17 @@ }, { "name": "symfony/http-foundation", - "version": "v4.2.4", - "version_normalized": "4.2.4.0", + "version": "v4.2.5", + "version_normalized": "4.2.5.0", "source": { "type": "git", "url": "https://github.com/symfony/http-foundation.git", - "reference": "850a667d6254ccf6c61d853407b16f21c4579c77" + "reference": "5b7ab6beaa5b053b8d3c9b13367ada9b292e12e1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-foundation/zipball/850a667d6254ccf6c61d853407b16f21c4579c77", - "reference": "850a667d6254ccf6c61d853407b16f21c4579c77", + "url": "https://api.github.com/repos/symfony/http-foundation/zipball/5b7ab6beaa5b053b8d3c9b13367ada9b292e12e1", + "reference": "5b7ab6beaa5b053b8d3c9b13367ada9b292e12e1", "shasum": "" }, "require": { @@ -2449,7 +2449,7 @@ "predis/predis": "~1.0", "symfony/expression-language": "~3.4|~4.0" }, - "time": "2019-02-26T08:03:39+00:00", + "time": "2019-03-30T15:58:42+00:00", "type": "library", "extra": { "branch-alias": { @@ -2484,17 +2484,17 @@ }, { "name": "symfony/http-kernel", - "version": "v4.2.4", - "version_normalized": "4.2.4.0", + "version": "v4.2.5", + "version_normalized": "4.2.5.0", "source": { "type": "git", "url": "https://github.com/symfony/http-kernel.git", - "reference": "895ceccaa8149f9343e6134e607c21da42d73b7a" + "reference": "e8b940bbeebf0f96789b5d17d9d77f8b2613960b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-kernel/zipball/895ceccaa8149f9343e6134e607c21da42d73b7a", - "reference": "895ceccaa8149f9343e6134e607c21da42d73b7a", + "url": "https://api.github.com/repos/symfony/http-kernel/zipball/e8b940bbeebf0f96789b5d17d9d77f8b2613960b", + "reference": "e8b940bbeebf0f96789b5d17d9d77f8b2613960b", "shasum": "" }, "require": { @@ -2540,7 +2540,7 @@ "symfony/dependency-injection": "", "symfony/var-dumper": "" }, - "time": "2019-03-03T19:38:09+00:00", + "time": "2019-04-02T19:03:51+00:00", "type": "library", "extra": { "branch-alias": { @@ -2878,17 +2878,17 @@ }, { "name": "symfony/translation", - "version": "v4.2.4", - "version_normalized": "4.2.4.0", + "version": "v4.2.5", + "version_normalized": "4.2.5.0", "source": { "type": "git", "url": "https://github.com/symfony/translation.git", - "reference": "748464177a77011f8f4cdd076773862ce4915f8f" + "reference": "e46933cc31b68f51f7fc5470fb55550407520f56" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/translation/zipball/748464177a77011f8f4cdd076773862ce4915f8f", - "reference": "748464177a77011f8f4cdd076773862ce4915f8f", + "url": "https://api.github.com/repos/symfony/translation/zipball/e46933cc31b68f51f7fc5470fb55550407520f56", + "reference": "e46933cc31b68f51f7fc5470fb55550407520f56", "shasum": "" }, "require": { @@ -2918,7 +2918,7 @@ "symfony/config": "", "symfony/yaml": "" }, - "time": "2019-02-27T03:31:50+00:00", + "time": "2019-04-01T14:13:08+00:00", "type": "library", "extra": { "branch-alias": { @@ -2953,8 +2953,8 @@ }, { "name": "symfony/var-exporter", - "version": "v4.2.4", - "version_normalized": "4.2.4.0", + "version": "v4.2.5", + "version_normalized": "4.2.5.0", "source": { "type": "git", "url": "https://github.com/symfony/var-exporter.git", diff --git a/vendor/illuminate/cache/DatabaseStore.php b/vendor/illuminate/cache/DatabaseStore.php index e5c7cd1467..a7de61bb1e 100755 --- a/vendor/illuminate/cache/DatabaseStore.php +++ b/vendor/illuminate/cache/DatabaseStore.php @@ -202,7 +202,7 @@ class DatabaseStore implements Store */ public function forever($key, $value) { - return $this->put($key, $value, 5256000); + return $this->put($key, $value, 315360000); } /** diff --git a/vendor/illuminate/contracts/Mail/Mailable.php b/vendor/illuminate/contracts/Mail/Mailable.php index 2612070011..882b216771 100644 --- a/vendor/illuminate/contracts/Mail/Mailable.php +++ b/vendor/illuminate/contracts/Mail/Mailable.php @@ -25,7 +25,7 @@ interface Mailable /** * Deliver the queued message after the given delay. * - * @param \DateTime|int $delay + * @param \DateTimeInterface|\DateInterval|int $delay * @param \Illuminate\Contracts\Queue\Factory $queue * @return mixed */ diff --git a/vendor/illuminate/database/Eloquent/SoftDeletes.php b/vendor/illuminate/database/Eloquent/SoftDeletes.php index 1cd27c1c09..232a41f6aa 100644 --- a/vendor/illuminate/database/Eloquent/SoftDeletes.php +++ b/vendor/illuminate/database/Eloquent/SoftDeletes.php @@ -59,7 +59,7 @@ trait SoftDeletes if ($this->forceDeleting) { $this->exists = false; - return $this->newModelQuery()->where($this->getKeyName(), $this->getKey())->forceDelete(); + return $this->setKeysForSaveQuery($this->newModelQuery())->forceDelete(); } return $this->runSoftDelete(); @@ -72,7 +72,7 @@ trait SoftDeletes */ protected function runSoftDelete() { - $query = $this->newModelQuery()->where($this->getKeyName(), $this->getKey()); + $query = $this->setKeysForSaveQuery($this->newModelQuery()); $time = $this->freshTimestamp(); diff --git a/vendor/illuminate/support/Collection.php b/vendor/illuminate/support/Collection.php index c6b8d2dd6f..278038a0b2 100644 --- a/vendor/illuminate/support/Collection.php +++ b/vendor/illuminate/support/Collection.php @@ -184,7 +184,7 @@ class Collection implements ArrayAccess, Arrayable, Countable, IteratorAggregate $count = $values->count(); - if ($count == 0) { + if ($count === 0) { return; } diff --git a/vendor/illuminate/support/Testing/Fakes/QueueFake.php b/vendor/illuminate/support/Testing/Fakes/QueueFake.php index 14144c0de1..bfb02158bb 100644 --- a/vendor/illuminate/support/Testing/Fakes/QueueFake.php +++ b/vendor/illuminate/support/Testing/Fakes/QueueFake.php @@ -263,7 +263,7 @@ class QueueFake extends QueueManager implements Queue /** * Push a new job onto the queue after a delay. * - * @param \DateTime|int $delay + * @param \DateTimeInterface|\DateInterval|int $delay * @param string $job * @param mixed $data * @param string $queue @@ -291,7 +291,7 @@ class QueueFake extends QueueManager implements Queue * Push a new job onto the queue after a delay. * * @param string $queue - * @param \DateTime|int $delay + * @param \DateTimeInterface|\DateInterval|int $delay * @param string $job * @param mixed $data * @return mixed diff --git a/vendor/symfony/cache/Adapter/SimpleCacheAdapter.php b/vendor/symfony/cache/Adapter/SimpleCacheAdapter.php index 2e6d03a1f0..5a836a3dbf 100644 --- a/vendor/symfony/cache/Adapter/SimpleCacheAdapter.php +++ b/vendor/symfony/cache/Adapter/SimpleCacheAdapter.php @@ -13,13 +13,12 @@ namespace Symfony\Component\Cache\Adapter; use Psr\SimpleCache\CacheInterface; use Symfony\Component\Cache\PruneableInterface; -use Symfony\Component\Cache\ResettableInterface; use Symfony\Component\Cache\Traits\ProxyTrait; /** * @author Nicolas Grekas <p@tchwork.com> */ -class SimpleCacheAdapter extends AbstractAdapter implements PruneableInterface, ResettableInterface +class SimpleCacheAdapter extends AbstractAdapter implements PruneableInterface { use ProxyTrait; diff --git a/vendor/symfony/cache/LockRegistry.php b/vendor/symfony/cache/LockRegistry.php index e0318e900c..ef49805ea0 100644 --- a/vendor/symfony/cache/LockRegistry.php +++ b/vendor/symfony/cache/LockRegistry.php @@ -23,7 +23,7 @@ use Symfony\Contracts\Cache\ItemInterface; * * @author Nicolas Grekas <p@tchwork.com> */ -class LockRegistry +final class LockRegistry { private static $openedFiles = []; private static $lockedFiles = []; @@ -74,7 +74,7 @@ class LockRegistry return $previousFiles; } - public static function compute(callable $callback, ItemInterface $item, bool &$save, CacheInterface $pool) + public static function compute(callable $callback, ItemInterface $item, bool &$save, CacheInterface $pool, \Closure $setMetadata = null) { $key = self::$files ? crc32($item->getKey()) % \count(self::$files) : -1; @@ -88,7 +88,18 @@ class LockRegistry if (flock($lock, LOCK_EX | LOCK_NB)) { self::$lockedFiles[$key] = true; - return $callback($item, $save); + $value = $callback($item, $save); + + if ($save) { + if ($setMetadata) { + $setMetadata($item); + } + + $pool->save($item->set($value)); + $save = false; + } + + return $value; } // if we failed the race, retry locking in blocking mode to wait for the winner flock($lock, LOCK_SH); @@ -125,6 +136,6 @@ class LockRegistry restore_error_handler(); } - self::$openedFiles[$key] = $h ?: @fopen(self::$files[$key], 'r'); + return self::$openedFiles[$key] = $h ?: @fopen(self::$files[$key], 'r'); } } diff --git a/vendor/symfony/cache/Traits/ContractsTrait.php b/vendor/symfony/cache/Traits/ContractsTrait.php index 8b1eb5a244..bd7be08dd5 100644 --- a/vendor/symfony/cache/Traits/ContractsTrait.php +++ b/vendor/symfony/cache/Traits/ContractsTrait.php @@ -40,7 +40,7 @@ trait ContractsTrait public function setCallbackWrapper(?callable $callbackWrapper): callable { $previousWrapper = $this->callbackWrapper; - $this->callbackWrapper = $callbackWrapper ?? function (callable $callback, ItemInterface $item, bool &$save, CacheInterface $pool) { + $this->callbackWrapper = $callbackWrapper ?? function (callable $callback, ItemInterface $item, bool &$save, CacheInterface $pool, \Closure $setMetadata) { return $callback($item, $save); }; @@ -56,17 +56,19 @@ trait ContractsTrait static $setMetadata; $setMetadata = $setMetadata ?? \Closure::bind( - function (AdapterInterface $pool, ItemInterface $item, float $startTime) { + function (CacheItem $item, float $startTime, ?array &$metadata) { if ($item->expiry > $endTime = microtime(true)) { - $item->newMetadata[ItemInterface::METADATA_EXPIRY] = $item->expiry; - $item->newMetadata[ItemInterface::METADATA_CTIME] = 1000 * (int) ($endTime - $startTime); + $item->newMetadata[CacheItem::METADATA_EXPIRY] = $metadata[CacheItem::METADATA_EXPIRY] = $item->expiry; + $item->newMetadata[CacheItem::METADATA_CTIME] = $metadata[CacheItem::METADATA_CTIME] = 1000 * (int) ($endTime - $startTime); + } else { + unset($metadata[CacheItem::METADATA_EXPIRY], $metadata[CacheItem::METADATA_CTIME]); } }, null, CacheItem::class ); - return $this->contractsGet($pool, $key, function (CacheItem $item, bool &$save) use ($pool, $callback, $setMetadata) { + return $this->contractsGet($pool, $key, function (CacheItem $item, bool &$save) use ($pool, $callback, $setMetadata, &$metadata) { // don't wrap nor save recursive calls if (null === $callbackWrapper = $this->callbackWrapper) { $value = $callback($item, $save); @@ -78,8 +80,10 @@ trait ContractsTrait $startTime = microtime(true); try { - $value = $callbackWrapper($callback, $item, $save, $pool); - $setMetadata($pool, $item, $startTime); + $value = $callbackWrapper($callback, $item, $save, $pool, function (CacheItem $item) use ($setMetadata, $startTime, &$metadata) { + $setMetadata($item, $startTime, $metadata); + }); + $setMetadata($item, $startTime, $metadata); return $value; } finally { diff --git a/vendor/symfony/cache/Traits/PhpFilesTrait.php b/vendor/symfony/cache/Traits/PhpFilesTrait.php index b57addb54f..37d25f87a9 100644 --- a/vendor/symfony/cache/Traits/PhpFilesTrait.php +++ b/vendor/symfony/cache/Traits/PhpFilesTrait.php @@ -133,7 +133,7 @@ trait PhpFilesTrait */ protected function doHave($id) { - if ($this->appendOnly && $this->values[$id]) { + if ($this->appendOnly && isset($this->values[$id])) { return true; } diff --git a/vendor/symfony/cache/Traits/RedisTrait.php b/vendor/symfony/cache/Traits/RedisTrait.php index 8da2e257a8..350a54360e 100644 --- a/vendor/symfony/cache/Traits/RedisTrait.php +++ b/vendor/symfony/cache/Traits/RedisTrait.php @@ -385,7 +385,7 @@ trait RedisTrait return true; } - if ($this->redis instanceof \Predis\Client) { + if ($this->redis instanceof \Predis\Client && $this->redis->getConnection() instanceof ClusterInterface) { $this->pipeline(function () use ($ids) { foreach ($ids as $id) { yield 'del' => [$id]; diff --git a/vendor/symfony/debug/DebugClassLoader.php b/vendor/symfony/debug/DebugClassLoader.php index 2816c4fba7..e648bf60c5 100644 --- a/vendor/symfony/debug/DebugClassLoader.php +++ b/vendor/symfony/debug/DebugClassLoader.php @@ -232,7 +232,7 @@ class DebugClassLoader // Detect annotations on the class if (false !== $doc = $refl->getDocComment()) { foreach (['final', 'deprecated', 'internal'] as $annotation) { - if (false !== \strpos($doc, $annotation) && preg_match('#\n\s+\* @'.$annotation.'(?:( .+?)\.?)?\r?\n\s+\*(?: @|/$)#s', $doc, $notice)) { + if (false !== \strpos($doc, $annotation) && preg_match('#\n\s+\* @'.$annotation.'(?:( .+?)\.?)?\r?\n\s+\*(?: @|/$|\r?\n)#s', $doc, $notice)) { self::${$annotation}[$class] = isset($notice[1]) ? preg_replace('#\.?\r?\n( \*)? *(?= |\r?\n|$)#', '', $notice[1]) : ''; } } @@ -257,7 +257,7 @@ class DebugClassLoader if (!isset(self::$checkedClasses[$use])) { $this->checkClass($use); } - if (isset(self::$deprecated[$use]) && \strncmp($ns, \str_replace('_', '\\', $use), $len)) { + if (isset(self::$deprecated[$use]) && \strncmp($ns, \str_replace('_', '\\', $use), $len) && !isset(self::$deprecated[$class])) { $type = class_exists($class, false) ? 'class' : (interface_exists($class, false) ? 'interface' : 'trait'); $verb = class_exists($use, false) || interface_exists($class, false) ? 'extends' : (interface_exists($use, false) ? 'implements' : 'uses'); @@ -324,7 +324,7 @@ class DebugClassLoader $finalOrInternal = false; foreach (['final', 'internal'] as $annotation) { - if (false !== \strpos($doc, $annotation) && preg_match('#\n\s+\* @'.$annotation.'(?:( .+?)\.?)?\r?\n\s+\*(?: @|/$)#s', $doc, $notice)) { + if (false !== \strpos($doc, $annotation) && preg_match('#\n\s+\* @'.$annotation.'(?:( .+?)\.?)?\r?\n\s+\*(?: @|/$|\r?\n)#s', $doc, $notice)) { $message = isset($notice[1]) ? preg_replace('#\.?\r?\n( \*)? *(?= |\r?\n|$)#', '', $notice[1]) : ''; self::${$annotation.'Methods'}[$class][$method->name] = [$class, $message]; $finalOrInternal = true; diff --git a/vendor/symfony/debug/Tests/Fixtures/FinalClasses.php b/vendor/symfony/debug/Tests/Fixtures/FinalClasses.php index 0f51f9f46f..4c2b0aaf35 100644 --- a/vendor/symfony/debug/Tests/Fixtures/FinalClasses.php +++ b/vendor/symfony/debug/Tests/Fixtures/FinalClasses.php @@ -30,6 +30,7 @@ class FinalClass3 /** * @final + * * @author John Doe */ class FinalClass4 @@ -63,7 +64,6 @@ class FinalClass6 * @author John Doe * * @final another - * * multiline comment... * * @return string @@ -76,6 +76,7 @@ class FinalClass7 /** * @author John Doe * @final + * * @return string */ class FinalClass8 diff --git a/vendor/symfony/debug/Tests/Fixtures/FinalMethod.php b/vendor/symfony/debug/Tests/Fixtures/FinalMethod.php index 03e47e8a7a..60a28b24c2 100644 --- a/vendor/symfony/debug/Tests/Fixtures/FinalMethod.php +++ b/vendor/symfony/debug/Tests/Fixtures/FinalMethod.php @@ -13,6 +13,8 @@ class FinalMethod /** * @final + * + * @return int */ public function finalMethod2() { diff --git a/vendor/symfony/event-dispatcher/DependencyInjection/RegisterListenersPass.php b/vendor/symfony/event-dispatcher/DependencyInjection/RegisterListenersPass.php index 674890aa53..cf2e93aec0 100644 --- a/vendor/symfony/event-dispatcher/DependencyInjection/RegisterListenersPass.php +++ b/vendor/symfony/event-dispatcher/DependencyInjection/RegisterListenersPass.php @@ -105,7 +105,7 @@ class RegisterListenersPass implements CompilerPassInterface $definition->addMethodCall('addListener', $args); if (isset($this->hotPathEvents[$args[0]])) { - $container->getDefinition($id)->addTag('container.hot_path'); + $container->getDefinition($id)->addTag($this->hotPathTagName); } } $extractingDispatcher->listeners = []; diff --git a/vendor/symfony/http-foundation/CHANGELOG.md b/vendor/symfony/http-foundation/CHANGELOG.md index 55eed3f7eb..88ebc33a5d 100644 --- a/vendor/symfony/http-foundation/CHANGELOG.md +++ b/vendor/symfony/http-foundation/CHANGELOG.md @@ -190,10 +190,10 @@ CHANGELOG * Added `FlashBag`. Flashes expire when retrieved by `get()` or `all()`. This implementation is ESI compatible. * Added `AutoExpireFlashBag` (default) to replicate Symfony 2.0.x auto expire - behaviour of messages auto expiring after one page page load. Messages must + behavior of messages auto expiring after one page page load. Messages must be retrieved by `get()` or `all()`. * Added `Symfony\Component\HttpFoundation\Attribute\AttributeBag` to replicate - attributes storage behaviour from 2.0.x (default). + attributes storage behavior from 2.0.x (default). * Added `Symfony\Component\HttpFoundation\Attribute\NamespacedAttributeBag` for namespace session attributes. * Flash API can stores messages in an array so there may be multiple messages diff --git a/vendor/symfony/http-foundation/Request.php b/vendor/symfony/http-foundation/Request.php index 7f44aab1d5..7cf2120a51 100644 --- a/vendor/symfony/http-foundation/Request.php +++ b/vendor/symfony/http-foundation/Request.php @@ -1330,7 +1330,7 @@ class Request * * @param string|null $default The default format * - * @return string The request format + * @return string|null The request format */ public function getRequestFormat($default = 'html') { diff --git a/vendor/symfony/http-foundation/Response.php b/vendor/symfony/http-foundation/Response.php index 26b3f209d5..c3ac19d4a9 100644 --- a/vendor/symfony/http-foundation/Response.php +++ b/vendor/symfony/http-foundation/Response.php @@ -306,9 +306,9 @@ class Response } // Check if we need to send extra expire info headers - if ('1.0' == $this->getProtocolVersion() && false !== strpos($this->headers->get('Cache-Control'), 'no-cache')) { - $this->headers->set('pragma', 'no-cache'); - $this->headers->set('expires', -1); + if ('1.0' == $this->getProtocolVersion() && false !== strpos($headers->get('Cache-Control'), 'no-cache')) { + $headers->set('pragma', 'no-cache'); + $headers->set('expires', -1); } $this->ensureIEOverSSLCompatibility($request); diff --git a/vendor/symfony/http-foundation/Session/Session.php b/vendor/symfony/http-foundation/Session/Session.php index 867ceba97f..62ce948b68 100644 --- a/vendor/symfony/http-foundation/Session/Session.php +++ b/vendor/symfony/http-foundation/Session/Session.php @@ -193,7 +193,9 @@ class Session implements SessionInterface, \IteratorAggregate, \Countable */ public function save() { - $this->storage->save(); + if ($this->isStarted()) { + $this->storage->save(); + } } /** diff --git a/vendor/symfony/http-foundation/Tests/Session/SessionTest.php b/vendor/symfony/http-foundation/Tests/Session/SessionTest.php index afa00fc7c3..e75b3321b0 100644 --- a/vendor/symfony/http-foundation/Tests/Session/SessionTest.php +++ b/vendor/symfony/http-foundation/Tests/Session/SessionTest.php @@ -260,4 +260,14 @@ class SessionTest extends TestCase $flash->get('hello'); $this->assertTrue($this->session->isEmpty()); } + + public function testSaveIfNotStarted() + { + $storage = $this->getMockBuilder('Symfony\Component\HttpFoundation\Session\Storage\SessionStorageInterface')->getMock(); + $session = new Session($storage); + + $storage->expects($this->once())->method('isStarted')->willReturn(false); + $storage->expects($this->never())->method('save'); + $session->save(); + } } diff --git a/vendor/symfony/http-kernel/EventListener/DebugHandlersListener.php b/vendor/symfony/http-kernel/EventListener/DebugHandlersListener.php index 529375a5dd..a51d9ecb88 100644 --- a/vendor/symfony/http-kernel/EventListener/DebugHandlersListener.php +++ b/vendor/symfony/http-kernel/EventListener/DebugHandlersListener.php @@ -105,7 +105,7 @@ class DebugHandlersListener implements EventSubscriberInterface if (method_exists($kernel = $event->getKernel(), 'terminateWithException')) { $request = $event->getRequest(); $hasRun = &$this->hasTerminatedWithException; - $this->exceptionHandler = function (\Exception $e) use ($kernel, $request, &$hasRun) { + $this->exceptionHandler = static function (\Exception $e) use ($kernel, $request, &$hasRun) { if ($hasRun) { throw $e; } diff --git a/vendor/symfony/http-kernel/HttpCache/ResponseCacheStrategy.php b/vendor/symfony/http-kernel/HttpCache/ResponseCacheStrategy.php index 862bac557d..1efad607e8 100644 --- a/vendor/symfony/http-kernel/HttpCache/ResponseCacheStrategy.php +++ b/vendor/symfony/http-kernel/HttpCache/ResponseCacheStrategy.php @@ -215,7 +215,7 @@ class ResponseCacheStrategy implements ResponseCacheStrategyInterface } if (false !== $this->ageDirectives[$directive]) { - $value = $value - $age; + $value -= $age; $this->ageDirectives[$directive] = null !== $this->ageDirectives[$directive] ? min($this->ageDirectives[$directive], $value) : $value; } } diff --git a/vendor/symfony/http-kernel/Kernel.php b/vendor/symfony/http-kernel/Kernel.php index 6737caee9e..762e4b5995 100644 --- a/vendor/symfony/http-kernel/Kernel.php +++ b/vendor/symfony/http-kernel/Kernel.php @@ -73,11 +73,11 @@ abstract class Kernel implements KernelInterface, RebootableInterface, Terminabl private $requestStackSize = 0; private $resetServices = false; - const VERSION = '4.2.4'; - const VERSION_ID = 40204; + const VERSION = '4.2.5'; + const VERSION_ID = 40205; const MAJOR_VERSION = 4; const MINOR_VERSION = 2; - const RELEASE_VERSION = 4; + const RELEASE_VERSION = 5; const EXTRA_VERSION = ''; const END_OF_MAINTENANCE = '07/2019'; diff --git a/vendor/symfony/http-kernel/Log/Logger.php b/vendor/symfony/http-kernel/Log/Logger.php index 2344aa0a54..3969487b77 100644 --- a/vendor/symfony/http-kernel/Log/Logger.php +++ b/vendor/symfony/http-kernel/Log/Logger.php @@ -40,7 +40,7 @@ class Logger extends AbstractLogger public function __construct(string $minLevel = null, $output = 'php://stderr', callable $formatter = null) { if (null === $minLevel) { - $minLevel = LogLevel::WARNING; + $minLevel = 'php://stdout' === $output || 'php://stderr' === $output ? LogLevel::CRITICAL : LogLevel::WARNING; if (isset($_ENV['SHELL_VERBOSITY']) || isset($_SERVER['SHELL_VERBOSITY'])) { switch ((int) (isset($_ENV['SHELL_VERBOSITY']) ? $_ENV['SHELL_VERBOSITY'] : $_SERVER['SHELL_VERBOSITY'])) { diff --git a/vendor/symfony/translation/Loader/XliffFileLoader.php b/vendor/symfony/translation/Loader/XliffFileLoader.php index 99306b86b1..ed97cae290 100644 --- a/vendor/symfony/translation/Loader/XliffFileLoader.php +++ b/vendor/symfony/translation/Loader/XliffFileLoader.php @@ -58,7 +58,7 @@ class XliffFileLoader implements LoaderInterface $xliffVersion = XliffUtils::getVersionNumber($dom); if ($errors = XliffUtils::validateSchema($dom)) { - throw new InvalidResourceException(sprintf('Invalid resource provided: "%s"; Errors: %s', $xliffVersion, XliffUtils::getErrorsAsString($errors))); + throw new InvalidResourceException(sprintf('Invalid resource provided: "%s"; Errors: %s', $resource, XliffUtils::getErrorsAsString($errors))); } if ('1.2' === $xliffVersion) { diff --git a/vendor/symfony/translation/Resources/data/parents.json b/vendor/symfony/translation/Resources/data/parents.json index 09709d2302..6e45d9f388 100644 --- a/vendor/symfony/translation/Resources/data/parents.json +++ b/vendor/symfony/translation/Resources/data/parents.json @@ -7,7 +7,7 @@ "en_AT": "en_150", "en_AU": "en_001", "en_BB": "en_001", - "en_BE": "en_001", + "en_BE": "en_150", "en_BM": "en_001", "en_BS": "en_001", "en_BW": "en_001", diff --git a/vendor/symfony/translation/Tests/TranslatorCacheTest.php b/vendor/symfony/translation/Tests/TranslatorCacheTest.php index 58e1936ed3..ec909aaa38 100644 --- a/vendor/symfony/translation/Tests/TranslatorCacheTest.php +++ b/vendor/symfony/translation/Tests/TranslatorCacheTest.php @@ -202,7 +202,7 @@ class TranslatorCacheTest extends TestCase * messages provided by the loader. This must also be the case when these catalogues * are (internally) read from a cache. * - * Optimizations inside the translator must not change this behaviour. + * Optimizations inside the translator must not change this behavior. */ /* |
