Meta: ensure arrays with meaning-less keys are typed as lists

Author: mabar

src/Meta/Compile/NodeCompileMeta.php

@@ -11,19 +11,19 @@
 abstract class NodeCompileMeta
 {
 
-	/** @var array<int, CallbackCompileMeta> */
+	/** @var list<CallbackCompileMeta> */
 	private array $callbacks;
 
-	/** @var array<int, DocMeta> */
+	/** @var list<DocMeta> */
 	private array $docs;
 
-	/** @var array<int, ModifierCompileMeta> */
+	/** @var list<ModifierCompileMeta> */
 	private array $modifiers;
 
 	/**
-	 * @param array<int, CallbackCompileMeta> $callbacks
-	 * @param array<int, DocMeta>             $docs
-	 * @param array<int, ModifierCompileMeta> $modifiers
+	 * @param list<CallbackCompileMeta> $callbacks
+	 * @param list<DocMeta> $docs
+	 * @param list<ModifierCompileMeta> $modifiers
 	 */
 	public function __construct(array $callbacks, array $docs, array $modifiers)
 	{
@@ -33,23 +33,23 @@ public function __construct(array $callbacks, array $docs, array $modifiers)
 	}
 
 	/**
-	 * @return array<int, CallbackCompileMeta>
+	 * @return list<CallbackCompileMeta>
 	 */
 	public function getCallbacks(): array
 	{
 		return $this->callbacks;
 	}
 
 	/**
-	 * @return array<int, DocMeta>
+	 * @return list<DocMeta>
 	 */
 	public function getDocs(): array
 	{
 		return $this->docs;
 	}
 
 	/**
-	 * @return array<int, ModifierCompileMeta>
+	 * @return list<ModifierCompileMeta>
 	 */
 	public function getModifiers(): array
 	{

src/Meta/MetaResolver.php

@@ -296,7 +296,7 @@ private function throwFieldMetaOutsideOfMappedObject(
 	/**
 	 * @param ReflectionClass<MappedObject>|ReflectionProperty $reflector
 	 * @param ReflectionClass<MappedObject>                    $classReflector
-	 * @return array<class-string<Callback<Args>>, array<int, CallbackRuntimeMeta<Args>>>
+	 * @return array<class-string<Callback<Args>>, list<CallbackRuntimeMeta<Args>>>
 	 */
 	private function resolveCallbacksMeta(
 		NodeCompileMeta $meta,
@@ -306,15 +306,15 @@ private function resolveCallbacksMeta(
 	): array
 	{
 		$array = [];
-		foreach ($meta->getCallbacks() as $key => $callback) {
+		foreach ($meta->getCallbacks() as $callback) {
 			$callbackMeta = $this->resolveCallbackMeta(
 				$callback,
 				$context,
 				$reflector,
 				$classReflector,
 			);
 
-			$array[$callbackMeta->type][$key] = $callbackMeta;
+			$array[$callbackMeta->type][] = $callbackMeta;
 		}
 
 		return $array;

src/Meta/Runtime/NodeRuntimeMeta.php

@@ -14,15 +14,15 @@
 abstract class NodeRuntimeMeta
 {
 
-	/** @var array<class-string<Callback<Args>>, array<int, CallbackRuntimeMeta<Args>>> */
+	/** @var array<class-string<Callback<Args>>, list<CallbackRuntimeMeta<Args>>> */
 	public array $callbacks;
 
 	/** @var array<string, DocMeta> */
 	public array $docs;
 
 	/**
 	 * @template T_ARGS of Args
-	 * @param array<class-string<Callback<T_ARGS>>, array<int, CallbackRuntimeMeta<T_ARGS>>> $callbacks
+	 * @param array<class-string<Callback<T_ARGS>>, list<CallbackRuntimeMeta<T_ARGS>>> $callbacks
 	 * @param array<string, DocMeta> $docs
 	 */
 	public function __construct(array $callbacks, array $docs)
@@ -32,7 +32,7 @@ public function __construct(array $callbacks, array $docs)
 	}
 
 	/**
-	 * @return array<int, CallbackRuntimeMeta<Args>>
+	 * @return list<CallbackRuntimeMeta<Args>>
 	 */
 	public function getCallbacksByType(string $type): array
 	{

src/Meta/Source/DefaultMetaSourceManager.php

@@ -5,17 +5,14 @@
 final class DefaultMetaSourceManager implements MetaSourceManager
 {
 
-	/** @var array<MetaSource> */
+	/** @var list<MetaSource> */
 	private array $sources;
 
 	public function addSource(MetaSource $source): void
 	{
 		$this->sources[] = $source;
 	}
 
-	/**
-	 * @return array<MetaSource>
-	 */
 	public function getAll(): array
 	{
 		return $this->sources;

src/Meta/Source/MetaSourceManager.php

@@ -6,7 +6,7 @@ interface MetaSourceManager
 {
 
 	/**
-	 * @return array<MetaSource>
+	 * @return list<MetaSource>
 	 */
 	public function getAll(): array;