From 0af921d87072e8853ad44a4b317a42d23e427b9d Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Sat, 19 Aug 2023 23:57:44 +0200
Subject: [PATCH] [ticket/17176] Update psalm expected PHP version and add
 missing return type

PHPBB3-17176
---
 .github/workflows/tests.yml         | 4 ++--
 phpBB/phpbb/console/application.php | 2 +-
 psalm.xml                           | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index b72283f5db..e22466de0b 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -118,8 +118,8 @@ jobs:
                       db: "mariadb:10.10"
                     - php: '8.1'
                       db: "mariadb:10.11"
-                    - php: '8.1'
-                      db: "mariadb:11.0"
+                    # - php: '8.1' # currently disabled
+                    #   db: "mariadb:11.0"
                     - php: '8.1'
                       db: "mysql:5.7"
                       db_alias: "MySQL Slow Tests"
diff --git a/phpBB/phpbb/console/application.php b/phpBB/phpbb/console/application.php
index 50443cd646..b7ecd3dff6 100644
--- a/phpBB/phpbb/console/application.php
+++ b/phpBB/phpbb/console/application.php
@@ -45,7 +45,7 @@ class application extends \Symfony\Component\Console\Application
 	/**
 	* {@inheritdoc}
 	*/
-	protected function getDefaultInputDefinition()
+	protected function getDefaultInputDefinition(): InputDefinition
 	{
 		$input_definition = parent::getDefaultInputDefinition();
 
diff --git a/psalm.xml b/psalm.xml
index cb434cfaf8..ddfeb6e78f 100644
--- a/psalm.xml
+++ b/psalm.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <psalm
     errorLevel="5"
-    phpVersion="7.3"
+    phpVersion="8.1"
     resolveFromConfigFile="true"
     autoloader="build/psalm_bootstrap.php"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"