From 5255c47834e26d973432f92804715304637cd6e7 Mon Sep 17 00:00:00 2001 From: Elias Stassinos Date: Sun, 17 Nov 2024 00:05:29 +0200 Subject: [PATCH] fix: Fix return type declarations for PHP 8 compatibility --- src/Vatsimphp/Filter/AbstractFilter.php | 6 +++--- src/Vatsimphp/Filter/VarFilter.php | 2 +- src/Vatsimphp/Result/ResultContainer.php | 6 ++---- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/src/Vatsimphp/Filter/AbstractFilter.php b/src/Vatsimphp/Filter/AbstractFilter.php index 1fda4fc..f26ed73 100644 --- a/src/Vatsimphp/Filter/AbstractFilter.php +++ b/src/Vatsimphp/Filter/AbstractFilter.php @@ -95,7 +95,7 @@ public function toArray($retainKeys = true) * * @return int */ - public function count() + public function count(): int { return count($this->toArray()); } @@ -105,7 +105,7 @@ public function count() * * @return bool */ - final public function accept() + final public function accept(): bool { // skip comments and empty lines $line = $this->getInnerIterator()->current(); @@ -119,7 +119,7 @@ final public function accept() /** * @see FilterIterator::current() */ - public function current() + public function current(): mixed { $value = parent::current(); if (is_string($value)) { diff --git a/src/Vatsimphp/Filter/VarFilter.php b/src/Vatsimphp/Filter/VarFilter.php index 42a6de4..d76ff00 100644 --- a/src/Vatsimphp/Filter/VarFilter.php +++ b/src/Vatsimphp/Filter/VarFilter.php @@ -40,7 +40,7 @@ public function setFilter($filter) /** * @see Vatsimphp\Filter.AbstractFilter::current() */ - public function current() + public function current(): mixed { $value = parent::current(); diff --git a/src/Vatsimphp/Result/ResultContainer.php b/src/Vatsimphp/Result/ResultContainer.php index f965948..78c6f54 100644 --- a/src/Vatsimphp/Result/ResultContainer.php +++ b/src/Vatsimphp/Result/ResultContainer.php @@ -39,9 +39,7 @@ class ResultContainer implements \Countable /** * Ctor. */ - public function __construct() - { - } + public function __construct() {} /** * Append/overwrite a new result set. @@ -99,7 +97,7 @@ public function getList() /** * @see Countable::count() */ - public function count() + public function count(): int { return count($this->container); }