Skip to content

[4.2] Fixed Query\Builder call to undefined method hasGetMutator #6683

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

Closed
koss-shtukert wants to merge 3 commits into from
Closed

[4.2] Fixed Query\Builder call to undefined method hasGetMutator #6683

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ce512a6
[4.2] Fixed Query\Builder call to undefined method hasGetMutator when…
koss-shtukert Dec 17, 2014
d8fe217
Fix test
xAockd Dec 17, 2014
6421e92
Merge pull request #1 from xAockd/patch-2
koss-shtukert Dec 17, 2014
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
2 changes: 1 addition & 1 deletion src/Illuminate/Database/Eloquent/Builder.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,7 @@ public function lists($column, $key = null)
// If the model has a mutator for the requested column, we will spin through
// the results and mutate the values so that the mutated version of these
// columns are returned as you would expect from these Eloquent models.
if ($this->model->hasGetMutator($column))
if ($this->model->getMutatorMethod($column))
{
foreach ($results as $key => &$value)
{
Expand Down
4 changes: 2 additions & 2 deletions tests/Database/DatabaseEloquentBuilderTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@ public function testListsReturnsTheMutatedAttributesOfAModel()
$builder = $this->getBuilder();
$builder->getQuery()->shouldReceive('lists')->with('name', '')->andReturn(array('bar', 'baz'));
$builder->setModel($this->getMockModel());
$builder->getModel()->shouldReceive('hasGetMutator')->with('name')->andReturn(true);
$builder->getModel()->shouldReceive('getMutatorMethod')->with('name')->andReturn(true);
$builder->getModel()->shouldReceive('newFromBuilder')->with(array('name' => 'bar'))->andReturn(new EloquentBuilderTestListsStub(array('name' => 'bar')));
$builder->getModel()->shouldReceive('newFromBuilder')->with(array('name' => 'baz'))->andReturn(new EloquentBuilderTestListsStub(array('name' => 'baz')));

Expand All @@ -188,7 +188,7 @@ public function testListsWithoutModelGetterJustReturnTheAttributesFoundInDatabas
$builder = $this->getBuilder();
$builder->getQuery()->shouldReceive('lists')->with('name', '')->andReturn(array('bar', 'baz'));
$builder->setModel($this->getMockModel());
$builder->getModel()->shouldReceive('hasGetMutator')->with('name')->andReturn(false);
$builder->getModel()->shouldReceive('getMutatorMethod')->with('name')->andReturn(false);

$this->assertEquals(array('bar', 'baz'), $builder->lists('name'));
}
Expand Down