bug #59252 [Stopwatch] bug #54854 undefined key error when trying to fetch a mis… (Alex Niedre)

fabpot · fabpot · commit 04aa652a9af6 · 2024-12-30T19:58:00.000+01:00
This PR was merged into the 7.2 branch. Discussion ---------- [Stopwatch] bug #54854 undefined key error when trying to fetch a mis… | Q | A | ------------- | --- | Branch? | 7.2 | Bug fix? | yes | New feature? |no | Deprecations? |no | Issues | Fix #54854 | License | MIT A minor bug was introduced in the related referenced issue which caused an unidentified key exception to trigger when referencing a section that was missing. Reproduced here, as an example: https://3v4l.org/OFFLB This MR addresses that and adds a simple test to prevent the same mistake in the future. Commits ------- c3cf577 bug #54854 [Stopwatch] undefined key error when trying to fetch a missing section
diff --git a/src/Symfony/Component/Stopwatch/Stopwatch.php b/src/Symfony/Component/Stopwatch/Stopwatch.php
@@ -140,7 +140,7 @@ public function getEvent(string $name): StopwatchEvent
      */
     public function getSectionEvents(string $id): array
     {
-        return $this->sections[$id]->getEvents() ?? [];
+        return isset($this->sections[$id]) ? $this->sections[$id]->getEvents() : [];
     }
 
     /**
diff --git a/src/Symfony/Component/Stopwatch/Tests/StopwatchTest.php b/src/Symfony/Component/Stopwatch/Tests/StopwatchTest.php
@@ -187,4 +187,9 @@ public function testReset()
 
         $this->assertEquals(new Stopwatch(), $stopwatch);
     }
+
+    public function testShouldReturnEmptyArrayWhenSectionMissing()
+    {
+        $this->assertSame([], (new Stopwatch())->getSectionEvents('missing'));
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -140,7 +140,7 @@ public function getEvent(string $name): StopwatchEvent`
`140`	`140`	`*/`
`141`	`141`	`public function getSectionEvents(string $id): array`
`142`	`142`	`{`
`143`		`- return $this->sections[$id]->getEvents() ?? [];`
	`143`	`+ return isset($this->sections[$id]) ? $this->sections[$id]->getEvents() : [];`
`144`	`144`	`}`
`145`	`145`
`146`	`146`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -187,4 +187,9 @@ public function testReset()`
`187`	`187`
`188`	`188`	`$this->assertEquals(new Stopwatch(), $stopwatch);`
`189`	`189`	`}`
	`190`	`+`
	`191`	`+ public function testShouldReturnEmptyArrayWhenSectionMissing()`
	`192`	`+ {`
	`193`	`+ $this->assertSame([], (new Stopwatch())->getSectionEvents('missing'));`
	`194`	`+ }`
`190`	`195`	`}`