Merge branch '5.4' into 6.2

nicolas-grekas · nicolas-grekas · commit 29d44094ec4d · 2023-07-06T08:53:05.000+02:00
* 5.4:
  [Finder] Fix initial directory is opened twice
  typo fix
  Fix test
  Fix some return types in tests
diff --git a/Tests/Controller/ProfilerControllerTest.php b/Tests/Controller/ProfilerControllerTest.php
@@ -445,10 +445,7 @@ public function testDumpPanel()
         $this->assertDefaultPanel($dumpDataCollector->getName(), $profile);
     }
 
-    /**
-     * @return MockObject&DumpDataCollector
-     */
-    private function createDumpDataCollector(): MockObject
+    private function createDumpDataCollector(): MockObject&DumpDataCollector
     {
         $dumpDataCollector = $this->createMock(DumpDataCollector::class);
         $dumpDataCollector

Original file line number	Diff line number	Diff line change
`@@ -445,10 +445,7 @@ public function testDumpPanel()`
`445`	`445`	`$this->assertDefaultPanel($dumpDataCollector->getName(), $profile);`
`446`	`446`	`}`
`447`	`447`
`448`		`- /**`
`449`		`- * @return MockObject&DumpDataCollector`
`450`		`- */`
`451`		`- private function createDumpDataCollector(): MockObject`
	`448`	`+ private function createDumpDataCollector(): MockObject&DumpDataCollector`
`452`	`449`	`{`
`453`	`450`	`$dumpDataCollector = $this->createMock(DumpDataCollector::class);`
`454`	`451`	`$dumpDataCollector`