Add more rules and tests

Author: populov

README.md

@@ -13,9 +13,9 @@ $ composer require saritasa/laravel-fluid-validation
 **Example**:
 ```php
 $rules = [
-    'id' => Rule::int()->required(),
-    'name' => Rule::string()->required()->minLength(3),
-    'email' => Rule::string()->required()->email()
+    'id' => Rule::int()->required()->toString(),
+    'name' => Rule::string()->required()->minLength(3)->toString(),
+    'email' => Rule::string()->required()->email()->toArray()
 ]
 ```
 

src/RuleSet.php

@@ -20,6 +20,16 @@ public function required()
         return $this->appendIfNotExists('required');
     }
 
+    public function requiredWith(string $otherField)
+    {
+        return $this->appendIfNotExists("required_with:$otherField");
+    }
+
+    public function requiredWithout(string $otherField)
+    {
+        return $this->appendIfNotExists("required_without:$otherField");
+    }
+
     protected function appendIfNotExists(string $rule)
     {
         if (in_array($rule, $this->rules)) {

src/StringRuleSet.php

@@ -14,7 +14,14 @@ public function email(): StringRuleSet
         return $this->appendIfNotExists('email');
     }
 
-    public function regex(string $pattern){
+    public function regex(string $pattern, bool $ignoreCase = false): StringRuleSet
+    {
+        if (!starts_with($pattern, '/')) {
+            $pattern = "/$pattern/";
+        }
+        if ($ignoreCase && !ends_with('i', $pattern)) {
+            $pattern .= 'i';
+        }
         return $this->appendIfNotExists("regex:$pattern");
     }
 }

tests/IntRulesTest.php

@@ -0,0 +1,15 @@
+<?php
+
+namespace Saritasa\Laravel\Validation\Tests;
+
+use PHPUnit\Framework\TestCase;
+use Saritasa\Laravel\Validation\Rule;
+
+class IntRulesTest extends TestCase
+{
+    function testMinMax()
+    {
+        $rules = Rule::int()->min(1)->max(10);
+        $this->assertEquals('int|min:1|max:10', $rules->toString());
+    }
+}

tests/RuleTest.php

@@ -25,9 +25,10 @@ public function testInt()
         $this->assertEquals('int', $rules->toString());
     }
 
-    public function testFluidString()
+    public function testDoNotRepeat()
     {
-        $rules = Rule::required()->string()->email();
-        $this->assertEquals('required|string|email', $rules->toString());
+        $this->assertEquals('required', Rule::required()->required()->required()->toString());
+        $this->assertEquals('required|string', Rule::required()->string()->required()->required()->toString());
+        $this->assertEquals('string|required', Rule::string()->required()->required()->required()->toString());
     }
 }

tests/StringRulesTest.php

@@ -0,0 +1,27 @@
+<?php
+
+namespace Saritasa\Laravel\Validation\Tests;
+
+use PHPUnit\Framework\TestCase;
+use Saritasa\Laravel\Validation\Rule;
+
+class StringRulesTest extends TestCase
+{
+    public function testFluidString()
+    {
+        $rules = Rule::required()->string()->email()->requiredWithout('facebook_id');
+        $this->assertEquals('required|string|email|required_without:facebook_id', $rules->toString());
+    }
+
+    public function testRegex()
+    {
+        $rules = Rule::string()->regex('/^\w+[\w-\.]*\w+$/');
+        $this->assertEquals('string|regex:/^\w+[\w-\.]*\w+$/', $rules->toString());
+    }
+
+    public function testDoNotRepeat()
+    {
+        $rules = Rule::string()->email()->email()->regex('@mail.ru$')->regex('@mail.ru$')->email();
+        $this->assertEquals('string|email|regex:/@mail.ru$/', $rules->toString());
+    }
+}