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.

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

Fixed incomplete return type signature on insertGetId method. Updated Model class and added test. #54410

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 4 additions & 1 deletion src/Illuminate/Database/Eloquent/Model.php
Original file line number Diff line number Diff line change
Expand Up @@ -1356,9 +1356,12 @@ protected function performInsert(Builder $query)
*/
protected function insertAndSetId(Builder $query, $attributes)
{
/** @var int|false $id */
$id = $query->insertGetId($attributes, $keyName = $this->getKeyName());

$this->setAttribute($keyName, $id);
if ($id !== false) {
$this->setAttribute($keyName, $id);
}
}

/**
Expand Down
2 changes: 1 addition & 1 deletion src/Illuminate/Database/Query/Builder.php
Original file line number Diff line number Diff line change
Expand Up @@ -3786,7 +3786,7 @@ public function insertOrIgnore(array $values)
*
* @param array $values
* @param string|null $sequence
* @return int
* @return false|int
*/
public function insertGetId(array $values, $sequence = null)
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ public function processColumnListing($results)
* @param string $sql
* @param array $values
* @param string|null $sequence
* @return int
* @return false|int
*/
public function processInsertGetId(Builder $query, $sql, $values, $sequence = null)
{
Expand Down
2 changes: 1 addition & 1 deletion src/Illuminate/Database/Query/Processors/Processor.php
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ public function processSelect(Builder $query, $results)
* @param string $sql
* @param array $values
* @param string|null $sequence
* @return int
* @return false|int
*/
public function processInsertGetId(Builder $query, $sql, $values, $sequence = null)
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ class SqlServerProcessor extends Processor
* @param string $sql
* @param array $values
* @param string|null $sequence
* @return int
* @return false|int
*/
public function processInsertGetId(Builder $query, $sql, $values, $sequence = null)
{
Expand Down
22 changes: 22 additions & 0 deletions tests/Database/DatabaseProcessorTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,28 @@ public function testInsertGetIdProcessing()
$result = $processor->processInsertGetId($builder, 'sql', ['foo'], 'id');
$this->assertSame(1, $result);
}

public function testInsertAndSetIdHandlesFalseGracefully()
{
// Mock the Builder to return false for insertGetId
$builderMock = $this->createMock(\Illuminate\Database\Eloquent\Builder::class);
$builderMock->method('insertGetId')->willReturn(false);

// Mock the Model
$modelMock = $this->getMockBuilder(\Illuminate\Database\Eloquent\Model::class)
->onlyMethods(['getKeyName', 'setAttribute'])
->getMock();

$modelMock->method('getKeyName')->willReturn('id');

// Expect setAttribute NOT to be called since ID should not be set
$modelMock->expects($this->never())->method('setAttribute');

// Call the protected method using reflection
$reflection = new \ReflectionMethod($modelMock, 'insertAndSetId');
$reflection->setAccessible(true);
$reflection->invoke($modelMock, $builderMock, ['name' => 'Test']);
}
}

class ProcessorTestPDOStub extends PDO
Expand Down
Loading