aboutsummaryrefslogtreecommitdiff
path: root/lib/Minz
diff options
context:
space:
mode:
Diffstat (limited to 'lib/Minz')
-rw-r--r--lib/Minz/ModelPdo.php2
-rw-r--r--lib/Minz/Translate.php4
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/Minz/ModelPdo.php b/lib/Minz/ModelPdo.php
index 0f5b9efca..85796b53a 100644
--- a/lib/Minz/ModelPdo.php
+++ b/lib/Minz/ModelPdo.php
@@ -26,7 +26,7 @@ class Minz_ModelPdo {
private static $sharedCurrentUser;
/**
- * @var Minz_Pdo|null
+ * @var Minz_Pdo
*/
protected $pdo;
diff --git a/lib/Minz/Translate.php b/lib/Minz/Translate.php
index 584f08aa0..07d48ec08 100644
--- a/lib/Minz/Translate.php
+++ b/lib/Minz/Translate.php
@@ -87,10 +87,10 @@ class Minz_Translate {
* preferred languages then returns the default language
* @param string|null $user the connected user language (nullable)
* @param array<string> $preferred an array of the preferred languages
- * @param string $default the preferred language to use
+ * @param string|null $default the preferred language to use
* @return string containing the language to use
*/
- public static function getLanguage($user, $preferred, $default) {
+ public static function getLanguage(?string $user, array $preferred, ?string $default): string {
if (null !== $user) {
return $user;
}