Skip to content
Draft
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
15 changes: 13 additions & 2 deletions src/Illuminate/Http/Concerns/CanBePrecognitive.php
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,20 @@ public function filterPrecognitiveRules($rules)
return $rules;
}

$validateOnly = explode(',', $this->header('Precognition-Validate-Only'));
$validateOnlyPatterns = (new Collection($validateOnly))
->map(fn ($pattern) => '/^'.str_replace('\*', '\d+', preg_quote($pattern, '/')).'$/');

return (new Collection($rules))
->only(explode(',', $this->header('Precognition-Validate-Only')))
->all();
->filter(function ($rule, $ruleKey) use ($validateOnlyPatterns) {
foreach ($validateOnlyPatterns as $pattern) {
if (preg_match($pattern, $ruleKey)) {
return true;
}
}

return false;
})->all();
}

/**
Expand Down
61 changes: 61 additions & 0 deletions tests/Integration/Routing/PrecognitionTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -456,6 +456,51 @@ public function testClientCanSpecifyInputsToValidateWhenUsingControllerValidateW
]);
}

public function testClientCanSpecifySimpleArrayWildcardToValidateWhenUsingControllerValidateWithPassingArrayOfRules()
{
Route::post('test-route', [PrecognitionTestController::class, 'methodWhereArrayRulesAreValidateViaControllerValidate'])
->middleware(PrecognitionInvokingController::class);

$response = $this->postJson('test-route', [
'raw_array' => [123, 'someString'],
], [
'Precognition' => 'true',
'Precognition-Validate-Only' => 'raw_array.*',
]);

$response->assertUnprocessable();
$response->assertHeaderMissing('Precognition-Success');
$response->assertJsonPath('errors', [
'raw_array.0' => [
'The raw_array.0 field must be a string.',
],
]);
}

public function testClientCanSpecifyComplexArrayWildcardToValidateWhenUsingControllerValidateWithPassingArrayOfRules()
{
Route::post('test-route', [PrecognitionTestController::class, 'methodWhereArrayRulesAreValidateViaControllerValidate'])
->middleware(PrecognitionInvokingController::class);

$response = $this->postJson('test-route', [
'nested_array' => [
['name' => 123],
['name' => 'someString'],
],
], [
'Precognition' => 'true',
'Precognition-Validate-Only' => 'nested_array.*.name',
]);

$response->assertUnprocessable();
$response->assertHeaderMissing('Precognition-Success');
$response->assertJsonPath('errors', [
'nested_array.0.name' => [
'The nested_array.0.name field must be a string.',
],
]);
}

public function testItAppendsAnAdditionalVaryHeaderInsteadOfReplacingAnyExistingVaryHeaders()
{
Route::get('test-route', function () {
Expand Down Expand Up @@ -1117,6 +1162,22 @@ public function methodWhereNestedRulesAreValidatedViaControllerValidate(Request
fail();
}

public function methodWhereArrayRulesAreValidateViaControllerValidate(Request $request)
{
precognitive(function () use ($request) {
$this->validate($request, [
'nested_array' => ['required', 'array', 'min:1'],
'nested_array.*.name' => ['required', 'string'],
'raw_array' => ['required', 'array', 'min:1'],
'raw_array.*' => ['required', 'string'],
]);

fail();
});

fail();
}

public function methodWhereNestedRulesAreValidatedViaControllerValidateWith(Request $request)
{
precognitive(function () {
Expand Down