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.

Sign up for GitHub

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

Ja/last upstream code with our change #19

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
Open

Ja/last upstream code with our change #19

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
af26309
get the project working
janalwin Sep 23, 2020
1daefcc
Merge branch 'master' of https://github.com/dit-werkt/form-request-te…
janalwin Jan 18, 2022
a9a169e
Volgens mij zou het voldoende moeten zijn om alleen buildFormRequest …
janalwin Jan 18, 2022
cdf640e
Dit moest er ook nog in om er voor te zorgen dat de validatie loopt a…
janalwin Jan 18, 2022
c449b11
nog iets wat ik er niet weg had moeten laten...
janalwin Jan 18, 2022
893d36e
stomme tikfout
janalwin Jan 18, 2022
ecd4747
herstel check of de validatie gelopen heeft.
janalwin Jan 19, 2022
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: 12 additions & 3 deletions src/FormRequestTester.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,9 @@ class FormRequestTester
*/
private $validated;


private $validationHasBeenRun = false;

/**
* Create new FormRequestTester instance
*
Expand Down Expand Up @@ -214,10 +217,14 @@ public function formRequest()
*/
public function checkFormRequest()
{
if (!is_null($this->currentFormRequest)) {
if (!is_null($this->currentFormRequest) && $this->validationHasBeenRun) {
return;
}
$this->buildFormRequest();

if (is_null($this->currentFormRequest)) {
$this->buildFormRequest();
}

$this->validateFormRequest();
}

Expand All @@ -226,7 +233,7 @@ public function checkFormRequest()
*
* @return void
*/
private function buildFormRequest()
public function buildFormRequest()
{
$this->currentFormRequest =
$this->formRequest::create($this->getRoute(), $this->method, $this->data)
Expand Down Expand Up @@ -272,6 +279,8 @@ private function validateFormRequest()
} catch (AuthorizationException $e) {
$this->formRequestAuthorized = false;
}

$this->validationHasBeenRun = true;
}

/**
Expand Down