Make sure to not pass null to DateTime::createFromFormat

Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>

diff --git a/apps/dav/lib/Files/FileSearchBackend.php b/apps/dav/lib/Files/FileSearchBackend.php
index c819fa6afc6841b4580a81cb565980064584784a..524f90e6623d1d8a60eba4cee4080c59b9918526 100644 (file)
--- a/apps/dav/lib/Files/FileSearchBackend.php
+++ b/apps/dav/lib/Files/FileSearchBackend.php
@@ -55,7 +55,7 @@ use SearchDAV\Query\Order;
 use SearchDAV\Query\Query;
 
 class FileSearchBackend implements ISearchBackend {
-       const OPERATOR_LIMIT = 100;
+       public const OPERATOR_LIMIT = 100;
 
        /** @var CachingTree */
        private $tree;
@@ -432,7 +432,7 @@ class FileSearchBackend implements ISearchBackend {
                                if (is_numeric($value)) {
                                        return max(0, 0 + $value);
                                }
-                               $date = \DateTime::createFromFormat(\DateTimeInterface::ATOM, $value);
+                               $date = \DateTime::createFromFormat(\DateTimeInterface::ATOM, (string)$value);
                                return ($date instanceof \DateTime && $date->getTimestamp() !== false) ? $date->getTimestamp() : 0;
                        default:
                                return $value;

diff --git a/apps/files_external/lib/Lib/Storage/FTP.php b/apps/files_external/lib/Lib/Storage/FTP.php
index 0350035a11a34cb12f84b36322ed89b8d0510e08..284f438fccd072747acd4c39af0278587bfef599 100644 (file)
--- a/apps/files_external/lib/Lib/Storage/FTP.php
+++ b/apps/files_external/lib/Lib/Storage/FTP.php
@@ -123,7 +123,7 @@ class FTP extends Common {
                                        return $item['type'] === 'cdir';
                                }));
                                if ($currentDir) {
-                                       $time = \DateTime::createFromFormat('YmdHis', $currentDir['modify']);
+                                       $time = \DateTime::createFromFormat('YmdHis', $currentDir['modify'] ?? '');
                                        if ($time === false) {
                                                throw new \Exception("Invalid date format for directory: $currentDir");
                                        }
@@ -269,7 +269,7 @@ class FTP extends Common {
                        case 'wb':
                        case 'wb+':
                                $useExisting = false;
-                       // no break
+                               // no break
                        case 'a':
                        case 'ab':
                        case 'r+':

diff --git a/apps/sharebymail/lib/ShareByMailProvider.php b/apps/sharebymail/lib/ShareByMailProvider.php
index 01dd3b428d17972b1ff852ad7f6b00db351f1d9a..af3d14b49bcb6f3aa8cde93f51494c938f04b1c2 100644 (file)
--- a/apps/sharebymail/lib/ShareByMailProvider.php
+++ b/apps/sharebymail/lib/ShareByMailProvider.php
@@ -1042,8 +1042,8 @@ class ShareByMailProvider implements IShareProvider {
                $share->setShareTime($shareTime);
                $share->setSharedWith($data['share_with']);
                $share->setPassword($data['password']);
-               $passwordExpirationTime = \DateTime::createFromFormat('Y-m-d H:i:s', $data['password_expiration_time']);
-               $share->setPasswordExpirationTime($passwordExpirationTime !== false? $passwordExpirationTime : null);
+               $passwordExpirationTime = \DateTime::createFromFormat('Y-m-d H:i:s', $data['password_expiration_time'] ?? '');
+               $share->setPasswordExpirationTime($passwordExpirationTime !== false ? $passwordExpirationTime : null);
                $share->setLabel($data['label']);
                $share->setSendPasswordByTalk((bool)$data['password_by_talk']);
                $share->setHideDownload((bool)$data['hide_download']);
@@ -1140,7 +1140,6 @@ class ShareByMailProvider implements IShareProvider {
         * @throws ShareNotFound
         */
        protected function getRawShare($id) {
-
                // Now fetch the inserted share and create a complete share object
                $qb = $this->dbConnection->getQueryBuilder();
                $qb->select('*')

diff --git a/apps/workflowengine/lib/Check/RequestTime.php b/apps/workflowengine/lib/Check/RequestTime.php
index b7a2f725451687be2bf45dd763ec06204e192848..be28f8ead1597ed5bb22c2b31756e2c1328a6a5d 100644 (file)
--- a/apps/workflowengine/lib/Check/RequestTime.php
+++ b/apps/workflowengine/lib/Check/RequestTime.php
@@ -109,12 +109,12 @@ class RequestTime implements ICheck {
                }
 
                $values = json_decode($value, true);
-               $time1 = \DateTime::createFromFormat('H:i e', $values[0]);
+               $time1 = \DateTime::createFromFormat('H:i e', (string)$values[0]);
                if ($time1 === false) {
                        throw new \UnexpectedValueException($this->l->t('The given start time is invalid'), 3);
                }
 
-               $time2 = \DateTime::createFromFormat('H:i e', $values[1]);
+               $time2 = \DateTime::createFromFormat('H:i e', (string)$values[1]);
                if ($time2 === false) {
                        throw new \UnexpectedValueException($this->l->t('The given end time is invalid'), 4);
                }