From c2c86bd4c119aef9acad3c1cc4440b8d3a5922cb Mon Sep 17 00:00:00 2001
From: Markus Staab <markus.staab@redaxo.de>
Date: Tue, 2 Apr 2024 11:05:10 +0200
Subject: [PATCH 1/3] Type arrays in TestSuite

---
 .psalm/baseline.xml         | 10 +---------
 src/Framework/TestSuite.php |  6 ++++++
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/.psalm/baseline.xml b/.psalm/baseline.xml
index af95aba47d9..0b96fc99077 100644
--- a/.psalm/baseline.xml
+++ b/.psalm/baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<files psalm-version="5.23.0@005e3184fb6de4350a873b9b8c4dc3cede9db762">
+<files psalm-version="5.23.1@8471a896ccea3526b26d082f4461eeea467f10a4">
   <file src="src/Event/Dispatcher/DirectDispatcher.php">
     <UndefinedInterfaceMethod>
       <code><![CDATA[notify]]></code>
@@ -563,14 +563,6 @@
     <ArgumentTypeCoercion>
       <code><![CDATA[$this->name]]></code>
     </ArgumentTypeCoercion>
-    <LessSpecificReturnStatement>
-      <code><![CDATA[$this->providedTests]]></code>
-      <code><![CDATA[$this->requiredTests]]></code>
-    </LessSpecificReturnStatement>
-    <MoreSpecificReturnType>
-      <code><![CDATA[list<ExecutionOrderDependency>]]></code>
-      <code><![CDATA[list<ExecutionOrderDependency>]]></code>
-    </MoreSpecificReturnType>
   </file>
   <file src="src/Logging/JUnit/JunitXmlLogger.php">
     <InvalidPropertyAssignmentValue>
diff --git a/src/Framework/TestSuite.php b/src/Framework/TestSuite.php
index 1b2113cb7de..08c8874df8b 100644
--- a/src/Framework/TestSuite.php
+++ b/src/Framework/TestSuite.php
@@ -64,12 +64,18 @@ class TestSuite implements IteratorAggregate, Reorderable, SelfDescribing, Test
      * @psalm-var array<string,list<Test>>
      */
     private array $groups         = [];
+    /**
+     * @psalm-var list<ExecutionOrderDependency>|null
+     */
     private ?array $requiredTests = null;
 
     /**
      * @psalm-var list<Test>
      */
     private array $tests             = [];
+    /**
+     * @psalm-var list<ExecutionOrderDependency>|null
+     */
     private ?array $providedTests    = null;
     private ?Factory $iteratorFilter = null;
 

From 8bc635b994237668944f29b6879f818d5cbfe6b9 Mon Sep 17 00:00:00 2001
From: Markus Staab <markus.staab@redaxo.de>
Date: Tue, 2 Apr 2024 11:10:14 +0200
Subject: [PATCH 2/3] use "?" over union-with-null

---
 src/Framework/TestSuite.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Framework/TestSuite.php b/src/Framework/TestSuite.php
index 08c8874df8b..f676d191b23 100644
--- a/src/Framework/TestSuite.php
+++ b/src/Framework/TestSuite.php
@@ -65,7 +65,7 @@ class TestSuite implements IteratorAggregate, Reorderable, SelfDescribing, Test
      */
     private array $groups         = [];
     /**
-     * @psalm-var list<ExecutionOrderDependency>|null
+     * @psalm-var ?list<ExecutionOrderDependency>
      */
     private ?array $requiredTests = null;
 
@@ -74,7 +74,7 @@ class TestSuite implements IteratorAggregate, Reorderable, SelfDescribing, Test
      */
     private array $tests             = [];
     /**
-     * @psalm-var list<ExecutionOrderDependency>|null
+     * @psalm-var ?list<ExecutionOrderDependency>
      */
     private ?array $providedTests    = null;
     private ?Factory $iteratorFilter = null;

From b24c32d0bca9e16979dd486d16ca64261bddbdf9 Mon Sep 17 00:00:00 2001
From: Markus Staab <markus.staab@redaxo.de>
Date: Tue, 2 Apr 2024 11:10:54 +0200
Subject: [PATCH 3/3] cs

---
 src/Framework/TestSuite.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/Framework/TestSuite.php b/src/Framework/TestSuite.php
index f676d191b23..ad40f4282b4 100644
--- a/src/Framework/TestSuite.php
+++ b/src/Framework/TestSuite.php
@@ -63,7 +63,8 @@ class TestSuite implements IteratorAggregate, Reorderable, SelfDescribing, Test
     /**
      * @psalm-var array<string,list<Test>>
      */
-    private array $groups         = [];
+    private array $groups = [];
+
     /**
      * @psalm-var ?list<ExecutionOrderDependency>
      */
@@ -72,7 +73,8 @@ class TestSuite implements IteratorAggregate, Reorderable, SelfDescribing, Test
     /**
      * @psalm-var list<Test>
      */
-    private array $tests             = [];
+    private array $tests = [];
+
     /**
      * @psalm-var ?list<ExecutionOrderDependency>
      */