add new test and modified rules

Author: SkyWalkerGhost

.gitignore

@@ -3,3 +3,4 @@
 /.idea
 /.vscode
 composer.lock
+.phpunit.cache

CHANGELOG.md

@@ -2,6 +2,12 @@
 
 All notable changes to `shergela/validation-rule` will be documented in this file.
 
+## 1.0.2 | 23 August - 2024
+
+## Modified Rule::in() and Rule::notIn() rules.
+### Add tests.
+
+
 ## 1.0.2 | 19 August - 2024
 
 ## These methods work with timezones

composer.json

@@ -8,6 +8,11 @@
             "Shergela\\Validations\\": "src"
         }
     },
+    "autoload-dev": {
+        "psr-4": {
+            "Shergela\\Validations\\": "tests"
+        }
+    },
     "authors": [
         {
             "name": "Avto Shergelashvili",

phpunit.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
+         bootstrap="vendor/autoload.php"
+         cacheDirectory=".phpunit.cache"
+         executionOrder="depends,defects"
+         beStrictAboutCoverageMetadata="true"
+         beStrictAboutOutputDuringTests="true"
+         failOnRisky="true"
+         failOnWarning="true"
+         colors="true">
+    <testsuites>
+        <testsuite name="default">
+            <directory suffix=".php">tests</directory>
+        </testsuite>
+    </testsuites>
+</phpunit>

src/DataManipulation/InNotInRuleManipulation.php

@@ -0,0 +1,48 @@
+<?php
+
+namespace Shergela\Validations\DataManipulation;
+
+use BackedEnum;
+use Illuminate\Contracts\Support\Arrayable;
+use UnitEnum;
+
+class InNotInRuleManipulation
+{
+    /**
+     * @param Arrayable<int, string>|array<string>|string $values
+     */
+    public function __construct(protected readonly Arrayable|array|string $values)
+    {
+    }
+
+    /**
+     * @return string
+     */
+    private function manipulation(): string
+    {
+        $values = $this->values;
+
+        $values = array_map(function ($value) {
+            $value = match (true) {
+                 $value instanceof BackedEnum => $value->value,
+                 $value instanceof UnitEnum => $value->name,
+                default => $value,
+            };
+
+            /** @var string $v */
+            $v = $value;
+
+            return '"' . str_replace('"', '""', $v) . '"';
+        }, (array) $values);
+
+        return implode(',', $values);
+    }
+
+    /**
+     * @return string
+     */
+    public function handle(): string
+    {
+        return $this->manipulation();
+    }
+}

src/Validation/Rule.php

@@ -2,14 +2,17 @@
 
 namespace Shergela\Validations\Validation;
 
+use BackedEnum;
 use Closure;
 use DateTimeZone;
+use Illuminate\Contracts\Support\Arrayable;
 use Illuminate\Contracts\Validation\DataAwareRule;
 use Illuminate\Contracts\Validation\ValidationRule;
 use Illuminate\Contracts\Validation\ValidatorAwareRule;
 use Illuminate\Support\Arr;
 use Illuminate\Support\Facades\Validator as ValidatorFacade;
 use Illuminate\Validation\Validator;
+use Shergela\Validations\DataManipulation\InNotInRuleManipulation;
 use Shergela\Validations\Enums\DatetimeZoneAbbreviationEnum;
 use Shergela\Validations\Enums\ValidationDateEnum;
 use Shergela\Validations\Enums\ValidationIntegerEnum as IntegerRule;
@@ -22,6 +25,7 @@
 use Shergela\Validations\Rules\TimezoneRegionValidation as TimezoneRegion;
 use Shergela\Validations\Rules\TimezoneValidation as Timezone;
 use Shergela\Validations\Rules\UppercaseFirstLetter as UpperFL;
+use UnitEnum;
 
 class Rule extends BuildValidationRule implements ValidationRule, ValidatorAwareRule, DataAwareRule
 {
@@ -909,27 +913,37 @@ public function size(int $size): static
     }
 
     /**
-     * @param array<string> $values
+     * @param Arrayable<int, string>|array<string>|string $values
      * @return Rule
      */
-    public static function in(array $values): Rule
+    public static function in(Arrayable|array|string $values): Rule
     {
-        $implode = implode(',', $values);
+        if ($values instanceof Arrayable) {
+            $values = $values->toArray();
+        }
+
+        /** @var Arrayable<int, string>|array<string>|string $values */
+        $values = is_array($values) ? $values : func_get_args();
 
-        static::$in = RuleEnum::IN . $implode;
+        static::$in = RuleEnum::IN . (new InNotInRuleManipulation(values: $values))->handle();
 
         return new self();
     }
 
     /**
-     * @param array<string> $values
+     * @param Arrayable<int, string>|array<string>|string $values
      * @return Rule
      */
-    public static function notIn(array $values): Rule
+    public static function notIn(Arrayable|array|string $values): Rule
     {
-        $implode = implode(',', $values);
+        if ($values instanceof Arrayable) {
+            $values = $values->toArray();
+        }
 
-        static::$notIn = RuleEnum::NOT_IN . $implode;
+        /** @var Arrayable<int, string>|array<string>|string $values */
+        $values = is_array($values) ? $values : func_get_args();
+
+        static::$notIn = RuleEnum::NOT_IN . (new InNotInRuleManipulation(values: $values))->handle();
 
         return new self();
     }
@@ -970,6 +984,32 @@ public function passes(string $attribute, mixed $value): bool
         return true;
     }
 
+    /**
+     * @return array<string>
+     */
+    public function getRules(): array
+    {
+        return $this->getValidationRules();
+    }
+
+    /**
+     * @param int $key
+     * @return string|null
+     */
+    public function getRule(int $key = 0): string|null
+    {
+        $rules = $this->getRules();
+
+        /**
+         * Get only one element of the array
+         */
+        if (isset($rules[$key])) {
+            return $rules[$key];
+        }
+
+        return null;
+    }
+
     /**
      * Adds the given failures, and return false.
      *

tests/RuleInTest.php

@@ -0,0 +1,66 @@
+<?php
+
+namespace Shergela\Validations;
+
+
+use App\Enums\TestEnum;
+use Shergela\Validations\Validation\Rule;
+use Tests\TestCase;
+
+class RuleInTest extends TestCase
+{
+    public function test_in_validation()
+    {
+        $rule = Rule::in(['Laravel', 'Framework', 'PHP'])->getRule();
+
+        $this->assertSame('in:"Laravel","Framework","PHP"', (string) $rule);
+
+        $rule = Rule::in(collect(['Taylor', 'Michael', 'Tim']))->getRule();
+
+        $this->assertSame('in:"Taylor","Michael","Tim"', (string) $rule);
+
+        $rule = Rule::in(['Life, the Universe and Everything', 'this is a "quote"'])->getRule();
+
+        $this->assertSame('in:"Life, the Universe and Everything","this is a ""quote"""', (string) $rule);
+
+        $rule = Rule::in(collect([1, 2, 3, 4]))->getRule();
+
+        $this->assertSame('in:"1","2","3","4"', (string) $rule);
+
+        $rule = Rule::in(collect([1, 2, 3, 4]))->getRule();
+
+        $this->assertSame('in:"1","2","3","4"', (string) $rule);
+
+        $rule = Rule::in(["a,b\nc,d"])->getRule();
+
+        $this->assertSame("in:\"a,b\nc,d\"", (string) $rule);
+
+        $rule = Rule::in([1, 2, 3, 4])->getRule();
+
+        $this->assertSame('in:"1","2","3","4"', (string) $rule);
+
+        $rule = Rule::in(collect([1, 2, 3, 4]))->getRule();
+
+        $this->assertSame('in:"1","2","3","4"', (string) $rule);
+
+        $rule = Rule::in('1', '2', '3', '4')->getRule();
+
+        $this->assertSame('in:"1","2","3","4"', (string) $rule);
+
+        $rule = Rule::in('1', '2', '3', '4')->getRule();
+
+        $this->assertSame('in:"1","2","3","4"', (string) $rule);
+
+        $rule = Rule::in([TestEnum::ONE])->getRule();
+
+        $this->assertSame('in:"1"', (string) $rule);
+
+        $rule = Rule::in([TestEnum::TWO])->getRule();
+
+        $this->assertSame('in:"2"', (string) $rule);
+
+        $rule = Rule::in([TestEnum::STRING_ONE])->getRule();
+
+        $this->assertSame('in:"one"', (string) $rule);
+    }
+}

tests/RuleNotInTest.php

@@ -0,0 +1,66 @@
+<?php
+
+namespace Shergela\Validations;
+
+
+use App\Enums\TestEnum;
+use Shergela\Validations\Validation\Rule;
+use Tests\TestCase;
+
+class RuleNotInTest extends TestCase
+{
+    public function test_not_in_validation()
+    {
+        $rule = Rule::notIn(['Caldera', 'Aramis', 'Athos'])->getRule(1);
+
+        $this->assertSame('not_in:"Caldera","Aramis","Athos"', (string) $rule);
+
+        $rule = Rule::notIn(collect(['Taylor', 'Michael', 'Tim']))->getRule(1);
+
+        $this->assertSame('not_in:"Taylor","Michael","Tim"', (string) $rule);
+
+        $rule = Rule::notIn(['Life, the Universe and Everything', 'this is a "quote"'])->getRule(1);
+
+        $this->assertSame('not_in:"Life, the Universe and Everything","this is a ""quote"""', (string) $rule);
+
+        $rule = Rule::notIn(collect([1, 2, 3, 4]))->getRule(1);
+
+        $this->assertSame('not_in:"1","2","3","4"', (string) $rule);
+
+        $rule = Rule::notIn(collect([1, 2, 3, 4]))->getRule(1);
+
+        $this->assertSame('not_in:"1","2","3","4"', (string) $rule);
+
+        $rule = Rule::notIn(["a,b\nc,d"])->getRule(1);
+
+        $this->assertSame("not_in:\"a,b\nc,d\"", (string) $rule);
+
+        $rule = Rule::notIn([1, 2, 3, 4])->getRule(1);
+
+        $this->assertSame('not_in:"1","2","3","4"', (string) $rule);
+
+        $rule = Rule::notIn(collect([1, 2, 3, 4]))->getRule(1);
+
+        $this->assertSame('not_in:"1","2","3","4"', (string) $rule);
+
+        $rule = Rule::notIn('1', '2', '3', '4')->getRule(1);
+
+        $this->assertSame('not_in:"1","2","3","4"', (string) $rule);
+
+        $rule = Rule::notIn('1', '2', '3', '4')->getRule(1);
+
+        $this->assertSame('not_in:"1","2","3","4"', (string) $rule);
+
+        $rule = Rule::notIn([TestEnum::ONE])->getRule(1);
+
+        $this->assertSame('not_in:"1"', (string) $rule);
+
+        $rule = Rule::notIn([TestEnum::TWO])->getRule(1);
+
+        $this->assertSame('not_in:"2"', (string) $rule);
+
+        $rule = Rule::notIn([TestEnum::STRING_ONE])->getRule(1);
+
+        $this->assertSame('not_in:"one"', (string) $rule);
+    }
+}