Merge branch 'develop' of https://github.com/geekcom/validator-docs i…

…nto develop
geekcom · Jan 16, 2020 · 09a651e · 09a651e
2 parents 8e8e1d3 + d50476f
commit 09a651e
Show file tree

Hide file tree

Showing 3 changed files with 44 additions and 11 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,16 @@
 
 <!-- dumped content start -->
 
+## [3.3.2]
+
+- [#55] Igualando develop e master, Thanks to [@geekcom]
+- [#54] Arrumando cnh, Thanks to [@MrEko]
+- [#51] update CHANGELOG.md, Thanks to [@geekcom]
+
+<!-- dumped content end -->
+
+<!-- dumped content start -->
+
 ## [3.3.1]
 
 - [#50] minor correction, update doc, Thanks to [@geekcom]
@@ -98,4 +108,7 @@
 [@andrergcosta]: https://github.com/andrergcosta
 [@MrEko]: https://github.com/MrEko
 [#49]: https://github.com/geekcom/validator-docs/pull/49
-[#50]: https://github.com/geekcom/validator-docs/pull/50
+[#50]: https://github.com/geekcom/validator-docs/pull/50
+[#55]: https://github.com/geekcom/validator-docs/pull/55
+[#54]: https://github.com/geekcom/validator-docs/pull/54
+[#51]: https://github.com/geekcom/validator-docs/pull/51
diff --git a/src/validator-docs/Rules/Cnh.php b/src/validator-docs/Rules/Cnh.php
@@ -10,7 +10,8 @@
 final class Cnh extends Sanitization
 {
     /**
-     * Trecho retirado do respect validation
+     * @author Evandro Kondrat
+     * Trecho reescrito com base no algoritmo passado pelo Detran-PR
      */
     public function validateCnh($attribute, $value): bool
     {
@@ -24,20 +25,32 @@ public function validateCnh($attribute, $value): bool
             return false;
         }
 
-        for ($c = $s1 = $s2 = 0, $p = 9; $c < 9; $c++, $p--) {
-            $s1 += (int) $value[$c] * $p;
-            $s2 += (int) $value[$c] * (10 - $p);
+        $parcial = substr($value, 0, 9);
+
+        for ($i = 0 , $j = 2, $s = 0; $i < mb_strlen($parcial); $i++, $j++) {
+            $s += (int) $parcial[$i] * $j;
         }
 
-        $dv1 = $s1 % 11;
-        if ($value[9] != ($dv1 > 9) ? 0 : $dv1) {
-            return false;
+        $resto = $s % 11;
+        if ($resto <= 1) {
+            $dv1 = 0;
+        } else {
+            $dv1 = 11 - $resto;
         }
 
-        $dv2 = $s2 % 11 - ($dv1 > 9 ? 2 : 0);
+        $parcial = $dv1.$parcial;
 
-        $check = $dv2 < 0 ? $dv2 + 11 : ($dv2 > 9 ? 0 : $dv2);
+        for ($i = 0, $j = 2, $s = 0; $i < mb_strlen($parcial); $i++, $j++) {
+            $s += (int) $parcial[$i] * $j;
+        }
+
+        $resto = $s % 11;
+        if ($resto <= 1) {
+            $dv2 = 0;
+        } else {
+            $dv2 = 11 - $resto;
+        }
 
-        return $value[10] == $check;
+        return $dv1.$dv2 == substr($value, -2);
     }
 }
diff --git a/tests/TestValidator.php b/tests/TestValidator.php
@@ -130,6 +130,13 @@ public function cnh()
         $this->assertTrue($correct->passes());
 
         $this->assertTrue($incorrect->fails());
+
+        $correct = \Validator::make(
+            ['certo' => '04463004100'],
+            ['certo' => 'cnh']
+        );
+
+        $this->assertTrue($correct->passes());
     }
 
     /** @test **/