Contains uppercase characters rule

src/Rule/ContainsUppercaseCharacters.php

@@ -0,0 +1,84 @@
+<?php
+
+namespace Morebec\Validator\Rule;
+
+
+use Morebec\Validator\ValidationRuleInterface;
+
+class ContainsUppercaseCharacters implements ValidationRuleInterface
+{
+    /**
+     * @var int
+     */
+    private $numberCharacters;
+
+    /**
+     * @var bool
+     */
+    private $strict;
+    /**
+     * @var string|null
+     */
+    private $message;
+
+    /**
+     * ContainsUppercaseCharacters constructor.
+     * @param int|null $numberCharacters
+     * @param bool|null $strict
+     * @param string|null $message
+     */
+    public function __construct(
+        ?int $numberCharacters = 1,
+        ?bool $strict = false,
+        ?string $message = null
+    )
+    {
+        $this->numberCharacters = $numberCharacters;
+        $this->strict = $strict;
+        $this->message = $message;
+    }
+
+    /**
+     * Validates a value according to this rule and returns if it is valid or not
+     * @param mixed $v
+     * @return bool true if valid, otherwise false
+     */
+    public function validate($v): bool
+    {
+        if($this->strict){
+            return $this->countUpperCase($v)<=$this->numberCharacters;
+        }
+        else{
+            return $this->countUpperCase($v)>=$this->numberCharacters;
+        }
+    }
+
+    /**
+     * Returns the message to be used in case the validation did not pass
+     * @param mixed $v the value that did not pass the validation
+     * @return string
+     */
+    public function getMessage($v): string
+    {
+        if($this->message){
+            return $this->message;
+        }
+        else if($this->strict){
+            return "Number of uppercase characters exceeds ".${$this->numberCharacters};
+        }
+        else{
+            return "Number of uppercase characters should exceed ".${$this->numberCharacters};
+        }
+    }
+
+    /**
+     * @param string $message
+     * @return int
+     */
+    private function countUpperCase(string $message): int
+    {
+        $lowerCase = strtolower($message);
+        $similar = similar_text($message, $lowerCase);
+        return strlen($message)-$similar;
+    }
+}

src/Rule/MaxLength.php

@@ -13,9 +13,18 @@ class MaxLength implements ValidationRuleInterface
      */
     private $length;
 
-    public function __construct(int $length)
+    /**
+     * @var int
+     */
+    private $message;
+
+    public function __construct(
+        int $length,
+        ?string $message = null
+    )
     {
         $this->length = $length;
+        $this->message = $message;
     }
 
     /**
@@ -31,6 +40,6 @@ public function validate($v): bool
      */
     public function getMessage($v): string
     {
-        return "The length of '{$v}' was expected to be at most {$this->length} characters long";
+        return $this->message?:"The length of '{$v}' was expected to be at most {$this->length} characters long";
     }
 }

tests/Rule/ContainsUppercaseCharactersTest.php

@@ -0,0 +1,20 @@
+<?php
+
+namespace Tests\Morebec\Validator\Rule;
+
+use Morebec\Validator\Rule\ContainsUppercaseCharacters;
+use PHPUnit\Framework\TestCase;
+
+class ContainsUppercaseCharactersTest extends TestCase
+{
+    public function testValidate(){
+        $ruleFirst = new ContainsUppercaseCharacters(1,true);
+        $ruleSecond = new ContainsUppercaseCharacters(1,false);
+        $ruleThird= new ContainsUppercaseCharacters(1,false,"Custom Message");
+        $this->assertTrue($ruleFirst->validate("Test string"));
+        $this->assertFalse($ruleFirst->validate("Test String"));
+        $this->assertFalse($ruleSecond->validate('test string'));
+        $this->assertTrue($ruleSecond->validate('Test String'));
+        $this->assertEquals( "Custom Message", $ruleThird->getMessage("test string"));
+    }
+}

tests/Rule/MaxLengthTest.php

@@ -0,0 +1,26 @@
+<?php
+
+namespace Tests\Morebec\Validator\Rule;
+
+
+use Morebec\Validator\Rule\MaxLength;
+use PHPUnit\Framework\TestCase;
+
+class MaxLengthTest extends TestCase
+{
+    public function testValidate()
+    {
+        $firstRule = new MaxLength(5);
+        $secondRule = new MaxLength(5,"Custom message");
+        $this->assertTrue($firstRule->validate("test"));
+        $this->assertFalse($firstRule->validate("long test"));
+        $this->assertEquals(
+            "The length of 'arr' was expected to be at most 5 characters long",
+            $firstRule->getMessage("arr")
+        );
+        $this->assertEquals(
+            "Custom message",
+            $secondRule->getMessage("arr")
+        );
+    }
+}