Updated validation, string and required rules. Added Optional rule.

muhammetsafak · muhammetsafak · commit 537a08b493ed · 2022-08-05T22:09:17.000+03:00
diff --git a/src/Connection/Connection.php b/src/Connection/Connection.php
@@ -7,7 +7,7 @@
  * @author     Muhammet ŞAFAK <info@muhammetsafak.com.tr>
  * @copyright  Copyright © 2022 Muhammet ŞAFAK
  * @license    ./LICENSE  MIT
- * @version    1.1.7
+ * @version    1.1.8
  * @link       https://www.muhammetsafak.com.tr
  */
 
diff --git a/src/Connection/ConnectionInterface.php b/src/Connection/ConnectionInterface.php
@@ -7,7 +7,7 @@
  * @author     Muhammet ŞAFAK <info@muhammetsafak.com.tr>
  * @copyright  Copyright © 2022 Muhammet ŞAFAK
  * @license    ./LICENSE  MIT
- * @version    1.1.7
+ * @version    1.1.8
  * @link       https://www.muhammetsafak.com.tr
  */
 
diff --git a/src/DB.php b/src/DB.php
@@ -7,7 +7,7 @@
  * @author     Muhammet ŞAFAK <info@muhammetsafak.com.tr>
  * @copyright  Copyright © 2022 Muhammet ŞAFAK
  * @license    ./LICENSE  MIT
- * @version    1.1.7
+ * @version    1.1.8
  * @link       https://www.muhammetsafak.com.tr
  */
 
diff --git a/src/DataMapper/DataMapper.php b/src/DataMapper/DataMapper.php
@@ -7,7 +7,7 @@
  * @author     Muhammet ŞAFAK <info@muhammetsafak.com.tr>
  * @copyright  Copyright © 2022 Muhammet ŞAFAK
  * @license    ./LICENSE  MIT
- * @version    1.1.7
+ * @version    1.1.8
  * @link       https://www.muhammetsafak.com.tr
  */
 
diff --git a/src/DataMapper/DataMapperFactory.php b/src/DataMapper/DataMapperFactory.php
@@ -7,7 +7,7 @@
  * @author     Muhammet ŞAFAK <info@muhammetsafak.com.tr>
  * @copyright  Copyright © 2022 Muhammet ŞAFAK
  * @license    ./LICENSE  MIT
- * @version    1.1.7
+ * @version    1.1.8
  * @link       https://www.muhammetsafak.com.tr
  */
 
diff --git a/src/DataMapper/DataMapperInterface.php b/src/DataMapper/DataMapperInterface.php
@@ -7,7 +7,7 @@
  * @author     Muhammet ŞAFAK <info@muhammetsafak.com.tr>
  * @copyright  Copyright © 2022 Muhammet ŞAFAK
  * @license    ./LICENSE  MIT
- * @version    1.1.7
+ * @version    1.1.8
  * @link       https://www.muhammetsafak.com.tr
  */
 
diff --git a/src/Entity.php b/src/Entity.php
@@ -7,7 +7,7 @@
  * @author     Muhammet ŞAFAK <info@muhammetsafak.com.tr>
  * @copyright  Copyright © 2022 Muhammet ŞAFAK
  * @license    ./LICENSE  MIT
- * @version    1.1.7
+ * @version    1.1.8
  * @link       https://www.muhammetsafak.com.tr
  */
 
diff --git a/src/Exceptions/DataMapperException.php b/src/Exceptions/DataMapperException.php
@@ -7,7 +7,7 @@
  * @author     Muhammet ŞAFAK <info@muhammetsafak.com.tr>
  * @copyright  Copyright © 2022 Muhammet ŞAFAK
  * @license    ./LICENSE  MIT
- * @version    1.1.7
+ * @version    1.1.8
  * @link       https://www.muhammetsafak.com.tr
  */
 
diff --git a/src/Exceptions/DataMapperInvalidArgumentException.php b/src/Exceptions/DataMapperInvalidArgumentException.php
@@ -7,7 +7,7 @@
  * @author     Muhammet ŞAFAK <info@muhammetsafak.com.tr>
  * @copyright  Copyright © 2022 Muhammet ŞAFAK
  * @license    ./LICENSE  MIT
- * @version    1.1.7
+ * @version    1.1.8
  * @link       https://www.muhammetsafak.com.tr
  */
 
diff --git a/src/Exceptions/DatabaseConnectionException.php b/src/Exceptions/DatabaseConnectionException.php
@@ -7,7 +7,7 @@
  * @author     Muhammet ŞAFAK <info@muhammetsafak.com.tr>
  * @copyright  Copyright © 2022 Muhammet ŞAFAK
  * @license    ./LICENSE  MIT
- * @version    1.1.7
+ * @version    1.1.8
  * @link       https://www.muhammetsafak.com.tr
  */
 
diff --git a/src/Exceptions/DatabaseException.php b/src/Exceptions/DatabaseException.php
@@ -7,7 +7,7 @@
  * @author     Muhammet ŞAFAK <info@muhammetsafak.com.tr>
  * @copyright  Copyright © 2022 Muhammet ŞAFAK
  * @license    ./LICENSE  MIT
- * @version    1.1.7
+ * @version    1.1.8
  * @link       https://www.muhammetsafak.com.tr
  */
 
diff --git a/src/Exceptions/DatabaseInvalidArgumentException.php b/src/Exceptions/DatabaseInvalidArgumentException.php
@@ -7,7 +7,7 @@
  * @author     Muhammet ŞAFAK <info@muhammetsafak.com.tr>
  * @copyright  Copyright © 2022 Muhammet ŞAFAK
  * @license    ./LICENSE  MIT
- * @version    1.1.7
+ * @version    1.1.8
  * @link       https://www.muhammetsafak.com.tr
  */
 
diff --git a/src/Exceptions/ModelCallbacksException.php b/src/Exceptions/ModelCallbacksException.php
@@ -7,7 +7,7 @@
  * @author     Muhammet ŞAFAK <info@muhammetsafak.com.tr>
  * @copyright  Copyright © 2022 Muhammet ŞAFAK
  * @license    ./LICENSE  MIT
- * @version    1.1.7
+ * @version    1.1.8
  * @link       https://www.muhammetsafak.com.tr
  */
 
diff --git a/src/Exceptions/ModelException.php b/src/Exceptions/ModelException.php
@@ -7,7 +7,7 @@
  * @author     Muhammet ŞAFAK <info@muhammetsafak.com.tr>
  * @copyright  Copyright © 2022 Muhammet ŞAFAK
  * @license    ./LICENSE  MIT
- * @version    1.1.7
+ * @version    1.1.8
  * @link       https://www.muhammetsafak.com.tr
  */
 
diff --git a/src/Exceptions/ModelPermissionException.php b/src/Exceptions/ModelPermissionException.php
@@ -7,7 +7,7 @@
  * @author     Muhammet ŞAFAK <info@muhammetsafak.com.tr>
  * @copyright  Copyright © 2022 Muhammet ŞAFAK
  * @license    ./LICENSE  MIT
- * @version    1.1.7
+ * @version    1.1.8
  * @link       https://www.muhammetsafak.com.tr
  */
 
diff --git a/src/Exceptions/ModelRelationsException.php b/src/Exceptions/ModelRelationsException.php
@@ -7,7 +7,7 @@
  * @author     Muhammet ŞAFAK <info@muhammetsafak.com.tr>
  * @copyright  Copyright © 2022 Muhammet ŞAFAK
  * @license    ./LICENSE  MIT
- * @version    1.1.7
+ * @version    1.1.8
  * @link       https://www.muhammetsafak.com.tr
  */
 
diff --git a/src/Exceptions/QueryBuilderException.php b/src/Exceptions/QueryBuilderException.php
@@ -7,7 +7,7 @@
  * @author     Muhammet ŞAFAK <info@muhammetsafak.com.tr>
  * @copyright  Copyright © 2022 Muhammet ŞAFAK
  * @license    ./LICENSE  MIT
- * @version    1.1.7
+ * @version    1.1.8
  * @link       https://www.muhammetsafak.com.tr
  */
 
diff --git a/src/Exceptions/QueryBuilderInvalidArgumentException.php b/src/Exceptions/QueryBuilderInvalidArgumentException.php
@@ -7,7 +7,7 @@
  * @author     Muhammet ŞAFAK <info@muhammetsafak.com.tr>
  * @copyright  Copyright © 2022 Muhammet ŞAFAK
  * @license    ./LICENSE  MIT
- * @version    1.1.7
+ * @version    1.1.8
  * @link       https://www.muhammetsafak.com.tr
  */
 
diff --git a/src/Exceptions/ValidationException.php b/src/Exceptions/ValidationException.php
@@ -7,7 +7,7 @@
  * @author     Muhammet ŞAFAK <info@muhammetsafak.com.tr>
  * @copyright  Copyright © 2022 Muhammet ŞAFAK
  * @license    ./LICENSE  MIT
- * @version    1.1.7
+ * @version    1.1.8
  * @link       https://www.muhammetsafak.com.tr
  */
 
diff --git a/src/Helper.php b/src/Helper.php
@@ -7,7 +7,7 @@
  * @author     Muhammet ŞAFAK <info@muhammetsafak.com.tr>
  * @copyright  Copyright © 2022 Muhammet ŞAFAK
  * @license    ./LICENSE  MIT
- * @version    1.1.7
+ * @version    1.1.8
  * @link       https://www.muhammetsafak.com.tr
  */
 
diff --git a/src/Model.php b/src/Model.php
@@ -7,7 +7,7 @@
  * @author     Muhammet ŞAFAK <info@muhammetsafak.com.tr>
  * @copyright  Copyright © 2022 Muhammet ŞAFAK
  * @license    ./LICENSE  MIT
- * @version    1.1.7
+ * @version    1.1.8
  * @link       https://www.muhammetsafak.com.tr
  */
 
diff --git a/src/QueryBuilder/Expressions/From.php b/src/QueryBuilder/Expressions/From.php
@@ -7,7 +7,7 @@
  * @author     Muhammet ŞAFAK <info@muhammetsafak.com.tr>
  * @copyright  Copyright © 2022 Muhammet ŞAFAK
  * @license    ./LICENSE  MIT
- * @version    1.1.7
+ * @version    1.1.8
  * @link       https://www.muhammetsafak.com.tr
  */
 
diff --git a/src/QueryBuilder/Expressions/GroupBy.php b/src/QueryBuilder/Expressions/GroupBy.php
@@ -7,7 +7,7 @@
  * @author     Muhammet ŞAFAK <info@muhammetsafak.com.tr>
  * @copyright  Copyright © 2022 Muhammet ŞAFAK
  * @license    ./LICENSE  MIT
- * @version    1.1.7
+ * @version    1.1.8
  * @link       https://www.muhammetsafak.com.tr
  */
 
diff --git a/src/QueryBuilder/Expressions/Join.php b/src/QueryBuilder/Expressions/Join.php
@@ -7,7 +7,7 @@
  * @author     Muhammet ŞAFAK <info@muhammetsafak.com.tr>
  * @copyright  Copyright © 2022 Muhammet ŞAFAK
  * @license    ./LICENSE  MIT
- * @version    1.1.7
+ * @version    1.1.8
  * @link       https://www.muhammetsafak.com.tr
  */
 
diff --git a/src/QueryBuilder/Expressions/Limit.php b/src/QueryBuilder/Expressions/Limit.php
@@ -7,7 +7,7 @@
  * @author     Muhammet ŞAFAK <info@muhammetsafak.com.tr>
  * @copyright  Copyright © 2022 Muhammet ŞAFAK
  * @license    ./LICENSE  MIT
- * @version    1.1.7
+ * @version    1.1.8
  * @link       https://www.muhammetsafak.com.tr
  */
 
diff --git a/src/QueryBuilder/Expressions/OrderBy.php b/src/QueryBuilder/Expressions/OrderBy.php
@@ -7,7 +7,7 @@
  * @author     Muhammet ŞAFAK <info@muhammetsafak.com.tr>
  * @copyright  Copyright © 2022 Muhammet ŞAFAK
  * @license    ./LICENSE  MIT
- * @version    1.1.7
+ * @version    1.1.8
  * @link       https://www.muhammetsafak.com.tr
  */
 
diff --git a/src/QueryBuilder/Expressions/Select.php b/src/QueryBuilder/Expressions/Select.php
@@ -7,7 +7,7 @@
  * @author     Muhammet ŞAFAK <info@muhammetsafak.com.tr>
  * @copyright  Copyright © 2022 Muhammet ŞAFAK
  * @license    ./LICENSE  MIT
- * @version    1.1.7
+ * @version    1.1.8
  * @link       https://www.muhammetsafak.com.tr
  */
 
diff --git a/src/QueryBuilder/Expressions/WhereAndHaving.php b/src/QueryBuilder/Expressions/WhereAndHaving.php
@@ -7,7 +7,7 @@
  * @author     Muhammet ŞAFAK <info@muhammetsafak.com.tr>
  * @copyright  Copyright © 2022 Muhammet ŞAFAK
  * @license    ./LICENSE  MIT
- * @version    1.1.7
+ * @version    1.1.8
  * @link       https://www.muhammetsafak.com.tr
  */
 
diff --git a/src/QueryBuilder/QueryBuilder.php b/src/QueryBuilder/QueryBuilder.php
@@ -7,7 +7,7 @@
  * @author     Muhammet ŞAFAK <info@muhammetsafak.com.tr>
  * @copyright  Copyright © 2022 Muhammet ŞAFAK
  * @license    ./LICENSE  MIT
- * @version    1.1.7
+ * @version    1.1.8
  * @link       https://www.muhammetsafak.com.tr
  */
 
diff --git a/src/QueryBuilder/QueryBuilderFactory.php b/src/QueryBuilder/QueryBuilderFactory.php
@@ -7,7 +7,7 @@
  * @author     Muhammet ŞAFAK <info@muhammetsafak.com.tr>
  * @copyright  Copyright © 2022 Muhammet ŞAFAK
  * @license    ./LICENSE  MIT
- * @version    1.1.7
+ * @version    1.1.8
  * @link       https://www.muhammetsafak.com.tr
  */
 
diff --git a/src/QueryBuilder/QueryBuilderInterface.php b/src/QueryBuilder/QueryBuilderInterface.php
@@ -7,7 +7,7 @@
  * @author     Muhammet ŞAFAK <info@muhammetsafak.com.tr>
  * @copyright  Copyright © 2022 Muhammet ŞAFAK
  * @license    ./LICENSE  MIT
- * @version    1.1.7
+ * @version    1.1.8
  * @link       https://www.muhammetsafak.com.tr
  */
 
diff --git a/src/Validation/Validation.php b/src/Validation/Validation.php
@@ -7,7 +7,7 @@
  * @author     Muhammet ŞAFAK <info@muhammetsafak.com.tr>
  * @copyright  Copyright © 2022 Muhammet ŞAFAK
  * @license    ./LICENSE  MIT
- * @version    1.1.7
+ * @version    1.1.8
  * @link       https://www.muhammetsafak.com.tr
  */
 
@@ -29,7 +29,7 @@ class Validation
         'alpha', 'alphaNumeric', 'boolean', 'mail', 'url',
         'min', 'max', 'length', 'range', 'regex',
         'ip', 'ipv4', 'ipv6', 'equal', 'startWith', 'endWith',
-        'strContains', 'only'
+        'strContains', 'only',
     ];
 
     protected const DEFAULT_MESSAGES = [
@@ -119,6 +119,12 @@ public function validation(string $column, $schemaID = null): bool
             }
             unset($methods[$key]);
         }
+        if(($key = \array_search('optional', $methods, true)) !== FALSE){
+            if($data === null){
+                return true;
+            }
+            unset($methods[$key]);
+        }
         foreach ($methods as $method) {
             $method = $this->method_parse($method);
             if(!\in_array($method['method'], self::AVAILABLE_VALIDATION_METHODS)){
diff --git a/src/Validation/ValidationRulesTrait.php b/src/Validation/ValidationRulesTrait.php
@@ -7,7 +7,7 @@
  * @author     Muhammet ŞAFAK <info@muhammetsafak.com.tr>
  * @copyright  Copyright © 2022 Muhammet ŞAFAK
  * @license    ./LICENSE  MIT
- * @version    1.1.7
+ * @version    1.1.8
  * @link       https://www.muhammetsafak.com.tr
  */
 
@@ -43,12 +43,15 @@ public function is_unique($data, $column, $schemaID = null): bool
 
     protected function required($data): bool
     {
-        return !empty(\trim($data));
+        if(!\is_iterable($data) && !\is_object($data)){
+            $data = \trim((string)$data);
+        }
+        return !empty($data);
     }
 
     protected function string($data): bool
     {
-        return (bool)\preg_match('/[\S]+/', (string)$data);
+        return \is_string($data);
     }
 
     protected function int($data): bool
