diff -u b/core/tests/Drupal/Tests/Component/Utility/SortArrayTest.php b/core/tests/Drupal/Tests/Component/Utility/SortArrayTest.php --- b/core/tests/Drupal/Tests/Component/Utility/SortArrayTest.php +++ b/core/tests/Drupal/Tests/Component/Utility/SortArrayTest.php @@ -324,13 +324,8 @@ * TRUE if the assertion passed; FALSE otherwise. */ protected function assertBothNegativePositiveOrZero($expected, $result) { - if (!is_numeric($expected) || !is_numeric($result)) { - return $this->assertTrue(FALSE, 'Parameters are not numeric.'); - } - if (($expected < 0 && $result < 0) || ($expected > 0 && $result > 0) || ($expected === 0 && $result === 0)) { - return $this->assertTrue(TRUE, 'Numbers are either both negative, both positive or both zero.'); - } - $this->assertTrue(FALSE, 'Numbers are not either both negative, both positive or both zero.'); + $this->assertTrue(is_numeric($expected) && is_numeric($result), 'Parameters are numeric.'); + $this->assertTrue(($expected < 0 && $result < 0) || ($expected > 0 && $result > 0) || ($expected === 0 && $result === 0), 'Numbers are not either both negative, both positive or both zero.'); } }