v1.1.12 Fixed the Validation::is_unique() method causing parameter errors.

muhammetsafak · muhammetsafak · commit 9fa6a0353dd6 · 2022-08-12T13:27:48.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.11
+ * @version    1.1.12
  * @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.11
+ * @version    1.1.12
  * @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.11
+ * @version    1.1.12
  * @link       https://www.muhammetsafak.com.tr
  */
 
@@ -114,7 +114,7 @@ public function __call($name, $arguments)
             $query = $this->getQueryBuilder()->readQuery();
             $this->getQueryBuilder()->reset();
             $this->getDataMapper()->persist($query, []);
-            return $this->getDataMapper()->result();;
+            return $this->getDataMapper()->result();
         }
         if(\method_exists($this->_queryBuilder, $name)){
             $res = $this->getQueryBuilder()->{$name}(...$arguments);
@@ -138,7 +138,8 @@ public function __call($name, $arguments)
 
     public function with(): self
     {
-        return clone $this;
+        $with = clone $this;
+        return $with;
     }
 
     /**
@@ -267,7 +268,7 @@ public function create(array $fields)
                     }
                     $data[$i][$column] = $value;
                 }
-                if(empty($data)){
+                if(empty($data[$i])){
                     continue;
                 }
                 if($isCreatedField){
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.11
+ * @version    1.1.12
  * @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.11
+ * @version    1.1.12
  * @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.11
+ * @version    1.1.12
  * @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.11
+ * @version    1.1.12
  * @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.11
+ * @version    1.1.12
  * @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.11
+ * @version    1.1.12
  * @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.11
+ * @version    1.1.12
  * @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.11
+ * @version    1.1.12
  * @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.11
+ * @version    1.1.12
  * @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.11
+ * @version    1.1.12
  * @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.11
+ * @version    1.1.12
  * @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.11
+ * @version    1.1.12
  * @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.11
+ * @version    1.1.12
  * @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.11
+ * @version    1.1.12
  * @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.11
+ * @version    1.1.12
  * @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.11
+ * @version    1.1.12
  * @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.11
+ * @version    1.1.12
  * @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.11
+ * @version    1.1.12
  * @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.11
+ * @version    1.1.12
  * @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.11
+ * @version    1.1.12
  * @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.11
+ * @version    1.1.12
  * @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.11
+ * @version    1.1.12
  * @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.11
+ * @version    1.1.12
  * @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.11
+ * @version    1.1.12
  * @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.11
+ * @version    1.1.12
  * @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.11
+ * @version    1.1.12
  * @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.11
+ * @version    1.1.12
  * @link       https://www.muhammetsafak.com.tr
  */
 
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.11
+ * @version    1.1.12
  * @link       https://www.muhammetsafak.com.tr
  */
 
@@ -21,25 +21,25 @@
 trait ValidationRulesTrait
 {
 
-    public function is_unique($data, $column, $schemaID = null): bool
+    protected function is_unique($data, $column, $schemaID = null): bool
     {
         if($this->db->getSchemaID() === null){
             throw new ValidationException('You need a model with a PRIMARY KEY to use the is_unique validation.');
         }
-        $queryBuilder = $this->db->getQueryBuilder();
-        $query = clone $queryBuilder;
-        $query->reset();
+        $db = $this->db->with();
+        $db->getQueryBuilder()->reset();
+        $db->getDataMapper()->getParameters(); // Prev parameters reset.
 
-        $query->offset(0)->limit(1);
+        $db->getQueryBuilder()->offset(0)
+            ->limit(1);
         if(!empty($schemaID)){
-            $query->where($this->db->getSchemaID(), $schemaID, '!=');
+            $db->getQueryBuilder()->where($db->getSchemaID(), $schemaID, '!=');
         }
-        $query->where($column, $data, '=');
-        $dataMapper = $this->db->getDataMapper();
-        $mapper = clone $dataMapper;
-        $mapper->getParameters(); // Prev parameters reset.
-        $mapper->persist($query->readQuery(), []);
-        return $mapper->numRows() < 1;
+        $db->getQueryBuilder()->where($column, $data, '=');
+        $db->getDataMapper()->persist($db->getQueryBuilder()->readQuery(), []);
+        $res = $db->getDataMapper()->numRows() < 1;
+        unset($db);
+        return $res;
     }
 
     protected function required($data): bool

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`* @author Muhammet ŞAFAK <info@muhammetsafak.com.tr>`
`8`	`8`	`* @copyright Copyright © 2022 Muhammet ŞAFAK`
`9`	`9`	`* @license ./LICENSE MIT`
`10`		`- * @version 1.1.11`
	`10`	`+ * @version 1.1.12`
`11`	`11`	`* @link https://www.muhammetsafak.com.tr`
`12`	`12`	`*/`
`13`	`13`
`@@ -114,7 +114,7 @@ public function __call($name, $arguments)`
`114`	`114`	`$query = $this->getQueryBuilder()->readQuery();`
`115`	`115`	`$this->getQueryBuilder()->reset();`
`116`	`116`	`$this->getDataMapper()->persist($query, []);`
`117`		`- return $this->getDataMapper()->result();;`
	`117`	`+ return $this->getDataMapper()->result();`
`118`	`118`	`}`
`119`	`119`	`if(\method_exists($this->_queryBuilder, $name)){`
`120`	`120`	`$res = $this->getQueryBuilder()->{$name}(...$arguments);`
`@@ -138,7 +138,8 @@ public function __call($name, $arguments)`
`138`	`138`
`139`	`139`	`public function with(): self`
`140`	`140`	`{`
`141`		`- return clone $this;`
	`141`	`+ $with = clone $this;`
	`142`	`+ return $with;`
`142`	`143`	`}`
`143`	`144`
`144`	`145`	`/**`
`@@ -267,7 +268,7 @@ public function create(array $fields)`
`267`	`268`	`}`
`268`	`269`	`$data[$i][$column] = $value;`
`269`	`270`	`}`
`270`		`- if(empty($data)){`
	`271`	`+ if(empty($data[$i])){`
`271`	`272`	`continue;`
`272`	`273`	`}`
`273`	`274`	`if($isCreatedField){`