diff options
| author | Côme Chilliet <come.chilliet@nextcloud.com> | 2021-10-21 16:58:03 +0200 |
|---|---|---|
| committer | Côme Chilliet <come.chilliet@nextcloud.com> | 2021-11-23 09:28:58 +0100 |
| commit | 3a1b3745eb8e43eaa830bdeb9fe53a2de70349f0 (patch) | |
| tree | aa6a65fca43a7bdef7983a710b5a789260b0b877 | |
| parent | bc3acfc957f888840cb904950a5932a330504185 (diff) | |
| download | nextcloud-server-3a1b3745eb8e43eaa830bdeb9fe53a2de70349f0.tar.gz nextcloud-server-3a1b3745eb8e43eaa830bdeb9fe53a2de70349f0.zip | |
Fix DateTime constructor calls with null
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
| -rw-r--r-- | lib/private/Log/LogDetails.php | 2 | ||||
| -rw-r--r-- | tests/lib/AppFramework/Http/DispatcherTest.php | 2 | ||||
| -rw-r--r-- | tests/lib/AppFramework/Http/ResponseTest.php | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/lib/private/Log/LogDetails.php b/lib/private/Log/LogDetails.php index 87ce0396594..3353ea3f4cc 100644 --- a/lib/private/Log/LogDetails.php +++ b/lib/private/Log/LogDetails.php @@ -46,7 +46,7 @@ abstract class LogDetails { } $time = \DateTime::createFromFormat("U.u", number_format(microtime(true), 4, ".", "")); if ($time === false) { - $time = new \DateTime(null, $timezone); + $time = new \DateTime('now', $timezone); } else { // apply timezone if $time is created from UNIX timestamp $time->setTimezone($timezone); diff --git a/tests/lib/AppFramework/Http/DispatcherTest.php b/tests/lib/AppFramework/Http/DispatcherTest.php index 966e49effcb..92b772dbe31 100644 --- a/tests/lib/AppFramework/Http/DispatcherTest.php +++ b/tests/lib/AppFramework/Http/DispatcherTest.php @@ -148,7 +148,7 @@ class DispatcherTest extends \Test\TestCase { $this->response = $this->createMock(Response::class); - $this->lastModified = new \DateTime(null, new \DateTimeZone('GMT')); + $this->lastModified = new \DateTime('now', new \DateTimeZone('GMT')); $this->etag = 'hi'; } diff --git a/tests/lib/AppFramework/Http/ResponseTest.php b/tests/lib/AppFramework/Http/ResponseTest.php index 0ef128433cd..97a1ee25588 100644 --- a/tests/lib/AppFramework/Http/ResponseTest.php +++ b/tests/lib/AppFramework/Http/ResponseTest.php @@ -216,7 +216,7 @@ class ResponseTest extends \Test\TestCase { public function testGetLastModified() { - $lastModified = new \DateTime(null, new \DateTimeZone('GMT')); + $lastModified = new \DateTime('now', new \DateTimeZone('GMT')); $lastModified->setTimestamp(1); $this->childResponse->setLastModified($lastModified); $this->assertEquals($lastModified, $this->childResponse->getLastModified()); @@ -252,7 +252,7 @@ class ResponseTest extends \Test\TestCase { public function testEtagLastModifiedHeaders() { - $lastModified = new \DateTime(null, new \DateTimeZone('GMT')); + $lastModified = new \DateTime('now', new \DateTimeZone('GMT')); $lastModified->setTimestamp(1); $this->childResponse->setLastModified($lastModified); $headers = $this->childResponse->getHeaders(); @@ -260,7 +260,7 @@ class ResponseTest extends \Test\TestCase { } public function testChainability() { - $lastModified = new \DateTime(null, new \DateTimeZone('GMT')); + $lastModified = new \DateTime('now', new \DateTimeZone('GMT')); $lastModified->setTimestamp(1); $this->childResponse->setEtag('hi') |