feature: consistent type safety within arrays

closes #49
PhpGt · Feb 14, 2025 · e85a696 · e85a696
1 parent 299bb5b
commit e85a696
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 8 deletions.
diff --git a/src/DataObject.php b/src/DataObject.php
@@ -114,8 +114,8 @@ public function asObject():object {
 	}
 
 	/**
-	 * @param array $array
-	 * @return array
+	 * @param array<mixed> $array
+	 * @return array<mixed>
 	 */
 	private function checkArrayType(array $array, string $type):array {
 		$errorMessage = "";

diff --git a/test/phpunit/DataObjectTest.php b/test/phpunit/DataObjectTest.php
@@ -455,7 +455,7 @@ public function testGetArrayFixedTypeString() {
 		}
 	}
 
-	public function testGetArrayFixedTypeString_typeErrorWithObject() {
+	public function testGetArrayFixedTypeString_typeErrorWithDateTime() {
 		$wordsArray = [
 			"one",
 			"two",
@@ -465,7 +465,7 @@ public function testGetArrayFixedTypeString_typeErrorWithObject() {
 		];
 		$sut = (new DataObject())
 			->with("words", $wordsArray);
-		self::expectExceptionMessage("Array index 3 must be of type string, DateTime given");
+		self::expectExceptionMessage("Object of class DateTime could not be converted to string");
 		$sut->getArray("words", "string");
 	}
 
@@ -478,7 +478,7 @@ public function testGetArrayFixedTypeDateTime() {
 			->with("dates", $dateArray);
 		$array = $sut->getArray("dates", DateTimeInterface::class);
 		foreach($array as $i => $value) {
-			self::assertInstanceOf(DateTimeInterface::class, $value);
+			self::assertInstanceOf(DateTime::class, $value);
 		}
 	}
 
@@ -492,9 +492,8 @@ public function testGetArrayFixedTypesMismatch() {
 		];
 		$sut = (new DataObject())
 			->with("timestamps", $timestampArray);
-		self::expectException(TypeError::class);
-		self::expectExceptionMessage("Array index 2 must be of type int, double given");
-		$sut->getArray("timestamps", "int");
+		$array = $sut->getArray("timestamps", "int");
+		self::assertSame(49999, $array[2]);
 	}
 
 	public function testGetArray_nullableType():void {