page: fix PHP 8 compatibility issues

- passing null to ReflectionClass::hasMethod() is deprecated - passing null as $haystack to strpos() is deprecated
tigron · Mar 18, 2023 · 000419d · 000419d
1 parent 945c635
commit 000419d
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/lib/Skeleton/Pager/Page.php b/lib/Skeleton/Pager/Page.php
@@ -54,7 +54,7 @@ public static function get_paged($sort = null, $direction = 'asc', $page = 1, $e
 		$object = new \ReflectionClass(get_class());
 		if (is_callable($sort)) {
 			$sorter = 'object';
-		} elseif ($object->hasMethod($sort)) {
+		} elseif ($sort !== null && $object->hasMethod($sort)) {
 			$sorter = 'object';
 		} else {
 			$sorter = 'db';
@@ -124,8 +124,11 @@ public static function get_paged($sort = null, $direction = 'asc', $page = 1, $e
 				}
 			}
 		}
-		$sort_condition_table = substr($sort, 0, strpos($sort, '.'));
-		$condition_joins[$sort_condition_table] = $sort_condition_table;
+
+		if ($sort !== null) {
+			$sort_condition_table = substr($sort, 0, strpos($sort, '.'));
+			$condition_joins[$sort_condition_table] = $sort_condition_table;
+		}
 
 		do {
 			$remove_count = 0;