Skip to content

fix CPF validation #151

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

Merged
merged 2 commits into from
Apr 30, 2025
Merged

fix CPF validation #151

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7247b2a
fix CPF validation
ajconradie Apr 15, 2025
2899ae6
changes per discussion
ajconradie Apr 30, 2025
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
14 changes: 14 additions & 0 deletions src/validator-docs/Rules/Cpf.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,27 @@

namespace geekcom\ValidatorDocs\Rules;

use geekcom\ValidatorDocs\ValidatorFormats;

use function preg_match;
use function mb_strlen;

final class Cpf extends Sanitization
{
protected function validateFormat($value, $document, $attribute = null)
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Moving this method from the Validator class isn't a good idea. There, it may be used to handle other document types like CNPJ or both.
You may inject it here and use it as you do.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I am going to agree and disagree ...

I had it like that at first and it worked perfectly. BUT, when I looked at the code I saw that each validate (of the other types) was only 1 call, and it makes sense that each type of validation should do a thorough validation and validating the format is part of the validation. And that's why I moved it. Each of the validators should do a thorough validation .. that's my opinion. not leave it to an upper function to check formats as that is part of the validation.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I have this all implemented on my side in our production APP and it's working every day perfectly .. ;-)

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hmmm, good point! What do you think of isolating the method and changing the format validation to something like validateCpfFormat(string $value)? In this case, we may opt to move it to a similar context.

Please, apply the parameter's type hint to avoid errors in the future.

@geekcom any point more to add to this discussion?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes, great idea !

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

applied changes and pushed it

Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @ajconradie

{
if (!empty($value)) {
return (new ValidatorFormats())->execute($value, $document);
}
}

public function validateCpf($attribute, $value): bool
{

if (!$this->validateFormat($value, 'cpf')) {
return false;
}

$c = $this->sanitize($value);

if (mb_strlen($c) != 11 || preg_match("/^{$c[0]}{11}$/", $c)) {
Expand Down
9 changes: 0 additions & 9 deletions src/validator-docs/Validator.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,19 +30,10 @@ public function __construct(
parent::__construct($translator, $data, $rules, $messages, $customAttributes);
}

protected function validateFormat($value, $document, $attribute = null)
{
if (!empty($value)) {
return (new ValidatorFormats())->execute($value, $document);
}
}

protected function validateCpf($attribute, $value): bool
{
$cpf = new Cpf();

$this->validateFormat($value, 'cpf');

return $cpf->validateCpf($attribute, $value);
}

Expand Down
7 changes: 7 additions & 0 deletions tests/TestValidator.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,16 @@ public function cpf()
['errado' => 'cpf']
);

$incorrectWithAlpha = Validator::make(
['errado' => '094.050.986-59ABCDEF'],
['errado' => 'cpf']
);

$this->assertTrue($correct->passes());

$this->assertTrue($incorrect->fails());

$this->assertTrue($incorrectWithAlpha->fails());
}

/** @test **/
Expand Down