symfony
diff --git a/‎UPGRADE-5.0.md
Copy file name to clipboardExpand all lines: UPGRADE-5.0.md
+1-1Lines changed: 1 addition & 1 deletion b/‎UPGRADE-5.0.md
Copy file name to clipboardExpand all lines: UPGRADE-5.0.md
+1-1Lines changed: 1 addition & 1 deletion
diff --git a/‎src/Symfony/Component/HttpKernel/Debug/TraceableEventDispatcher.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/HttpKernel/Debug/TraceableEventDispatcher.php
+9Lines changed: 9 additions & 0 deletions b/‎src/Symfony/Component/HttpKernel/Debug/TraceableEventDispatcher.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/HttpKernel/Debug/TraceableEventDispatcher.php
+9Lines changed: 9 additions & 0 deletions
diff --git a/‎src/Symfony/Component/HttpKernel/Tests/Debug/TraceableEventDispatcherTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/HttpKernel/Tests/Debug/TraceableEventDispatcherTest.php
+1-3Lines changed: 1 addition & 3 deletions b/‎src/Symfony/Component/HttpKernel/Tests/Debug/TraceableEventDispatcherTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/HttpKernel/Tests/Debug/TraceableEventDispatcherTest.php
+1-3Lines changed: 1 addition & 3 deletions
diff --git a/‎src/Symfony/Component/Stopwatch/CHANGELOG.md
Copy file name to clipboardExpand all lines: src/Symfony/Component/Stopwatch/CHANGELOG.md
+5Lines changed: 5 additions & 0 deletions b/‎src/Symfony/Component/Stopwatch/CHANGELOG.md
Copy file name to clipboardExpand all lines: src/Symfony/Component/Stopwatch/CHANGELOG.md
+5Lines changed: 5 additions & 0 deletions
diff --git a/‎src/Symfony/Component/Stopwatch/Stopwatch.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Stopwatch/Stopwatch.php
+1-1Lines changed: 1 addition & 1 deletion b/‎src/Symfony/Component/Stopwatch/Stopwatch.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Stopwatch/Stopwatch.php
+1-1Lines changed: 1 addition & 1 deletion
@@ -480,7 +480,7 @@ Serializer
 Stopwatch
 ---------
 
- * Removed support of passing `null` as 1st (`$id`) argument of `Section::get()` method, pass a valid child section identifier instead.
+ * Removed support for passing `null` as 1st (`$id`) argument of `Section::get()` method, pass a valid child section identifier instead.
 
 Translation
 -----------
 
@@ -41,6 +41,9 @@ protected function beforeDispatch(string $eventName, $event)
                 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 @@ protected function afterDispatch(string $eventName, $event)
                 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) {
 
@@ -62,15 +62,13 @@ public function testStopwatchCheckControllerOnRequestEvent()
     public function testStopwatchStopControllerOnRequestEvent()
     {
         $stopwatch = $this->getMockBuilder('Symfony\Component\Stopwatch\Stopwatch')
-            ->setMethods(['isStarted', 'stop', 'stopSection'])
+            ->setMethods(['isStarted', 'stop'])
             ->getMock();
         $stopwatch->expects($this->once())
             ->method('isStarted')
             ->willReturn(true);
         $stopwatch->expects($this->once())
             ->method('stop');
-        $stopwatch->expects($this->once())
-            ->method('stopSection');
 
         $dispatcher = new TraceableEventDispatcher(new EventDispatcher(), $stopwatch);
 
 
@@ -1,6 +1,11 @@
 CHANGELOG
 =========
 
+5.0.0
+-----
+
+ * Removed support for passing `null` as 1st (`$id`) argument of `Section::get()` method, pass a valid child section identifier instead.
+
 4.4.0
 -----
 
 
@@ -81,7 +81,7 @@ public function openSection(string $id = null)
      *
      * @throws \LogicException When there's no started section to be stopped
      */
-    public function stopSection(?string $id)
+    public function stopSection(string $id)
     {
         $this->stop('__section__');
Original file line number	Diff line number	Diff line change
`@@ -81,7 +81,7 @@ public function openSection(string $id = null)`
`81`	`81`	`*`
`82`	`82`	`* @throws \LogicException When there's no started section to be stopped`
`83`	`83`	`*/`
`84`		`- public function stopSection(?string $id)`
	`84`	`+ public function stopSection(string $id)`
`85`	`85`	`{`
`86`	`86`	`$this->stop('__section__');`
`87`	`87`