Entitylerde iyileştirme yapıldı

Author: muhammetsafak

README.md

@@ -262,19 +262,6 @@ namespace App\Model;
 class Posts extends \InitPHP\Database\Model
 {
 
-    /**
-    * Only if you don't have global connectivity.
-    * 
-    * @var array|string[] 
-    */
-    protected array $connection = [
-        'dsn'           => '', // Database connection address.
-        'username'      => '', // Username with required privileges in the database.
-        'password'      => '', // The password of the database user.
-        'charset'       => 'utf8mb4', // The character set to use in the database.
-        'collation'     => 'utf8mb4_general_ci', // Collection set to use in database
-    ];
-
     /**
      * If not specified, \InitPHP\Database\Entity::class is used by default.
      * 

src/Database.php

@@ -335,7 +335,7 @@ final public function query(string $sqlQuery, array $parameters = []): Result
                 case self::ARRAY:
                     return $this->_last->asArray();
                 case self::ENTITY:
-                    return $this->_last->asEntity();
+                    return $this->_last->asEntity($this->_credentials['entity'] ?? Entity::class);
                 case self::OBJECT:
                     return $this->_last->asObject();
                 case self::LAZY:

src/Entity.php

@@ -18,9 +18,9 @@
 class Entity
 {
 
-    private array $_Attributes = [];
+    protected array $__attributes = [];
 
-    private array $_OriginalAttributes = [];
+    protected array $__attributesOriginal = [];
 
     public function __construct(?array $data = [])
     {
@@ -35,10 +35,10 @@ public function __call($name, $arguments)
         switch (\substr($name, 0, 3)) {
             case 'get':
                 $attr = Helper::camelCaseToSnakeCase(\substr($name, 3, -9));
-                return $this->_Attributes[$attr] ?? null;
+                return $this->__attributes[$attr] ?? null;
             case 'set':
                 $attr = Helper::camelCaseToSnakeCase(\substr($name, 3, -9));
-                return $this->_Attributes[$attr] = $arguments[0];
+                return $this->__attributes[$attr] = $arguments[0];
             default:
                 throw new \RuntimeException('There is no "' . $name . '" method.');
         }
@@ -51,7 +51,7 @@ public function __set($name, $value)
             $this->{$methodName}($value);
             return $value;
         }
-        return $this->_Attributes[$name] = $value;
+        return $this->__attributes[$name] = $value;
     }
 
     public function __get($name)
@@ -60,29 +60,29 @@ public function __get($name)
         if(\method_exists($this, $methodName)){
             return $this->{$methodName}();
         }
-        return $this->_Attributes[$name] ?? null;
+        return $this->__attributes[$name] ?? null;
     }
 
     public function __isset($name)
     {
-        return isset($this->_Attributes[$name]);
+        return isset($this->__attributes[$name]);
     }
 
     public function __unset($name)
     {
-        if(isset($this->_Attributes[$name])){
-            unset($this->_Attributes[$name]);
+        if(isset($this->__attributes[$name])){
+            unset($this->__attributes[$name]);
         }
     }
 
     public function __debugInfo()
     {
-        return $this->_Attributes;
+        return $this->__attributes;
     }
 
     public function toArray(): array
     {
-        return $this->_Attributes;
+        return $this->__attributes;
     }
 
     public function getAttributes(): array
@@ -109,7 +109,7 @@ protected function fill(?array $data = null): self
 
     protected function syncOriginal(): self
     {
-        $this->_OriginalAttributes = $this->_Attributes;
+        $this->__attributesOriginal = $this->__attributes;
         return $this;
     }
 

src/Model.php

@@ -7,9 +7,10 @@
  * @author      Muhammet ŞAFAK <[email protected]>
  * @copyright   Copyright © 2022 Muhammet ŞAFAK
  * @license     ./LICENSE  MIT
- * @version     2.0.8
+ * @version     2.1
  * @link        https://www.muhammetsafak.com.tr
  */
+declare(strict_types=1);
 
 namespace InitPHP\Database;
 
@@ -226,6 +227,7 @@ public function __construct()
         $credentials['updatable'] = $this->updatable ?? true;
         $credentials['deletable'] = $this->deletable ?? true;
         $credentials['writable'] = $this->writable ?? true;
+        $credentials['return'] = $this->return ?? self::ENTITY;
         parent::__construct($credentials);
     }