Skip to content

Commit 33d8642

Browse files
committed
rename validate resolved method to avoid conflicts with macro
1 parent ce88b25 commit 33d8642

File tree

4 files changed

+7
-7
lines changed

4 files changed

+7
-7
lines changed

src/Illuminate/Contracts/Validation/ValidatesWhenResolved.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,5 @@ interface ValidatesWhenResolved
99
*
1010
* @return void
1111
*/
12-
public function validate();
12+
public function validateResolved();
1313
}

src/Illuminate/Foundation/Providers/FormRequestServiceProvider.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ public function register()
2828
public function boot()
2929
{
3030
$this->app->afterResolving(ValidatesWhenResolved::class, function ($resolved) {
31-
$resolved->validate();
31+
$resolved->validateResolved();
3232
});
3333

3434
$this->app->resolving(FormRequest::class, function ($request, $app) {

src/Illuminate/Validation/ValidatesWhenResolvedTrait.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ trait ValidatesWhenResolvedTrait
1212
*
1313
* @return void
1414
*/
15-
public function validate()
15+
public function validateResolved()
1616
{
1717
$this->prepareForValidation();
1818

tests/Foundation/FoundationFormRequestTest.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ public function test_validated_method_returns_the_validated_data()
2929
{
3030
$request = $this->createRequest(['name' => 'specified', 'with' => 'extras']);
3131

32-
$request->validate();
32+
$request->validateResolved();
3333

3434
$this->assertEquals(['name' => 'specified'], $request->validated());
3535
}
@@ -43,7 +43,7 @@ public function test_validate_throws_when_validation_fails()
4343

4444
$this->mocks['redirect']->shouldReceive('withInput->withErrors');
4545

46-
$request->validate();
46+
$request->validateResolved();
4747
}
4848

4949
/**
@@ -52,12 +52,12 @@ public function test_validate_throws_when_validation_fails()
5252
*/
5353
public function test_validate_method_throws_when_authorization_fails()
5454
{
55-
$this->createRequest([], FoundationTestFormRequestForbiddenStub::class)->validate();
55+
$this->createRequest([], FoundationTestFormRequestForbiddenStub::class)->validateResolved();
5656
}
5757

5858
public function test_prepare_for_validation_runs_before_validation()
5959
{
60-
$this->createRequest([], FoundationTestFormRequestHooks::class)->validate();
60+
$this->createRequest([], FoundationTestFormRequestHooks::class)->validateResolved();
6161
}
6262

6363
/**

0 commit comments

Comments
 (0)