From b8b50379c3afa5bfc8eff62c943c66f55e9bf2f1 Mon Sep 17 00:00:00 2001
From: John Blackbourn <johnbillion@gmail.com>
Date: Wed, 10 Jul 2024 23:38:53 +0200
Subject: [PATCH] Get rid of more arrays.

---
 lib/class-argument-datalist.php |  9 +++++++++
 lib/class-hook-datalist.php     |  9 +++++++++
 lib/class-method-data.php       |  2 +-
 lib/class-method-datalist.php   |  9 +++++++++
 lib/class-property-datalist.php |  9 +++++++++
 lib/runner.php                  | 25 ++++++++-----------------
 6 files changed, 45 insertions(+), 18 deletions(-)
 create mode 100644 lib/class-argument-datalist.php
 create mode 100644 lib/class-hook-datalist.php
 create mode 100644 lib/class-method-datalist.php
 create mode 100644 lib/class-property-datalist.php

diff --git a/lib/class-argument-datalist.php b/lib/class-argument-datalist.php
new file mode 100644
index 0000000..30f7001
--- /dev/null
+++ b/lib/class-argument-datalist.php
@@ -0,0 +1,9 @@
+<?php
+
+namespace WP_Parser;
+
+final readonly class ArgumentDataList extends DTOList {
+	public function __construct( ArgumentData ...$data ) {
+		parent::__construct( ...$data );
+	}
+}
diff --git a/lib/class-hook-datalist.php b/lib/class-hook-datalist.php
new file mode 100644
index 0000000..48c65de
--- /dev/null
+++ b/lib/class-hook-datalist.php
@@ -0,0 +1,9 @@
+<?php
+
+namespace WP_Parser;
+
+final readonly class HookDataList extends DTOList {
+	public function __construct( HookData ...$data ) {
+		parent::__construct( ...$data );
+	}
+}
diff --git a/lib/class-method-data.php b/lib/class-method-data.php
index 72e99f4..37e01b4 100644
--- a/lib/class-method-data.php
+++ b/lib/class-method-data.php
@@ -15,7 +15,7 @@ public function __construct(
 		public bool $abstract,
 		public bool $static,
 		public string $visibility,
-		public array $arguments,
+		public ArgumentDataList $arguments,
 		public DocBlockData $doc,
 	) {}
 }
diff --git a/lib/class-method-datalist.php b/lib/class-method-datalist.php
new file mode 100644
index 0000000..cc720d8
--- /dev/null
+++ b/lib/class-method-datalist.php
@@ -0,0 +1,9 @@
+<?php
+
+namespace WP_Parser;
+
+final readonly class MethodDataList extends DTOList {
+	public function __construct( MethodData ...$data ) {
+		parent::__construct( ...$data );
+	}
+}
diff --git a/lib/class-property-datalist.php b/lib/class-property-datalist.php
new file mode 100644
index 0000000..6c101d2
--- /dev/null
+++ b/lib/class-property-datalist.php
@@ -0,0 +1,9 @@
+<?php
+
+namespace WP_Parser;
+
+final readonly class PropertyDataList extends DTOList {
+	public function __construct( PropertyData ...$data ) {
+		parent::__construct( ...$data );
+	}
+}
diff --git a/lib/runner.php b/lib/runner.php
index ebc48ce..eec14ff 100644
--- a/lib/runner.php
+++ b/lib/runner.php
@@ -144,10 +144,8 @@ function export_docblock( Property|Method|Hook|File|Function_|Class_ $element )
 
 /**
  * @param \phpDocumentor\Reflection\Php\Argument[] $arguments
- *
- * @return array<int, ArgumentData>
  */
-function export_arguments( array $arguments ) : array {
+function export_arguments( array $arguments ) : ArgumentDataList {
 	$output = array();
 
 	foreach ( $arguments as $argument ) {
@@ -158,15 +156,13 @@ function export_arguments( array $arguments ) : array {
 		);
 	}
 
-	return $output;
+	return new ArgumentDataList( ...$output );
 }
 
 /**
  * @param \phpDocumentor\Reflection\Php\Property[] $properties
- *
- * @return array<int, PropertyData>
  */
-function export_properties( array $properties ) : array {
+function export_properties( array $properties ) : PropertyDataList {
 	$out = array();
 
 	foreach ( $properties as $property ) {
@@ -181,19 +177,16 @@ function export_properties( array $properties ) : array {
 		);
 	}
 
-	return $out;
+	return new PropertyDataList( ...$out );
 }
 
 /**
  * @param \phpDocumentor\Reflection\Php\Method[] $methods
- *
- * @return array<int, MethodData>
  */
-function export_methods( array $methods ) : array {
+function export_methods( array $methods ) : MethodDataList {
 	$output = array();
 
 	foreach ( $methods as $method ) {
-
 		$namespace = get_namespace( $method->getFqsen() );
 
 		$output[] = new MethodData(
@@ -210,15 +203,13 @@ function export_methods( array $methods ) : array {
 		);
 	}
 
-	return $output;
+	return new MethodDataList( ...$output );
 }
 
 /**
  * @param HooksMetadata $hooks_metadata
- *
- * @return array<int, HookData>
  */
-function export_hooks( HooksMetadata $hooks_metadata ) : array {
+function export_hooks( HooksMetadata $hooks_metadata ) : HookDataList {
 	$out = array();
 
 	/** @var Hook $hook */
@@ -233,7 +224,7 @@ function export_hooks( HooksMetadata $hooks_metadata ) : array {
 		);
 	}
 
-	return $out;
+	return new HookDataList( ...$out );
 }
 
 /**