Merge branch '5.4' into 6.2

* 5.4:
  [Finder] Fix initial directory is opened twice
  typo fix
  Fix test
  Fix some return types in tests

Author: nicolas-grekas

Tests/Form/ChoiceList/ORMQueryBuilderLoaderTest.php

@@ -281,17 +281,11 @@ public function __construct()
     {
     }
 
-    /**
-     * @return array|string
-     */
-    public function getSQL()
+    public function getSQL(): array|string
     {
     }
 
-    /**
-     * @return Result|int
-     */
-    protected function _doExecute()
+    protected function _doExecute(): Result|int
     {
     }
 }