unify behavior of toArray when dates are in casts and date arrays." · JavaDevl/framework@2298bf0 · GitHub

JavaDevl / framework Public

forked from laravel/framework

• Notifications You must be signed in to change notification settings
• Fork 0
• Star 0

• Code
• Pull requests
• Actions
• Projects
• Security and quality
• Insights

Additional navigation options

Commit 2298bf0

Browse filesBrowse the repository at this point in the historyBrowse files

taylorotwell

committed

unify behavior of toArray when dates are in casts and date arrays."

1 parent a38e420 commit 2298bf0
Copy full SHA for 2298bf0

2 files changed

+6-4Lines changed: 6 additions & 4 deletions

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

• src/Illuminate/Database/Eloquent
  • Model.php
• tests/Database
  • DatabaseEloquentModelTest.php

Expand file treeCollapse file tree

Open diff view settings

Collapse file

‎src/Illuminate/Database/Eloquent/Model.php‎

Copy file name to clipboardExpand all lines: src/Illuminate/Database/Eloquent/Model.php

+4Lines changed: 4 additions & 0 deletions

Original file line number	Diff line number	Diff line change
@@ -2522,6 +2522,10 @@ public function attributesToArray()
2522	2522	$attributes[$key] = $this->castAttribute(
2523	2523	$key, $attributes[$key]
2524	2524	);
	2525	+
	2526	+ if ($attributes[$key] && ($value === 'date' || $value === 'datetime')) {
	2527	+ $attributes[$key] = $this->serializeDate($attributes[$key]);
	2528	+ }
2525	2529	}
2526	2530
2527	2531	// Here we will grab all of the appended, calculated attributes to this model

Collapse file

‎tests/Database/DatabaseEloquentModelTest.php‎

Copy file name to clipboardExpand all lines: tests/Database/DatabaseEloquentModelTest.php

+2-4Lines changed: 2 additions & 4 deletions

Original file line number	Diff line number	Diff line change
@@ -1210,10 +1210,8 @@ public function testModelAttributesAreCastedWhenPresentInCastsArray()
1210	1210	$this->assertEquals($obj, $arr['objectAttribute']);
1211	1211	$this->assertEquals(['foo' => 'bar'], $arr['arrayAttribute']);
1212	1212	$this->assertEquals(['foo' => 'bar'], $arr['jsonAttribute']);
1213		- $this->assertInstanceOf('Carbon\Carbon', $arr['dateAttribute']);
1214		- $this->assertInstanceOf('Carbon\Carbon', $arr['datetimeAttribute']);
1215		- $this->assertEquals('1969-07-20', $arr['dateAttribute']->toDateString());
1216		- $this->assertEquals('1969-07-20 22:56:00', $arr['datetimeAttribute']->toDateTimeString());
	1213	+ $this->assertEquals('1969-07-20 00:00:00', $arr['dateAttribute']);
	1214	+ $this->assertEquals('1969-07-20 22:56:00', $arr['datetimeAttribute']);
1217	1215	$this->assertEquals(-14173440, $arr['timestampAttribute']);
1218	1216	}
1219	1217

0 commit comments

Comments

0 (0)