Fix Eloquent Models timestamp types (#34787)

antonkomarev · web-flow · commit 2bf90d200a9a · 2020-10-11T09:30:01.000-05:00
diff --git a/src/Illuminate/Database/Eloquent/Concerns/HasTimestamps.php b/src/Illuminate/Database/Eloquent/Concerns/HasTimestamps.php
@@ -110,7 +110,7 @@ public function usesTimestamps()
     /**
      * Get the name of the "created at" column.
      *
-     * @return string
+     * @return string|null
      */
     public function getCreatedAtColumn()
     {
@@ -120,7 +120,7 @@ public function getCreatedAtColumn()
     /**
      * Get the name of the "updated at" column.
      *
-     * @return string
+     * @return string|null
      */
     public function getUpdatedAtColumn()
     {
diff --git a/src/Illuminate/Database/Eloquent/Model.php b/src/Illuminate/Database/Eloquent/Model.php
@@ -144,14 +144,14 @@ abstract class Model implements Arrayable, ArrayAccess, Jsonable, JsonSerializab
     /**
      * The name of the "created at" column.
      *
-     * @var string
+     * @var string|null
      */
     const CREATED_AT = 'created_at';
 
     /**
      * The name of the "updated at" column.
      *
-     * @var string
+     * @var string|null
      */
     const UPDATED_AT = 'updated_at';
 

Original file line number	Diff line number	Diff line change
`@@ -110,7 +110,7 @@ public function usesTimestamps()`
`110`	`110`	`/**`
`111`	`111`	`* Get the name of the "created at" column.`
`112`	`112`	`*`
`113`		`- * @return string`
	`113`	`+ * @return string\|null`
`114`	`114`	`*/`
`115`	`115`	`public function getCreatedAtColumn()`
`116`	`116`	`{`
`@@ -120,7 +120,7 @@ public function getCreatedAtColumn()`
`120`	`120`	`/**`
`121`	`121`	`* Get the name of the "updated at" column.`
`122`	`122`	`*`
`123`		`- * @return string`
	`123`	`+ * @return string\|null`
`124`	`124`	`*/`
`125`	`125`	`public function getUpdatedAtColumn()`
`126`	`126`	`{`