Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[5.2] Adds idType to model in order to prevent assumptions about ids #13985

Merged
merged 7 commits into from
Jun 17, 2016
Merged

[5.2] Adds idType to model in order to prevent assumptions about ids #13985

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
bf59491
Adds idType to Model
Jun 14, 2016
dc1c587
Adding periods for StyleCI
Jun 14, 2016
199d3b6
Removing getters/setters and adding note
Jun 14, 2016
5f2d357
Updating text
Jun 14, 2016
c9a4fc4
Fixes bad getter call
Jun 14, 2016
81a8482
Adds unit tests for idType
Jun 14, 2016
63957cc
Fixes styling
Jun 14, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 2 additions & 24 deletions src/Illuminate/Database/Eloquent/Model.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,8 @@ abstract class Model implements ArrayAccess, Arrayable, Jsonable, JsonSerializab
public $incrementing = true;

/**
* Sets the type used by the ID.
* Sets the type used by the ID. Note that this property is ignored unless
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please start a new line here.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actually, just make the description this: The type used by the incrementing ID.. It's pretty clear then.

* $incrementing is set to true.
*
* @var string
*/
Expand Down Expand Up @@ -2408,29 +2409,6 @@ public function setIncrementing($value)
return $this;
}

/**
* Get the type of the ID.
*
* @return string
*/
public function getIdType()
{
return $this->idType;
}

/**
* Set ID type.
*
* @param string $value
* @return $this
*/
public function setIdType($value)
{
$this->idType = $value;

return $this;
}

/**
* Convert the model instance to JSON.
*
Expand Down