Add function param/return types, fix a lot more phpstorm complaints

1 files changed, 10 insertions, 7 deletions

diff --git a/modules-available/statistics/inc/statisticsfilterset.inc.php b/modules-available/statistics/inc/statisticsfilterset.inc.php
index 102cba42..26595e93 100644
--- a/modules-available/statistics/inc/statisticsfilterset.inc.php
+++ b/modules-available/statistics/inc/statisticsfilterset.inc.php
@@ -9,7 +9,10 @@ class StatisticsFilterSet
 
 	private $cache = false;
 
-	public function __construct($filters)
+	/**
+	 * @param DatabaseFilter[] $filters
+	 */
+	public function __construct(array $filters)
 	{
 		$this->filters = $filters;
 	}
@@ -49,9 +52,9 @@ class StatisticsFilterSet
 
 	/**
 	 * @param string $type filter type (class name)
-	 * @return ?DatabaseFilter The filter, false if not found
+	 * @return ?DatabaseFilter The filter, null if not found
 	 */
-	public function hasFilter(string $type)
+	public function hasFilter(string $type): ?DatabaseFilter
 	{
 		foreach ($this->filters as $filter) {
 			if ($filter->isClass($type)) {
@@ -63,9 +66,9 @@ class StatisticsFilterSet
 
 	/**
 	 * @param string $type filter type key/id
-	 * @return ?DatabaseFilter The filter, false if not found
+	 * @return ?DatabaseFilter The filter, null if not found
 	 */
-	public function hasFilterKey(string $type)
+	public function hasFilterKey(string $type): ?DatabaseFilter
 	{
 		if (isset($this->filters[$type]))
 			return $this->filters[$type];
@@ -102,8 +105,8 @@ class StatisticsFilterSet
 	 */
 	public function getAllowedLocations()
 	{
-		if (isset($this->filters['permissions']->argument) && is_array($this->filters['permissions']->argument))
-			return $this->filters['permissions']->argument;
+		if (isset($this->filters['permissions']) && is_array($this->filters['permissions']->argument))
+			return (array)$this->filters['permissions']->argument;
 		return false;
 	}