Skip to content

Commit 933073d

Browse files
GromNaNalcaeus
authored andcommitted
Create UTCDateTime from DateTimeInterface objects (#8)
1 parent ae3e0d5 commit 933073d

File tree

4 files changed

+14
-14
lines changed

4 files changed

+14
-14
lines changed

Diff for: src/Auth/DatabaseTokenRepository.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ protected function getPayload($email, $token)
1818
return [
1919
'email' => $email,
2020
'token' => $this->hasher->make($token),
21-
'created_at' => new UTCDateTime(Date::now()->format('Uv')),
21+
'created_at' => new UTCDateTime(Date::now()),
2222
];
2323
}
2424

Diff for: src/Eloquent/Model.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ public function getDateFormat()
134134
*/
135135
public function freshTimestamp()
136136
{
137-
return new UTCDateTime(Date::now()->format('Uv'));
137+
return new UTCDateTime(Date::now());
138138
}
139139

140140
/**

Diff for: src/Query/Builder.php

+4-4
Original file line numberDiff line numberDiff line change
@@ -882,7 +882,7 @@ protected function performUpdate($query, array $options = [])
882882
$options = $this->inheritConnectionOptions($options);
883883

884884
$wheres = $this->compileWheres();
885-
$result = $this->collection->UpdateMany($wheres, $query, $options);
885+
$result = $this->collection->updateMany($wheres, $query, $options);
886886
if (1 == (int) $result->isAcknowledged()) {
887887
return $result->getModifiedCount() ? $result->getModifiedCount() : $result->getUpsertedCount();
888888
}
@@ -981,18 +981,18 @@ protected function compileWheres(): array
981981
if (is_array($where['value'])) {
982982
array_walk_recursive($where['value'], function (&$item, $key) {
983983
if ($item instanceof DateTimeInterface) {
984-
$item = new UTCDateTime($item->format('Uv'));
984+
$item = new UTCDateTime($item);
985985
}
986986
});
987987
} else {
988988
if ($where['value'] instanceof DateTimeInterface) {
989-
$where['value'] = new UTCDateTime($where['value']->format('Uv'));
989+
$where['value'] = new UTCDateTime($where['value']);
990990
}
991991
}
992992
} elseif (isset($where['values'])) {
993993
array_walk_recursive($where['values'], function (&$item, $key) {
994994
if ($item instanceof DateTimeInterface) {
995-
$item = new UTCDateTime($item->format('Uv'));
995+
$item = new UTCDateTime($item);
996996
}
997997
});
998998
}

Diff for: tests/QueryBuilderTest.php

+8-8
Original file line numberDiff line numberDiff line change
@@ -600,19 +600,19 @@ public function testUpdateSubdocument()
600600
public function testDates()
601601
{
602602
DB::collection('users')->insert([
603-
['name' => 'John Doe', 'birthday' => new UTCDateTime(Date::parse('1980-01-01 00:00:00')->format('Uv'))],
604-
['name' => 'Robert Roe', 'birthday' => new UTCDateTime(Date::parse('1982-01-01 00:00:00')->format('Uv'))],
605-
['name' => 'Mark Moe', 'birthday' => new UTCDateTime(Date::parse('1983-01-01 00:00:00.1')->format('Uv'))],
606-
['name' => 'Frank White', 'birthday' => new UTCDateTime(Date::parse('1960-01-01 12:12:12.1')->format('Uv'))],
603+
['name' => 'John Doe', 'birthday' => new UTCDateTime(Date::parse('1980-01-01 00:00:00'))],
604+
['name' => 'Robert Roe', 'birthday' => new UTCDateTime(Date::parse('1982-01-01 00:00:00'))],
605+
['name' => 'Mark Moe', 'birthday' => new UTCDateTime(Date::parse('1983-01-01 00:00:00.1'))],
606+
['name' => 'Frank White', 'birthday' => new UTCDateTime(Date::parse('1960-01-01 12:12:12.1'))],
607607
]);
608608

609609
$user = DB::collection('users')
610-
->where('birthday', new UTCDateTime(Date::parse('1980-01-01 00:00:00')->format('Uv')))
610+
->where('birthday', new UTCDateTime(Date::parse('1980-01-01 00:00:00')))
611611
->first();
612612
$this->assertEquals('John Doe', $user['name']);
613613

614614
$user = DB::collection('users')
615-
->where('birthday', new UTCDateTime(Date::parse('1960-01-01 12:12:12.1')->format('Uv')))
615+
->where('birthday', new UTCDateTime(Date::parse('1960-01-01 12:12:12.1')))
616616
->first();
617617
$this->assertEquals('Frank White', $user['name']);
618618

@@ -629,8 +629,8 @@ public function testDates()
629629
public function testImmutableDates()
630630
{
631631
DB::collection('users')->insert([
632-
['name' => 'John Doe', 'birthday' => new UTCDateTime(Date::parse('1980-01-01 00:00:00')->format('Uv'))],
633-
['name' => 'Robert Roe', 'birthday' => new UTCDateTime(Date::parse('1982-01-01 00:00:00')->format('Uv'))],
632+
['name' => 'John Doe', 'birthday' => new UTCDateTime(Date::parse('1980-01-01 00:00:00'))],
633+
['name' => 'Robert Roe', 'birthday' => new UTCDateTime(Date::parse('1982-01-01 00:00:00'))],
634634
]);
635635

636636
$users = DB::collection('users')->where('birthday', '=', new DateTimeImmutable('1980-01-01 00:00:00'))->get();

0 commit comments

Comments
 (0)