Fixed the error caused by the Validation::is_unique() method.

InitPHP · Aug 20, 2022 · 73ebe59 · 73ebe59
1 parent 396d94e
commit 73ebe59
Show file tree

Hide file tree

Showing 32 changed files with 40 additions and 38 deletions.
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.12
+ * @version    1.1.13
  * @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.12
+ * @version    1.1.13
  * @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.12
+ * @version    1.1.13
  * @link       https://www.muhammetsafak.com.tr
  */
 
@@ -136,10 +136,9 @@ public function __call($name, $arguments)
         throw new DatabaseException('The "' . $name . '" method does not exist.');
     }
 
-    public function with(): self
+    public function newInstance(): self
     {
-        $with = clone $this;
-        return $with;
+        return new self($this->configurations);
     }
 
     /**
@@ -162,7 +161,8 @@ public function setSchema(string $schema): self
 
     public function withSchema(string $schema): self
     {
-        return $this->with()->setSchema($schema);
+        $with = clone $this;
+        return $with->setSchema($schema);
     }
 
     /**
@@ -185,7 +185,8 @@ public function setSchemaID(string $schemaID): self
 
     public function withSchemaID(string $schemaID): self
     {
-        return $this->with()->setSchemaID($schemaID);
+        $with = clone $this;
+        return $with->setSchemaID($schemaID);
     }
 
     public function isError(): bool

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.12
+ * @version    1.1.13
  * @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.12
+ * @version    1.1.13
  * @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.12
+ * @version    1.1.13
  * @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.12
+ * @version    1.1.13
  * @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.12
+ * @version    1.1.13
  * @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.12
+ * @version    1.1.13
  * @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.12
+ * @version    1.1.13
  * @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.12
+ * @version    1.1.13
  * @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.12
+ * @version    1.1.13
  * @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.12
+ * @version    1.1.13
  * @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.12
+ * @version    1.1.13
  * @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.12
+ * @version    1.1.13
  * @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.12
+ * @version    1.1.13
  * @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.12
+ * @version    1.1.13
  * @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.12
+ * @version    1.1.13
  * @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.12
+ * @version    1.1.13
  * @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.12
+ * @version    1.1.13
  * @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.12
+ * @version    1.1.13
  * @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.12
+ * @version    1.1.13
  * @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.12
+ * @version    1.1.13
  * @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.12
+ * @version    1.1.13
  * @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.12
+ * @version    1.1.13
  * @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.12
+ * @version    1.1.13
  * @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.12
+ * @version    1.1.13
  * @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.12
+ * @version    1.1.13
  * @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.12
+ * @version    1.1.13
  * @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.12
+ * @version    1.1.13
  * @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.12
+ * @version    1.1.13
  * @link       https://www.muhammetsafak.com.tr
  */
 
@@ -26,7 +26,7 @@ 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.');
         }
-        $db = $this->db->with();
+        $db = $this->db->newInstance();
         $db->getQueryBuilder()->reset();
         $db->getDataMapper()->getParameters(); // Prev parameters reset.
 
@@ -46,6 +46,7 @@ protected function required($data): bool
     {
         if(!\is_iterable($data) && !\is_object($data)){
             $data = \trim((string)$data);
+            return $data !== '';
         }
         return !empty($data);
     }

diff --git a/src/init.php b/src/init.php
@@ -7,7 +7,7 @@
  * @author     Muhammet ŞAFAK <info@muhammetsafak.com.tr>
  * @copyright  Copyright © 2022 Muhammet ŞAFAK
  * @license    ./LICENSE  MIT
- * @version    1.1.12
+ * @version    1.1.13
  * @link       https://www.muhammetsafak.com.tr
  */