fix(sorts): simplify sorting registration

classes/hypeJunction/Lists/Collection.php

@@ -293,7 +293,7 @@ final public function getSearchFields() {
 
 		foreach ($classes as $class) {
 			if (!is_subclass_of($class, SearchFieldInterface::class)) {
-				throw new \InvalidParameterException($class . ' must implement ' . SearchFieldInterface::class);
+				throw new \InvalidArgumentException($class . ' must implement ' . SearchFieldInterface::class);
 			}
 
 			/* @var $class \hypeJunction\Lists\SearchFieldInterface */

classes/hypeJunction/Lists/DefaultEntityCollection.php

@@ -89,13 +89,13 @@ public function getURL() {
 	 */
 	public function getSortOptions() {
 		return [
-			Alpha::id() => Alpha::class,
-			TimeCreated::id() => TimeCreated::class,
-			LastAction::id() => LastAction::class,
-			LikesCount::id() => LikesCount::class,
-			FriendCount::id() => FriendCount::class,
-			MemberCount::id() => MemberCount::class,
-			ResponsesCount::id() => ResponsesCount::class,
+			Alpha::class,
+			TimeCreated::class,
+			LastAction::class,
+			LikesCount::class,
+			FriendCount::class,
+			MemberCount::class,
+			ResponsesCount::class,
 		];
 	}
 

classes/hypeJunction/Lists/EntityList.php

@@ -15,7 +15,7 @@ class EntityList extends Entities {
 	public function addSort($class, $direction = null) {
 
 		if (!is_subclass_of($class, SorterInterface::class)) {
-			throw new \InvalidParameterException($class . ' must implement ' . SorterInterface::class);
+			throw new \InvalidArgumentException($class . ' must implement ' . SorterInterface::class);
 		}
 
 		/* @var $class SorterInterface */
@@ -75,7 +75,7 @@ public function setSearchQuery($query = '') {
 	 */
 	public function addFilter($class, ElggEntity $target = null, array $params = []) {
 		if (!is_subclass_of($class, FilterInterface::class)) {
-			throw new \InvalidParameterException($class . ' must implement ' . FilterInterface::class);
+			throw new \InvalidArgumentException($class . ' must implement ' . FilterInterface::class);
 		}
 
 		/* @var $class FilterInterface */

classes/hypeJunction/Lists/SearchFields/Sort.php

@@ -2,6 +2,8 @@
 
 namespace hypeJunction\Lists\SearchFields;
 
+use hypeJunction\Lists\FilterInterface;
+
 class Sort extends SearchField {
 
 	/**
@@ -22,7 +24,12 @@ public function getField() {
 		}
 
 		$sort_options_values = [];
-		foreach ($sort_options as $id =>$class) {
+		foreach ($sort_options as $class) {
+			if (!is_subclass_of($class, FilterInterface::class)) {
+				throw new \InvalidArgumentException($class . ' must implement ' . FilterInterface::class);
+			}
+
+			$id = $class::id();
 			foreach (['asc', 'desc'] as $direction) {
 				$sort_options_values["$id::$direction"] = elgg_echo("sort:{$this->collection->getType()}:{$id}::{$direction}");
 			}