Changed according feedback:

- $posted_date should not allow NULL, instead use `?? ''` instead
- this happened in e.g. 2FA app-specific password listing

diff --git a/src/Security/TwoFactor/Model/AppSpecificPassword.php b/src/Security/TwoFactor/Model/AppSpecificPassword.php
index 6d1ef0bdcc8e5b9a09f3f1551e38812d484828e7..d9843756542a4d62db9c637949d65b990385f959 100644 (file)
--- a/src/Security/TwoFactor/Model/AppSpecificPassword.php
+++ b/src/Security/TwoFactor/Model/AppSpecificPassword.php
@@ -86,7 +86,7 @@ class AppSpecificPassword
                $appSpecificPasswords = DBA::toArray($appSpecificPasswordsStmt);
 
                array_walk($appSpecificPasswords, function (&$value) {
-                       $value['ago']   = Temporal::getRelativeDate($value['last_used']);
+                       $value['ago']   = Temporal::getRelativeDate($value['last_used'] ?? '');
                        $value['utc']   = $value['last_used'] ? DateTimeFormat::utc($value['last_used'], 'c') : '';
                        $value['local'] = $value['last_used'] ? DateTimeFormat::local($value['last_used'], 'r') : '';
                });

diff --git a/src/Util/Temporal.php b/src/Util/Temporal.php
index ef87f84883ef0eb849a4f719afccf7175dd84537..74389c44b52b5eea3f1c6c3be2afbd2fdd907149 100644 (file)
--- a/src/Util/Temporal.php
+++ b/src/Util/Temporal.php
@@ -311,13 +311,13 @@ class Temporal
         *
         * @return string with relative date
         */
-       public static function getRelativeDate(string $posted_date = null, string $format = null): string
+       public static function getRelativeDate(string $posted_date, string $format = null): string
        {
                $localtime = $posted_date . ' UTC';
 
                $abs = strtotime($localtime);
 
-               if (is_null($posted_date) || $posted_date <= DBA::NULL_DATETIME || $abs === false) {
+               if (empty($posted_date) || $posted_date <= DBA::NULL_DATETIME || $abs === false) {
                        return DI::l10n()->t('never');
                }