diff --git a/build/psalm-baseline.xml b/build/psalm-baseline.xml index 324b33a7ac6..dbfde374b57 100644 --- a/build/psalm-baseline.xml +++ b/build/psalm-baseline.xml @@ -4101,12 +4101,6 @@ dbPort)]]> - - dbprettyname]]> - dbprettyname]]> - dbprettyname]]> - dbprettyname]]> - diff --git a/lib/private/Setup/AbstractDatabase.php b/lib/private/Setup/AbstractDatabase.php index 436c8ee697a..feffcc0cab9 100644 --- a/lib/private/Setup/AbstractDatabase.php +++ b/lib/private/Setup/AbstractDatabase.php @@ -25,6 +25,8 @@ abstract class AbstractDatabase { */ protected const array CONNECTION_ENCRYPTION_OPTIONS = ['dbdriveroptions']; + protected string $dbprettyname = 'abstract'; + protected string $dbUser; protected string $dbPassword; protected string $dbName; diff --git a/lib/private/Setup/OCI.php b/lib/private/Setup/OCI.php index 13174f791e3..0fb13abac71 100644 --- a/lib/private/Setup/OCI.php +++ b/lib/private/Setup/OCI.php @@ -11,7 +11,7 @@ namespace OC\Setup; use OC\DatabaseSetupException; class OCI extends AbstractDatabase { - public $dbprettyname = 'Oracle'; + public string $dbprettyname = 'Oracle'; protected $dbtablespace; diff --git a/lib/private/Setup/PostgreSQL.php b/lib/private/Setup/PostgreSQL.php index 5b8ceb768f5..cae86abdd50 100644 --- a/lib/private/Setup/PostgreSQL.php +++ b/lib/private/Setup/PostgreSQL.php @@ -14,7 +14,7 @@ use OC\DB\Connection; use OC\DB\QueryBuilder\Literal; class PostgreSQL extends AbstractDatabase { - public $dbprettyname = 'PostgreSQL'; + public string $dbprettyname = 'PostgreSQL'; // #[\Override] TODO: Uncomment this when we only support PHP 8.5+ support protected const array CONNECTION_ENCRYPTION_OPTIONS = [...parent::CONNECTION_ENCRYPTION_OPTIONS, 'pgsql_ssl'];