eee

Base/Model.php

@@ -692,14 +692,14 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, \
     public function __set(string $name, mixed $value): void
     {
         $prefix = 'set' . ucfirst($name);
-		if (method_exists($name, $prefix)) {
+        if (method_exists($this, $prefix)) {
             $this->{$prefix}($value);
             return;
         }
 
         $method = $prefix . 'Attribute';
         if (method_exists($this, $method)) {
-			$this->_attributes[$name] = $this->{$method} ($value);
+            $this->_attributes[$name] = $this->{$method}($value);
         } else {
             $this->_attributes[$name] = $value;
         }
@@ -766,7 +766,7 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, \
      */
     protected function withRelate(string $name): mixed
     {
-		$response = $this->$name();
+        $response = $this->{'get' . ucfirst($name)}();
         if ($response instanceof \Database\Traits\Relation) {
             $response = $response->get();
         }

SqlBuilder.php

@@ -1,4 +1,5 @@
-<?php /** @noinspection ALL */
+<?php
+/** @noinspection ALL */
 
 declare(strict_types=1);
 
@@ -189,7 +190,7 @@ class SqlBuilder extends Component
         if (is_null($value)) {
             return $keys;
         }
-        if (preg_match('/^[+|-]\s\d+$/', $value)) {
+        if (preg_match('/^[+|-]\s\d+$/', (string)$value)) {
             $keys[] = $key . '=' . $key . ' ' . $value;
         } else {
             $this->query->pushParam($value);

Traits/QueryTrait.php

@@ -793,20 +793,22 @@ abstract class QueryTrait extends Component implements ActiveQueryInterface, ISq
 
     /**
      * @param string $columns
-	 * @param array|Closure $value
+     * @param array|Closure|Query $value
      *
      * @return $this
-	 * @throws
+     * @throws Exception
      */
-	public function whereIn(string $columns, array|Closure $value): static
+    public function whereIn(string $columns, array|Closure|Query $value): static
     {
-		if ($value instanceof Closure) {
+        if (is_array($value)) {
-			$value = $this->makeClosureFunction($value);
+            if (count($value) < 1) throw new Exception('Value must be an not empty array');
-		}
+
-		if (count($value) < 1) {
-			$value = [-1];
-		}
             $this->where[] = $columns . ' IN (' . implode(',', $value) . ')';
+        } else if ($value instanceof Query) {
+            $this->where[] = $columns . ' IN (' . $value->build() . ')';
+        } else {
+            $this->where[] = $columns . ' IN (' . $this->makeClosureFunction($value) . ')';
+        }
         return $this;
     }