Commit381b428

authored

Merge pull request#154 from geekcom/revert-151-master

Revert "fix CPF validation"

2 parents7d0040c +2d7e7ba commit381b428Copy full SHA for 381b428

File tree

-21

lines changed

-21

lines changed

Lines changed: 0 additions & 14 deletions

Original file line number	Diff line number	Diff line change
`@@ -4,27 +4,13 @@`
`4`	`4`
`5`	`5`	`namespacegeekcom\ValidatorDocs\Rules;`
`6`	`6`
`7`		`-usegeekcom\ValidatorDocs\ValidatorFormats;`
`8`		`-`
`9`	`7`	`usefunctionpreg_match;`
`10`	`8`	`usefunctionmb_strlen;`
`11`	`9`
`12`	`10`	`finalclass Cpfextends Sanitization`
`13`	`11`	`{`
`14`		`-protectedfunctionvalidateCPFFormat(string$value)`
`15`		`- {`
`16`		`-if (!empty($value)) {`
`17`		`-return (newValidatorFormats())->execute($value,'cpf');`
`18`		`- }`
`19`		`- }`
`20`		`-`
`21`	`12`	`publicfunctionvalidateCpf($attribute,$value):bool`
`22`	`13`	`{`
`23`		`-`
`24`		`-if (!$this->validateCPFFormat($value)) {`
`25`		`-returnfalse;`
`26`		`- }`
`27`		`-`
`28`	`14`	`$c =$this->sanitize($value);`
`29`	`15`
`30`	`16`	`if (mb_strlen($c) !=11 \|\|preg_match("/^{$c[0]}{11}$/",$c)) {`

Lines changed: 9 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -30,10 +30,19 @@ public function __construct(`
`30`	`30`	`parent::__construct($translator,$data,$rules,$messages,$customAttributes);`
`31`	`31`	`}`
`32`	`32`
	`33`	`+protectedfunctionvalidateFormat($value,$document,$attribute =null)`
	`34`	`+ {`
	`35`	`+if (!empty($value)) {`
	`36`	`+return (newValidatorFormats())->execute($value,$document);`
	`37`	`+ }`
	`38`	`+ }`
	`39`	`+`
`33`	`40`	`protectedfunctionvalidateCpf($attribute,$value):bool`
`34`	`41`	`{`
`35`	`42`	`$cpf =newCpf();`
`36`	`43`
	`44`	`+$this->validateFormat($value,'cpf');`
	`45`	`+`
`37`	`46`	`return$cpf->validateCpf($attribute,$value);`
`38`	`47`	`}`
`39`	`48`

Lines changed: 0 additions & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -19,16 +19,9 @@ public function cpf()`
`19`	`19`	`['errado' =>'cpf']`
`20`	`20`	`);`
`21`	`21`
`22`		`-$incorrectWithAlpha = Validator::make(`
`23`		`- ['errado' =>'094.050.986-59ABCDEF'],`
`24`		`- ['errado' =>'cpf']`
`25`		`- );`
`26`		`-`
`27`	`22`	`$this->assertTrue($correct->passes());`
`28`	`23`
`29`	`24`	`$this->assertTrue($incorrect->fails());`
`30`		`-`
`31`		`-$this->assertTrue($incorrectWithAlpha->fails());`
`32`	`25`	`}`
`33`	`26`
`34`	`27`	`/ @test /`

Comments

(0)