[VUFIND-1780] Add database datetime format constant

config/constants.config.php

@@ -33,3 +33,6 @@
             ? getenv('VUFIND_CACHE_DIR')
             : (strlen(LOCAL_OVERRIDE_DIR) > 0 ? LOCAL_OVERRIDE_DIR . '/cache' : ''))
     );
+
+// Define database datetime format
+defined('VUFIND_DATABASE_DATETIME_FORMAT') || define('VUFIND_DATABASE_DATETIME_FORMAT', 'Y-m-d H:i:s');

module/VuFind/src/VuFind/Crypt/SecretCalculator.php

@@ -67,7 +67,7 @@ public function getSearchUnsubscribeSecret(SearchEntityInterface $search): strin
         $data = [
             'id' => $search->getId(),
             'user_id' => $user->getId(),
-            'created' => $user->getCreated()->format('Y-m-d H:i:s'),
+            'created' => $user->getCreated()->format(VUFIND_DATABASE_DATETIME_FORMAT),
         ];
         return $this->hmac->generate(array_keys($data), $data);
     }

module/VuFind/src/VuFind/Db/Feature/DateTimeTrait.php

@@ -53,7 +53,8 @@ trait DateTimeTrait
     protected function getNullableDateTimeFromNonNullable(DateTime $date): ?DateTime
     {
         // Compare strings to avoid trouble with time zones:
-        return $date->format('Y-m-d H:i:s') !== $this->getUnassignedDefaultDateTime()->format('Y-m-d H:i:s')
+        return $date->format(VUFIND_DATABASE_DATETIME_FORMAT)
+            !== $this->getUnassignedDefaultDateTime()->format(VUFIND_DATABASE_DATETIME_FORMAT)
             ? $date
             : null;
     }

module/VuFind/src/VuFind/Db/Service/AccessTokenService.php

@@ -134,7 +134,7 @@ public function deleteExpired(DateTime $dateLimit, ?int $limit = null): int
         $subQueryBuilder->select('CONCAT(a.id, a.type)')
             ->from(AccessTokenEntityInterface::class, 'a')
             ->where('a.created < :latestCreated')
-            ->setParameter('latestCreated', $dateLimit->format('Y-m-d H:i:s'));
+            ->setParameter('latestCreated', $dateLimit->format(VUFIND_DATABASE_DATETIME_FORMAT));
         if ($limit) {
             $subQueryBuilder->setMaxResults($limit);
         }

module/VuFind/src/VuFind/Db/Service/AuthHashService.php

@@ -135,7 +135,7 @@ public function deleteExpired(DateTime $dateLimit, ?int $limit = null): int
         $subQueryBuilder->select('ah.id')
             ->from(AuthHashEntityInterface::class, 'ah')
             ->where('ah.created < :dateLimit')
-            ->setParameter('dateLimit', $dateLimit->format('Y-m-d H:i:s'));
+            ->setParameter('dateLimit', $dateLimit->format(VUFIND_DATABASE_DATETIME_FORMAT));
         if ($limit) {
             $subQueryBuilder->setMaxResults($limit);
         }

module/VuFind/tests/unit-tests/src/VuFindTest/OAuth2/Repository/AbstractTokenRepositoryTestCase.php

@@ -356,7 +356,7 @@ protected function createTokenId(): string
      */
     protected function createExpiryDateTime(): \DateTimeImmutable
     {
-        return new \DateTimeImmutable(date('Y-m-d H:i:s', strtotime('now+1hour')));
+        return new \DateTimeImmutable(date(VUFIND_DATABASE_DATETIME_FORMAT, strtotime('now+1hour')));
     }
 
     /**

module/VuFindApi/src/VuFindApi/Controller/SearchApiController.php

@@ -476,7 +476,7 @@ function (
             $resumptionToken = $this->createResumptionToken($request, $nextCursor, $nextCursorMark);
             $response['resumptionToken'] = [
                 'token' => $resumptionToken->getToken(),
-                'expires' => $resumptionToken->getExpiry()->format('Y-m-d H:i:s'),
+                'expires' => $resumptionToken->getExpiry()->format(VUFIND_DATABASE_DATETIME_FORMAT),
             ];
         }
         return $response;

tests/phpstan-constants.php

@@ -5,4 +5,5 @@
 const DEFAULT_SEARCH_BACKEND = 'Solr';
 const LOCAL_CACHE_DIR = './local';
 const LOCAL_OVERRIDE_DIR = '.';
+const VUFIND_DATABASE_DATETIME_FORMAT = 'Y-m-d H:i:s';