改进Entity

Author: liu21st

src/Entity.php

@@ -44,6 +44,7 @@ public function __construct(?Model $model = null)
         if (is_null($model)) {
             $class = !empty($options['model_class']) ? $options['model_class'] : str_replace('\\entity\\', '\\model\\', static::class);
             $model = new $class();
+            $model->entity($this);
             unset($options['model_class']);
         }
 
@@ -198,7 +199,7 @@ public static function __callStatic($method, $args)
             $db = $entity->model();
         } else {
             // 调用Query类查询方法
-            $db = $entity->getQuery();
+            $db = $entity->model()->getQuery();
         }
 
         return call_user_func_array([$db, $method], $args);

src/Model.php

@@ -240,7 +240,7 @@ private function getWeakData(string $key, string $name, $default = null)
      */
     public function newInstance(array $data = [])
     {
-        $class = str_replace('\\model\\', '\\entity\\', static::class);
+        $class = $this->getOption('entityClass', str_replace('\\model\\', '\\entity\\', static::class));
         $model = new static($data);
         $model->exists(true);
         if (class_exists($class) && is_subclass_of($class, Entity::class)) {

src/model/concern/ModelEvent.php

@@ -66,8 +66,6 @@ protected function trigger(string $event): bool
             if ($obser) {
                 $reflect  = new ReflectionClass($obser);
                 $observer = $reflect->newinstance();
-            } elseif ($this->getEntity() && method_exists($this->getEntity(), $method)) {
-                $observer = $this->getEntity();
             } else {
                 $observer = $this;
             }