Fixed pull request requirements

mboiev · Mar 7, 2020 · 0f233c6 · 0f233c6
1 parent c5ca362
commit 0f233c6
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 38 deletions.
diff --git a/src/Rule/Length.php b/src/Rule/Length.php
@@ -3,6 +3,7 @@
 namespace Morebec\Validator\Rule;
 
 
+use InvalidArgumentException;
 use Morebec\Validator\ValidationRuleInterface;
 
 class Length implements ValidationRuleInterface
@@ -26,6 +27,8 @@ public function __construct(
         ?string $message = null
     )
     {
+        if ($length<0)
+            throw new InvalidArgumentException();
         $this->length = $length;
         $this->message = $message;
     }
@@ -37,7 +40,7 @@ public function __construct(
      */
     public function validate($v): bool
     {
-        return strlen($v) == $this->length;
+        return strlen($v) === $this->length;
     }
 
     /**
@@ -47,6 +50,6 @@ public function validate($v): bool
      */
     public function getMessage($v): string
     {
-        return $this->message?:"'${$v}' is supposed to be exactly ".$this->length." characters long";
+        return $this->message?:"'${$v}' is expected to be exactly ".$this->length." characters long";
     }
 }
diff --git a/src/Rule/MaxLength.php b/src/Rule/MaxLength.php
diff --git a/tests/Rule/LengthTest.php b/tests/Rule/LengthTest.php
@@ -3,6 +3,7 @@
 namespace Tests\Morebec\Validator\Rule;
 
 
+use InvalidArgumentException;
 use Morebec\Validator\Rule\Length;
 use PHPUnit\Framework\TestCase;
 
@@ -15,5 +16,8 @@ public function testValidate(){
         $this->assertTrue($ruleFirst->validate("test"));
         $this->assertFalse($ruleFirst->validate("test message"));
         $this->assertEquals("Custom message",$ruleSecond->getMessage("test"));
+
+        $this->expectException(InvalidArgumentException::class);
+        $ruleThird = new Length(-1);
     }
 }