Added PHP 7.x compatibility for filter() again

aimeos · aimeos · commit 4a6d59a905e9 · 2025-03-05T09:51:08.000+01:00
diff --git a/src/Map.php b/src/Map.php
@@ -1526,7 +1526,12 @@ public function except( $keys ) : self
 	 */
 	public function filter( ?callable $callback = null ) : self
 	{
-		return new static( array_filter( $this->list(), $callback, ARRAY_FILTER_USE_BOTH ) );
+		// PHP 7.x compatibility
+		if( $callback ) {
+			return new static( array_filter( $this->list(), $callback, ARRAY_FILTER_USE_BOTH ) );
+		}
+
+		return new static( array_filter( $this->list() ) );
 	}
 
 

Original file line number	Diff line number	Diff line change
`@@ -1526,7 +1526,12 @@ public function except( $keys ) : self`
`1526`	`1526`	`*/`
`1527`	`1527`	`public function filter( ?callable $callback = null ) : self`
`1528`	`1528`	`{`
`1529`		`- return new static( array_filter( $this->list(), $callback, ARRAY_FILTER_USE_BOTH ) );`
	`1529`	`+ // PHP 7.x compatibility`
	`1530`	`+ if( $callback ) {`
	`1531`	`+ return new static( array_filter( $this->list(), $callback, ARRAY_FILTER_USE_BOTH ) );`
	`1532`	`+ }`
	`1533`	`+`
	`1534`	`+ return new static( array_filter( $this->list() ) );`
`1530`	`1535`	`}`
`1531`	`1536`
`1532`	`1537`