base64 based types added

anshu-krishna · anshu-krishna · commit 625dccadc498 · 2022-02-04T16:00:00.000+05:30
diff --git a/composer.json b/composer.json
@@ -9,9 +9,10 @@
             "email": "anshu.krishna5@gmail.com"
         }
     ],
-    "version": "2.4",
+    "version": "2.5",
     "require": {
-        "php": ">=8.1"
+        "php": ">=8.1",
+        "anshu-krishna/php-utilities": "^1.0"
     },
     "autoload": {
         "psr-4": {
diff --git a/src/StaticOnlyTrait.php b/src/StaticOnlyTrait.php
diff --git a/src/TypeHandler.php b/src/TypeHandler.php
@@ -20,14 +20,18 @@ private static function init_cache() {
 			'int'		=> 'IntType',
 			'ipv4'		=> 'IPv4Type',
 			'ipv6'		=> 'IPv6Type',
+			'json'		=> 'JsonType',
+			'json64'	=> 'Json64Type',
 			'mac'		=> 'MACType',
 			'mixed'		=> 'MixedType',
 			'null'		=> 'NullType',
 			'number'	=> 'NumberType',
 			'string'	=> 'StringType',
+			'string64'	=> 'String64Type',
 			'timestamp'	=> 'TimestampType',
 			'unsigned'	=> 'UnsignedType',
 			'url'		=> 'URLType',
+			'url64'		=> 'URL64Type',
 		] as $k => $v) {
 			static::$types_cache[$k] = static::NSPathCache . $v;
 		}
diff --git a/src/Types/BoolType.php b/src/Types/BoolType.php
@@ -4,7 +4,7 @@
 use Krishna\DataValidator\Returner;
 
 class BoolType implements \Krishna\DataValidator\TypeInterface {
-	use \Krishna\DataValidator\StaticOnlyTrait;
+	use \Krishna\Utilities\StaticOnlyTrait;
 	const Name = 'bool';
 
 	public static function validate($value, bool $allow_null = false) : Returner {
diff --git a/src/Types/EmailType.php b/src/Types/EmailType.php
@@ -4,7 +4,7 @@
 use Krishna\DataValidator\Returner;
 
 class EmailType implements \Krishna\DataValidator\TypeInterface {
-	use \Krishna\DataValidator\StaticOnlyTrait;
+	use \Krishna\Utilities\StaticOnlyTrait;
 	const Name = 'email';
 
 	public static function validate($value, bool $allow_null = false) : Returner {
diff --git a/src/Types/FloatType.php b/src/Types/FloatType.php
@@ -4,7 +4,7 @@
 use Krishna\DataValidator\Returner;
 
 class FloatType implements \Krishna\DataValidator\TypeInterface {
-	use \Krishna\DataValidator\StaticOnlyTrait;
+	use \Krishna\Utilities\StaticOnlyTrait;
 	const Name = 'float';
 
 	public static function validate($value, bool $allow_null = false) : Returner {
diff --git a/src/Types/HexType.php b/src/Types/HexType.php
@@ -4,7 +4,7 @@
 use Krishna\DataValidator\Returner;
 
 class HexType implements \Krishna\DataValidator\TypeInterface {
-	use \Krishna\DataValidator\StaticOnlyTrait;
+	use \Krishna\Utilities\StaticOnlyTrait;
 	const Name = 'hex';
 
 	public static function validate($value, bool $allow_null = false) : Returner {
diff --git a/src/Types/IPv4Type.php b/src/Types/IPv4Type.php
@@ -4,7 +4,7 @@
 use Krishna\DataValidator\Returner;
 
 class IPv4Type implements \Krishna\DataValidator\TypeInterface {
-	use \Krishna\DataValidator\StaticOnlyTrait;
+	use \Krishna\Utilities\StaticOnlyTrait;
 	const Name = 'IPv4';
 
 	public static function validate($value, bool $allow_null = false) : Returner {
diff --git a/src/Types/IPv6Type.php b/src/Types/IPv6Type.php
@@ -4,7 +4,7 @@
 use Krishna\DataValidator\Returner;
 
 class IPv6Type implements \Krishna\DataValidator\TypeInterface {
-	use \Krishna\DataValidator\StaticOnlyTrait;
+	use \Krishna\Utilities\StaticOnlyTrait;
 	const Name = 'IPv6';
 
 	public static function validate($value, bool $allow_null = false) : Returner {
diff --git a/src/Types/IntType.php b/src/Types/IntType.php
@@ -4,7 +4,7 @@
 use Krishna\DataValidator\Returner;
 
 class IntType implements \Krishna\DataValidator\TypeInterface {
-	use \Krishna\DataValidator\StaticOnlyTrait;
+	use \Krishna\Utilities\StaticOnlyTrait;
 	const Name = 'int';
 
 	public static function validate($value, bool $allow_null = false) : Returner {
diff --git a/src/Types/Json64Type.php b/src/Types/Json64Type.php
@@ -0,0 +1,22 @@
+<?php
+namespace Krishna\API\DataType;
+use Krishna\DataValidator\Returner;
+use Krishna\DataValidator\Types\JsonType;
+use Krishna\DataValidator\Types\String64Type;
+
+class Json64Type implements \Krishna\DataValidator\TypeInterface {
+	use \Krishna\Utilities\StaticOnlyTrait;
+	const Name = 'string:{Base64URL encoded JSON}';
+
+	public static function validate($value, bool $allow_null = false): Returner {
+		if(($value = String64Type::validate($value, $allow_null))->valid) {
+			if($allow_null && $value->value === null) {
+				return $value;
+			}
+			if(($value = JsonType::validate($value->value, $allow_null))->valid) {
+				return $value;
+			}
+		}
+		return Returner::invalid(static::Name);
+	}
+}
diff --git a/src/Types/JsonType.php b/src/Types/JsonType.php
@@ -0,0 +1,22 @@
+<?php
+namespace Krishna\DataValidator\Types;
+
+use Krishna\DataValidator\Returner;
+use Krishna\Utilities\JSON;
+
+class JsonType implements \Krishna\DataValidator\TypeInterface {
+	use \Krishna\Utilities\StaticOnlyTrait;
+	const Name = 'string:{JSON}';
+
+	public static function validate($value, bool $allow_null = false): Returner {
+		if(($value = StringType::validate($value, $allow_null))->valid) {
+			if($allow_null && $value->value === null) {
+				return $value;
+			}
+			if(($value = JSON::decode($value->value)) !== null) {
+				return Returner::valid($value);
+			}
+		}
+		return Returner::invalid(static::Name);
+	}
+}
diff --git a/src/Types/MACType.php b/src/Types/MACType.php
@@ -4,7 +4,7 @@
 use Krishna\DataValidator\Returner;
 
 class MACType implements \Krishna\DataValidator\TypeInterface {
-	use \Krishna\DataValidator\StaticOnlyTrait;
+	use \Krishna\Utilities\StaticOnlyTrait;
 	const Name = 'MAC';
 
 	public static function validate($value, bool $allow_null = false) : Returner {
diff --git a/src/Types/MixedType.php b/src/Types/MixedType.php
@@ -4,7 +4,7 @@
 use Krishna\DataValidator\Returner;
 
 class MixedType implements \Krishna\DataValidator\TypeInterface {
-	use \Krishna\DataValidator\StaticOnlyTrait;
+	use \Krishna\Utilities\StaticOnlyTrait;
 	const Name = 'mixed';
 
 	public static function validate($value, bool $allow_null = false) : Returner {
diff --git a/src/Types/NullType.php b/src/Types/NullType.php
@@ -4,7 +4,7 @@
 use Krishna\DataValidator\Returner;
 
 class NullType implements \Krishna\DataValidator\TypeInterface {
-	use \Krishna\DataValidator\StaticOnlyTrait;
+	use \Krishna\Utilities\StaticOnlyTrait;
 	const Name = 'null';
 
 	public static function validate($value, bool $allow_null = false) : Returner {
diff --git a/src/Types/NumberType.php b/src/Types/NumberType.php
@@ -4,7 +4,7 @@
 use Krishna\DataValidator\Returner;
 
 class NumberType implements \Krishna\DataValidator\TypeInterface {
-	use \Krishna\DataValidator\StaticOnlyTrait;
+	use \Krishna\Utilities\StaticOnlyTrait;
 	const Name = 'number';
 
 	public static function validate($value, bool $allow_null = false) : Returner {
diff --git a/src/Types/String64Type.php b/src/Types/String64Type.php
@@ -0,0 +1,21 @@
+<?php
+namespace Krishna\DataValidator\Types;
+use Krishna\DataValidator\Returner;
+use Krishna\Utilities\Base64;
+
+class String64Type implements \Krishna\DataValidator\TypeInterface {
+	use \Krishna\Utilities\StaticOnlyTrait;
+	const Name = 'string:{Base64URL encoded}';
+
+	public static function validate($value, bool $allow_null = false) : Returner {
+		if(($value = StringType::validate($value, $allow_null))->valid) {
+			if($allow_null && $value->value === null) {
+				return $value;
+			}
+			if(($value = Base64::decode($value->value, true)) !== null) {
+				return Returner::valid($value);
+			}
+		}
+		return Returner::invalid(static::Name);
+	}
+}
diff --git a/src/Types/StringType.php b/src/Types/StringType.php
@@ -4,7 +4,7 @@
 use Krishna\DataValidator\Returner;
 
 class StringType implements \Krishna\DataValidator\TypeInterface {
-	use \Krishna\DataValidator\StaticOnlyTrait;
+	use \Krishna\Utilities\StaticOnlyTrait;
 	const Name = 'string';
 	private static function can_be_string($var) {
 		return $var === null || is_scalar($var) || (is_object($var) && method_exists($var, '__toString'));
diff --git a/src/Types/TimestampType.php b/src/Types/TimestampType.php
@@ -4,7 +4,7 @@
 use Krishna\DataValidator\Returner;
 
 class TimestampType implements \Krishna\DataValidator\TypeInterface {
-	use \Krishna\DataValidator\StaticOnlyTrait;
+	use \Krishna\Utilities\StaticOnlyTrait;
 	const Name = 'timestamp';
 
 	public static function validate($value, bool $allow_null = false) : Returner {
diff --git a/src/Types/URL64Type.php b/src/Types/URL64Type.php
@@ -0,0 +1,21 @@
+<?php
+namespace Krishna\DataValidator\Types;
+use Krishna\DataValidator\Returner;
+use Krishna\DataValidator\Types\URLType;
+
+class URL64Type implements \Krishna\DataValidator\TypeInterface {
+	use \Krishna\Utilities\StaticOnlyTrait;
+	const Name = 'url:{Base64URL encoded}';
+
+	public static function validate($value, bool $allow_null = false): Returner {
+		if(($value = String64Type::validate($value, $allow_null))->valid) {
+			if($allow_null && $value->value === null) {
+				return $value;
+			}
+			if(($value = URLType::validate($value->value))->valid) {
+				return $value;
+			}
+		}
+		return Returner::invalid(static::Name);
+	}
+}
diff --git a/src/Types/URLType.php b/src/Types/URLType.php
@@ -4,7 +4,7 @@
 use Krishna\DataValidator\Returner;
 
 class URLType implements \Krishna\DataValidator\TypeInterface {
-	use \Krishna\DataValidator\StaticOnlyTrait;
+	use \Krishna\Utilities\StaticOnlyTrait;
 	const Name = 'url';
 
 	public static function validate($value, bool $allow_null = false) : Returner {
diff --git a/src/Types/UnsignedType.php b/src/Types/UnsignedType.php
@@ -4,7 +4,7 @@
 use Krishna\DataValidator\Returner;
 
 class UnsignedType implements \Krishna\DataValidator\TypeInterface {
-	use \Krishna\DataValidator\StaticOnlyTrait;
+	use \Krishna\Utilities\StaticOnlyTrait;
 	const Name = 'unsigned';
 
 	public static function validate($value, bool $allow_null = false) : Returner {
