Merge d8bbe3e58c into 9adb7eb9fe

phpBB/phpbb/db/tools/doctrine.php

@@ -478,7 +478,7 @@ class doctrine implements tools_interface
 		catch (Exception $e)
 		{
 			// @todo: check if it makes sense to properly handle the exception
-			return $e->getMessage();
+			return false;
 		}
 	}
 

phpBB/phpbb/install/helper/database.php

@@ -405,7 +405,6 @@ class database
 			}
 
 			// Check if database version is supported
-			/** @psalm-suppress UndefinedInterfaceMethod */
 			$db_server_version = $doctrine_db->getWrappedConnection()->getServerVersion();
 			switch ($dbms)
 			{