Skip to content
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
6 changes: 6 additions & 0 deletions src/Illuminate/Validation/ValidatesWhenResolvedTrait.php
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,12 @@ public function validateResolved()
}

$this->passedValidation();

// Sync the validator data with the current request data after passedValidation()
// in case the request data was modified (e.g., via replace() or merge())
if (method_exists($this, 'validationData')) {
$instance->setData($this->validationData());
}
}

/**
Expand Down
9 changes: 9 additions & 0 deletions tests/Foundation/FoundationFormRequestTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,15 @@ public function testAfterValidationRunsAfterValidation()
$this->assertEquals(['name' => 'Adam'], $request->all());
}

public function testPassedValidationDataIsReflectedInValidatedMethod()
{
$request = $this->createRequest([], FoundationTestFormRequestHooks::class);

$request->validateResolved();

$this->assertEquals(['name' => 'Adam'], $request->validated());
}

public function testValidatedMethodReturnsOnlyRequestedValidatedData()
{
$request = $this->createRequest(['name' => 'specified', 'with' => 'extras']);
Expand Down
Loading