Fixed key/value mapping in rekey()

aimeos · aimeos · commit c9508bcf63df · 2025-03-04T14:56:13.000+01:00
diff --git a/src/Map.php b/src/Map.php
@@ -4013,10 +4013,9 @@ public function reject( $callback = true ) : self
 	public function rekey( callable $callback ) : self
 	{
 		$list = $this->list();
-		$keys = array_keys( $list );
-		$newKeys = array_map( $callback, $list, $keys );
+		$newKeys = array_map( $callback, $list, array_keys( $list ) );
 
-		return new static( array_combine( $newKeys, $list ) ?: [] );
+		return new static( array_combine( $newKeys, array_values( $list ) ) );
 	}
 
 

Original file line number	Diff line number	Diff line change
`@@ -4013,10 +4013,9 @@ public function reject( $callback = true ) : self`
`4013`	`4013`	`public function rekey( callable $callback ) : self`
`4014`	`4014`	`{`
`4015`	`4015`	`$list = $this->list();`
`4016`		`- $keys = array_keys( $list );`
`4017`		`- $newKeys = array_map( $callback, $list, $keys );`
	`4016`	`+ $newKeys = array_map( $callback, $list, array_keys( $list ) );`
`4018`	`4017`
`4019`		`- return new static( array_combine( $newKeys, $list ) ?: [] );`
	`4018`	`+ return new static( array_combine( $newKeys, array_values( $list ) ) );`
`4020`	`4019`	`}`
`4021`	`4020`
`4022`	`4021`