From 38640a758bc054abfd2b70ff286e2be994d083ff Mon Sep 17 00:00:00 2001
From: Markus Staab <maggus.staab@googlemail.com>
Date: Mon, 16 Sep 2024 17:52:25 +0200
Subject: [PATCH 1/4] Make Collector return type more explicit

---
 src/Collector/Collector/AbstractCollector.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Collector/Collector/AbstractCollector.php b/src/Collector/Collector/AbstractCollector.php
index db715595..ea0b6d1b 100644
--- a/src/Collector/Collector/AbstractCollector.php
+++ b/src/Collector/Collector/AbstractCollector.php
@@ -35,7 +35,7 @@ public static function loadData(CollectedDataNode $collectedDataNode, string $cl
 
     /**
      * @phpstan-param array<T> $items
-     * @return ?A[]
+     * @return non-empty-array<A>|null
      */
     protected function collectItems(array $items): ?array
     {

From 06775e2db826fcc761e3a59633b49bede51eefd3 Mon Sep 17 00:00:00 2001
From: Markus Staab <maggus.staab@googlemail.com>
Date: Mon, 16 Sep 2024 17:56:02 +0200
Subject: [PATCH 2/4] Update AbstractLatteContextCollector.php

---
 src/LatteContext/Collector/AbstractLatteContextCollector.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/LatteContext/Collector/AbstractLatteContextCollector.php b/src/LatteContext/Collector/AbstractLatteContextCollector.php
index 50a6e7b3..f170d641 100644
--- a/src/LatteContext/Collector/AbstractLatteContextCollector.php
+++ b/src/LatteContext/Collector/AbstractLatteContextCollector.php
@@ -35,7 +35,7 @@ abstract public function getNodeTypes(): array;
 
     /**
      * @param Node $node
-     * @phpstan-return null|array<T|CollectedError>
+     * @phpstan-return null|non-empty-array<T|CollectedError>
      */
     abstract public function collectData(Node $node, Scope $scope): ?array;
 }

From eabdca8f6b5c76f24df068787da5ac8bba78e61a Mon Sep 17 00:00:00 2001
From: Markus Staab <maggus.staab@googlemail.com>
Date: Mon, 16 Sep 2024 17:56:37 +0200
Subject: [PATCH 3/4] Update MethodReturnCollector.php

---
 src/LatteContext/Collector/MethodReturnCollector.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/LatteContext/Collector/MethodReturnCollector.php b/src/LatteContext/Collector/MethodReturnCollector.php
index 25f08194..5078bcc8 100644
--- a/src/LatteContext/Collector/MethodReturnCollector.php
+++ b/src/LatteContext/Collector/MethodReturnCollector.php
@@ -21,7 +21,7 @@ public function getNodeTypes(): array
 
     /**
      * @param Return_ $node
-     * @phpstan-return null|CollectedMethod[]
+     * @phpstan-return null|non-empty-array<CollectedMethod>
      */
     public function collectData(Node $node, Scope $scope): ?array
     {

From 5c07ecd80ba50af458b2300ac6f607281510927c Mon Sep 17 00:00:00 2001
From: Markus Staab <maggus.staab@googlemail.com>
Date: Mon, 16 Sep 2024 17:57:29 +0200
Subject: [PATCH 4/4] Update FormCollector.php

---
 src/LatteContext/Collector/FormCollector.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/LatteContext/Collector/FormCollector.php b/src/LatteContext/Collector/FormCollector.php
index a27c13f0..2cbd1352 100644
--- a/src/LatteContext/Collector/FormCollector.php
+++ b/src/LatteContext/Collector/FormCollector.php
@@ -38,7 +38,7 @@ public function getNodeTypes(): array
 
     /**
      * @param ClassMethod $node
-     * @phpstan-return null|CollectedForm[]
+     * @phpstan-return null|non-empty-array<CollectedForm>
      */
     public function collectData(Node $node, Scope $scope): ?array
     {
@@ -51,7 +51,7 @@ public function collectData(Node $node, Scope $scope): ?array
     }
 
     /**
-     * @phpstan-return null|CollectedForm[]
+     * @phpstan-return null|non-empty-array<CollectedForm>
      */
     private function findCreateComponent(ClassMethod $node, ClassReflection $classReflection, Scope $scope): ?array
     {