diff --git a/core/lib/Drupal/Component/Utility/SortArray.php b/core/lib/Drupal/Component/Utility/SortArray.php index a8d9f00..79688ec 100644 --- a/core/lib/Drupal/Component/Utility/SortArray.php +++ b/core/lib/Drupal/Component/Utility/SortArray.php @@ -93,34 +93,6 @@ public static function sortByTitleProperty($a, $b) { } /** - * Sorts a structured array firstly by weight, then by title. - * - * @param array $a - * The first item to compare. - * @param array $b - * The second item to compare. - * @param string $weight_key - * (optional) The weight key to use. Defaults to 'weight'. - * @param string $title_key - * (optional) The title key to use. Defaults to 'title'. - * - * @return int - * The comparison result for uasort(). - */ - public static function sortByWeightAndTitleKey($a, $b, $weight_key = 'weight', $title_key = 'title') { - $a = (array) $a; - $b = (array) $b; - - $weight_cmp = static::sortByKeyInt($a, $b, $weight_key); - - if ($weight_cmp === 0) { - return static::sortByKeyString($a, $b, $title_key); - } - - return $weight_cmp; - } - - /** * Sorts a string array item by an arbitrary key. * * @param array $a diff --git a/core/lib/Drupal/Core/Language/Language.php b/core/lib/Drupal/Core/Language/Language.php index 5a79fa9..75a6356 100644 --- a/core/lib/Drupal/Core/Language/Language.php +++ b/core/lib/Drupal/Core/Language/Language.php @@ -233,7 +233,6 @@ public static function sort(&$languages) { } return ($a->getWeight() < $b->getWeight()) ? -1 : 1; - //return SortArray::sortByWeightAndTitleGetter($a, $b, 'getWeight', 'getName'); }); } diff --git a/core/tests/Drupal/Tests/Component/Utility/SortArrayTest.php b/core/tests/Drupal/Tests/Component/Utility/SortArrayTest.php index ed1357b..7c25b4b 100644 --- a/core/tests/Drupal/Tests/Component/Utility/SortArrayTest.php +++ b/core/tests/Drupal/Tests/Component/Utility/SortArrayTest.php @@ -315,23 +315,6 @@ public function providerSortByTitleProperty() { } /** - * Tests SortArray::sortByWeightAndTitleKey() input against expected output. - * - * @dataProvider providerTestSortByWeightAndTitleKey - * - * @param array $a - * The first input item for comparison. - * @param array $b - * The second item for comparison. - * @param integer $expected - * The expected output from calling the method. - */ - public function testSortByWeightAndTitleKey($a, $b, $expected) { - $result = SortArray::sortByWeightAndTitleKey($a, $b); - $this->assertEquals($expected, $result); - } - - /** * Data provider for testSortByWeightAndTitleKey. * * @return array