diff options
| author | Greg Roach <fisharebest@webtrees.net> | 2019-09-07 08:17:24 +0100 |
|---|---|---|
| committer | Greg Roach <fisharebest@webtrees.net> | 2019-09-07 08:17:24 +0100 |
| commit | 43e2cc54543d9f79c9805f752e78e25c351646ff (patch) | |
| tree | f8f252a8f0f6ff6061c177456865102c50a04810 /vendor/symfony/http-kernel/Debug | |
| parent | 4e96702fabf715ae955aafd54002fb5c57a109cf (diff) | |
| download | webtrees-43e2cc54543d9f79c9805f752e78e25c351646ff.tar.gz webtrees-43e2cc54543d9f79c9805f752e78e25c351646ff.tar.bz2 webtrees-43e2cc54543d9f79c9805f752e78e25c351646ff.zip | |
Update vendor dependencies
Diffstat (limited to 'vendor/symfony/http-kernel/Debug')
| -rw-r--r-- | vendor/symfony/http-kernel/Debug/FileLinkFormatter.php | 2 | ||||
| -rw-r--r-- | vendor/symfony/http-kernel/Debug/TraceableEventDispatcher.php | 9 |
2 files changed, 11 insertions, 0 deletions
diff --git a/vendor/symfony/http-kernel/Debug/FileLinkFormatter.php b/vendor/symfony/http-kernel/Debug/FileLinkFormatter.php index eb24167529..236bbd09b8 100644 --- a/vendor/symfony/http-kernel/Debug/FileLinkFormatter.php +++ b/vendor/symfony/http-kernel/Debug/FileLinkFormatter.php @@ -101,5 +101,7 @@ class FileLinkFormatter ]; } } + + return null; } } diff --git a/vendor/symfony/http-kernel/Debug/TraceableEventDispatcher.php b/vendor/symfony/http-kernel/Debug/TraceableEventDispatcher.php index 6c96afdff3..ce4ddb35d3 100644 --- a/vendor/symfony/http-kernel/Debug/TraceableEventDispatcher.php +++ b/vendor/symfony/http-kernel/Debug/TraceableEventDispatcher.php @@ -41,6 +41,9 @@ class TraceableEventDispatcher extends BaseTraceableEventDispatcher break; case KernelEvents::TERMINATE: $token = $event->getResponse()->headers->get('X-Debug-Token'); + if (null === $token) { + break; + } // There is a very special case when using built-in AppCache class as kernel wrapper, in the case // of an ESI request leading to a `stale` response [B] inside a `fresh` cached response [A]. // In this case, `$token` contains the [B] debug token, but the open `stopwatch` section ID @@ -65,12 +68,18 @@ class TraceableEventDispatcher extends BaseTraceableEventDispatcher break; case KernelEvents::RESPONSE: $token = $event->getResponse()->headers->get('X-Debug-Token'); + if (null === $token) { + break; + } $this->stopwatch->stopSection($token); break; case KernelEvents::TERMINATE: // In the special case described in the `preDispatch` method above, the `$token` section // does not exist, then closing it throws an exception which must be caught. $token = $event->getResponse()->headers->get('X-Debug-Token'); + if (null === $token) { + break; + } try { $this->stopwatch->stopSection($token); } catch (\LogicException $e) { |
