ArrayList: throws exception when indexes are not integers

Author: dg

src/Utils/ArrayList.php

@@ -51,7 +51,7 @@ public function offsetSet($index, $value)
 		if ($index === null) {
 			$this->list[] = $value;
 
-		} elseif ($index < 0 || $index >= count($this->list)) {
+		} elseif (!is_int($index) || $index < 0 || $index >= count($this->list)) {
 			throw new Nette\OutOfRangeException('Offset invalid or out of range');
 
 		} else {
@@ -68,7 +68,7 @@ public function offsetSet($index, $value)
 	 */
 	public function offsetGet($index)
 	{
-		if ($index < 0 || $index >= count($this->list)) {
+		if (!is_int($index) || $index < 0 || $index >= count($this->list)) {
 			throw new Nette\OutOfRangeException('Offset invalid or out of range');
 		}
 		return $this->list[(int) $index];
@@ -81,7 +81,7 @@ public function offsetGet($index)
 	 */
 	public function offsetExists($index): bool
 	{
-		return $index >= 0 && $index < count($this->list);
+		return is_int($index) && $index >= 0 && $index < count($this->list);
 	}
 
 
@@ -93,7 +93,7 @@ public function offsetExists($index): bool
 	 */
 	public function offsetUnset($index)
 	{
-		if ($index < 0 || $index >= count($this->list)) {
+		if (!is_int($index) || $index < 0 || $index >= count($this->list)) {
 			throw new Nette\OutOfRangeException('Offset invalid or out of range');
 		}
 		array_splice($this->list, (int) $index, 1);

tests/Utils/ArrayList.phpt

@@ -83,6 +83,10 @@ test(function () {
 	Assert::exception(function () use ($list) {
 		$list[2] = true;
 	}, OutOfRangeException::class, 'Offset invalid or out of range');
+
+	Assert::exception(function () use ($list) {
+		$list['key'] = true;
+	}, OutOfRangeException::class, 'Offset invalid or out of range');
 });
 
 
@@ -98,6 +102,10 @@ test(function () {
 	Assert::exception(function () use ($list) {
 		$tmp = $list[2];
 	}, OutOfRangeException::class, 'Offset invalid or out of range');
+
+	Assert::exception(function () use ($list) {
+		$tmp = $list['key'];
+	}, OutOfRangeException::class, 'Offset invalid or out of range');
 });
 
 
@@ -113,4 +121,8 @@ test(function () {
 	Assert::exception(function () use ($list) {
 		unset($list[2]);
 	}, OutOfRangeException::class, 'Offset invalid or out of range');
+
+	Assert::exception(function () use ($list) {
+		unset($list['key']);
+	}, OutOfRangeException::class, 'Offset invalid or out of range');
 });