Merge pull request #655 from nextcloud/fix/support-php-8.1

Respect function signatures from PHP 8.1

Author: come-nc

.github/workflows/phpunit.yml

@@ -18,7 +18,7 @@ jobs:
       # do not stop on another job's failure
       fail-fast: false
       matrix:
-        php-versions: ['7.4', '8.0']
+        php-versions: ['7.4', '8.0', '8.1']
         databases: ['sqlite']
         server-versions: ['master']
 

composer.lock

@@ -66,12 +66,16 @@ public function __construct($handle, $dateFormat, $timezone) {
 		$this->next();
 	}
 
-	public function rewind() {
+	public function rewind(): void {
 		fseek($this->handle, 0, SEEK_END);
 		$this->position = ftell($this->handle) - self::CHUNK_SIZE;
 		$this->currentKey = 0;
 	}
 
+	/**
+	 * @return mixed
+	 */
+	#[\ReturnTypeWillChange]
 	public function current() {
 		$entry = json_decode($this->lastLine, true);
 		if ($this->dateFormat !== \DateTime::ATOM) {
@@ -85,11 +89,11 @@ public function current() {
 		return $entry;
 	}
 
-	public function key() {
+	public function key(): int {
 		return $this->currentKey;
 	}
 
-	public function next() {
+	public function next(): void {
 		$this->currentLine = '';
 
 		// Loop through each character of the file looking for new lines
@@ -119,7 +123,7 @@ public function next() {
 		}
 	}
 
-	public function valid() {
+	public function valid(): bool {
 		if (!is_resource($this->handle)) {
 			return false;
 		}

lib/Log/LogIterator.php

@@ -32,40 +32,37 @@ class SearchFilter extends \FilterIterator {
 	 */
 	private $levels;
 
-	/**
-	 * @param \Iterator $iterator
-	 * @param string $query
-	 */
-	public function __construct(\Iterator $iterator, $query) {
+	public function __construct(\Iterator $iterator, string $query) {
 		parent::__construct($iterator);
 		$this->rewind();
 		$this->query = strtolower($query);
 		$this->levels = ['Debug', 'Info', 'Warning', 'Error', 'Fatal'];
 	}
 
-	private function formatLevel($level) {
+	private function formatLevel(int $level): string {
 		return isset($this->levels[$level]) ? $this->levels[$level] : 'Unknown';
 	}
 
-	public function accept() {
+	public function accept(): bool {
 		if (!$this->query) {
 			return true;
 		}
 		$value = $this->current();
-		return $this->inMessage($value['message'], $this->query)
-			|| stripos($value['app'], $this->query) !== false
-			|| stripos($value['reqId'], $this->query) !== false
-			|| stripos($value['user'], $this->query) !== false
-			|| stripos($value['url'], $this->query) !== false
-			|| stripos($this->formatLevel($value['level']), $this->query) !== false;
+		return $this->inMessage($value['message'] ?? '', $this->query)
+			|| stripos($value['app'] ?? '', $this->query) !== false
+			|| stripos($value['reqId'] ?? '', $this->query) !== false
+			|| stripos($value['user'] ?? '', $this->query) !== false
+			|| stripos($value['url'] ?? '', $this->query) !== false
+			|| stripos($this->formatLevel($value['level'] ?? -1), $this->query) !== false;
 	}
 
-	private function inMessage($message, $query) {
+	private function inMessage($message, string $query): bool {
 		if (is_string($message)) {
 			return stripos($message, $query) !== false;
 		} elseif (isset($message['Exception'])) {
 			return stripos($message['Exception'], $query) !== false
-				|| stripos($message['Message'], $query) !== false;
+				|| stripos($message['Message'] ?? '', $query) !== false;
 		}
+		return false;
 	}
 }