Merge pull request #8 from LSFLK/nizar-dev

validate charset in strict mode
LSFLK · Jun 16, 2020 · 75aec58 · 75aec58
2 parents 96bd017 + 51907bd
commit 75aec58
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/src/UniqueUid.php b/src/UniqueUid.php
@@ -126,7 +126,7 @@ public static function isValidUniqueId(string $token)
         $length = strlen($token);
 
         // validate the character set
-        $valid = preg_match("/^[" . self::$charSet . "]/", $token);
+        $valid = preg_match("/^[" . self::$charSet . "]+$/", $token);
         if (!$valid) {
             return false;
         }elseif(is_numeric($token)){

diff --git a/tests/ExampleTest.php b/tests/ExampleTest.php
@@ -43,6 +43,10 @@ public function testInvalid(){
         $this->assertEquals(false,$valid5);
         $valid6 = $this->userId::isValidUniqueId('A0401157841844');
         $this->assertEquals(false,$valid6);
+        $valid6 = $this->userId::isValidUniqueId('B0216157494076');
+        $this->assertEquals(false,$valid6);
+        $valid7 = $this->userId::isValidUniqueId('D216157494076');
+        $this->assertEquals(false,$valid7);
     }
 
     public function testArrayInput() {