Fix sort different array keys (#202)

kalimatas · Aug 9, 2023 · c76f0b8 · c76f0b8
1 parent 44942ae
commit c76f0b8
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 2 deletions.
diff --git a/src/Liquid/StandardFilters.php b/src/Liquid/StandardFilters.php
@@ -559,11 +559,11 @@ public static function sort($input, $property = null)
 			$first = reset($input);
 			if ($first !== false && is_array($first) && array_key_exists($property, $first)) {
 				uasort($input, function ($a, $b) use ($property) {
-					if ($a[$property] == $b[$property]) {
+					if (($a[$property] ?? 0) == ($b[$property] ?? 0)) {
 						return 0;
 					}
 
-					return $a[$property] < $b[$property] ? -1 : 1;
+					return ($a[$property] ?? 0) < ($b[$property] ?? 0) ? -1 : 1;
 				});
 			}
 		}

diff --git a/tests/Liquid/StandardFiltersTest.php b/tests/Liquid/StandardFiltersTest.php
@@ -591,6 +591,28 @@ public function testSort()
 		$this->assertEquals($expected, array_values(StandardFilters::sort(new \ArrayIterator($original), 'b')));
 	}
 
+	public function testSortWithoutKey()
+	{
+		// Sort by inner key
+		$original = array(
+			array('a' => 20, 'b' => 10),
+			array('a' => 45, 'b' => 5),
+			array('a' => 40, 'b' => 6),
+			array('a' => 30, 'b' => 48),
+			array('a' => 50),
+		);
+		$expected = array(
+			array('a' => 50),
+			array('a' => 45, 'b' => 5),
+			array('a' => 40, 'b' => 6),
+			array('a' => 20, 'b' => 10),
+			array('a' => 30, 'b' => 48),
+		);
+
+		$this->assertEquals($expected, array_values(StandardFilters::sort($original, 'b')));
+		$this->assertEquals($expected, array_values(StandardFilters::sort(new \ArrayIterator($original), 'b')));
+	}
+
 	/*
 
 		I've commented this out as its not one of the Ruby Standard Filters