Arrays::insertAfter() & insertBefore() fixed when $key is null

Author: dg

src/Utils/Arrays.php

@@ -136,7 +136,7 @@ public static function last(array $array)
 	 */
 	public static function insertBefore(array &$array, $key, array $inserted): void
 	{
-		$offset = (int) self::getKeyOffset($array, $key);
+		$offset = $key === null ? 0 : (int) self::getKeyOffset($array, $key);
 		$array = array_slice($array, 0, $offset, true)
 			+ $inserted
 			+ array_slice($array, $offset, count($array), true);
@@ -150,11 +150,12 @@ public static function insertBefore(array &$array, $key, array $inserted): void
 	 */
 	public static function insertAfter(array &$array, $key, array $inserted): void
 	{
-		$offset = self::getKeyOffset($array, $key);
-		$offset = $offset === null ? count($array) : $offset + 1;
-		$array = array_slice($array, 0, $offset, true)
+		if ($key === null || ($offset = self::getKeyOffset($array, $key)) === null) {
+			$offset = count($array) - 1;
+		}
+		$array = array_slice($array, 0, $offset + 1, true)
 			+ $inserted
-			+ array_slice($array, $offset, count($array), true);
+			+ array_slice($array, $offset + 1, count($array), true);
 	}
 
 

tests/Utils/Arrays.insertBefore().phpt

@@ -37,10 +37,10 @@ test('First item', function () use ($arr) {
 	Arrays::insertAfter($dolly, null, ['new' => 'value']);
 	Assert::same([
 		'' => 'first',
-		'new' => 'value',
 		0 => 'second',
 		1 => 'third',
 		7 => 'fourth',
+		'new' => 'value',
 	], $dolly);
 });