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

[6.x] Add new validateWithBag macro to Request #30896

Merged
merged 1 commit into from Dec 23, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
11 changes: 11 additions & 0 deletions src/Illuminate/Foundation/Providers/FoundationServiceProvider.php
Expand Up @@ -5,6 +5,7 @@
use Illuminate\Http\Request;
use Illuminate\Support\AggregateServiceProvider;
use Illuminate\Support\Facades\URL;
use Illuminate\Validation\ValidationException;

class FoundationServiceProvider extends AggregateServiceProvider
{
Expand Down Expand Up @@ -54,6 +55,16 @@ public function registerRequestValidation()
Request::macro('validate', function (array $rules, ...$params) {
return validator()->validate($this->all(), $rules, ...$params);
});

Request::macro('validateWithBag', function (string $errorBag, array $rules, ...$params) {
try {
return $this->validate($rules, ...$params);
} catch (ValidationException $e) {
$e->errorBag = $errorBag;

throw $e;
}
});
}

/**
Expand Down
20 changes: 20 additions & 0 deletions tests/Integration/Validation/RequestValidationTest.php
Expand Up @@ -28,4 +28,24 @@ public function testValidateMacroWhenItFails()

$request->validate(['name' => 'string']);
}

public function testValidateWithBagMacro()
{
$request = Request::create('/', 'GET', ['name' => 'Taylor']);

$validated = $request->validateWithBag('some_bag', ['name' => 'string']);

$this->assertSame(['name' => 'Taylor'], $validated);
}

public function testValidateWithBagMacroWhenItFails()
{
$request = Request::create('/', 'GET', ['name' => null]);

try {
$request->validateWithBag('some_bag', ['name' => 'string']);
} catch (ValidationException $validationException) {
$this->assertEquals('some_bag', $validationException->errorBag);
}
}
}