Refactoring

src/ActiveQuery.php

@@ -205,7 +205,7 @@ public function prepare(QueryBuilderInterface $builder): QueryInterface
                     if ($viaCallableUsed) {
                         $viaModels = $viaQuery->all();
                     } elseif ($this->primaryModel->isRelationPopulated($viaName)) {
-                        $viaModels = $this->primaryModel->$viaName;
+                        $viaModels = $this->primaryModel->relation($viaName);
                     } else {
                         $viaModels = $viaQuery->all();
                         $this->primaryModel->populateRelation($viaName, $viaModels);
@@ -214,7 +214,7 @@ public function prepare(QueryBuilderInterface $builder): QueryInterface
                     if ($viaCallableUsed) {
                         $model = $viaQuery->onePopulate();
                     } elseif ($this->primaryModel->isRelationPopulated($viaName)) {
-                        $model = $this->primaryModel->$viaName;
+                        $model = $this->primaryModel->relation($viaName);
                     } else {
                         $model = $viaQuery->onePopulate();
                         $this->primaryModel->populateRelation($viaName, $model);
@@ -927,7 +927,7 @@ protected function findByCondition(mixed $condition): static
             $condition = [$condition];
         }
 
-        if (!DbArrayHelper::isAssociative($condition) && !$condition instanceof ExpressionInterface) {
+        if (!DbArrayHelper::isAssociative($condition)) {
             /** query by primary key */
             $primaryKey = $arInstance->primaryKey();
 

src/ActiveRecord.php

@@ -51,8 +51,6 @@
  * To declare an ActiveRecord class you need to extend {@see ActiveRecord} and implement the `getTableName` method:
  *
  * ```php
- * <?php
- *
  * class Customer extends ActiveRecord
  * {
  *     public static function getTableName(): string

src/ActiveRecordInterface.php

@@ -18,9 +18,6 @@ interface ActiveRecordInterface
      *
      * The default implementation will return all column names of the table associated with this AR class.
      *
-     * @throws InvalidConfigException
-     * @throws Exception
-     *
      * @return array List of attribute names.
      *
      * @psalm-return string[]
@@ -77,7 +74,7 @@ public function deleteAll(array $condition = []): int;
      * Returns a value indicating whether the given active record is the same as the current one.
      *
      * The comparison is made by comparing the table names and the primary key values of the two active records. If one
-     * of the records {@see isNewRecord|is new} they're also considered not equal.
+     * of the records {@see getIsNewRecord|is new} they're also considered not equal.
      *
      * @param self $record Record to compare to.
      *
@@ -305,17 +302,6 @@ public function isRelationPopulated(string $name): bool;
      */
     public function link(string $name, self $arClass, array $extraColumns = []): void;
 
-    /**
-     * Returns the element at the specified offset.
-     *
-     * This method is required by the SPL interface {@see ArrayAccess}.
-     *
-     * It's implicitly called when you use something like `$value = $model[$offset];`.
-     *
-     * @return mixed the element at the offset, null if no element is found at the offset
-     */
-    public function offsetGet(mixed $offset): mixed;
-
     /**
      * Populates the named relation with the related records.
      *

src/ActiveRelationTrait.php

@@ -98,7 +98,7 @@ public function via(string $relationName, callable $callable = null): static
         $callableUsed = $callable !== null;
         $this->via = [$relationName, $relation, $callableUsed];
 
-        if ($callable !== null) {
+        if ($callableUsed) {
             $callable($relation);
         }
 
@@ -164,13 +164,10 @@ public function inverseOf(string $relationName): static
     }
 
     /**
-     * Finds the related records for the specified primary record.
+     * Returns query records depends on {@see $multiple} .
      *
      * This method is invoked when a relation of an ActiveRecord is being accessed in a lazy fashion.
      *
-     * @param string $name the relation name.
-     * @param ActiveRecordInterface $model the primary model.
-     *
      * @throws Exception
      * @throws InvalidArgumentException
      * @throws InvalidConfigException
@@ -612,9 +609,19 @@ private function getModelKey(ActiveRecordInterface|array $activeRecord, array $a
     {
         $key = [];
 
-        foreach ($attributes as $attribute) {
-            if (isset($activeRecord[$attribute]) || (is_object($activeRecord) && property_exists($activeRecord, $attribute))) {
-                $key[] = $this->normalizeModelKey($activeRecord[$attribute]);
+        if (is_array($activeRecord)) {
+            foreach ($attributes as $attribute) {
+                if (isset($activeRecord[$attribute])) {
+                    $key[] = $this->normalizeModelKey($activeRecord[$attribute]);
+                }
+            }
+        } else {
+            foreach ($attributes as $attribute) {
+                $value = $activeRecord->getAttribute($attribute);
+
+                if ($value !== null) {
+                    $key[] = $this->normalizeModelKey($value);
+                }
             }
         }
 
@@ -628,9 +635,11 @@ private function getModelKey(ActiveRecordInterface|array $activeRecord, array $a
     }
 
     /**
+     * @param int|null|string|Stringable $value raw key value.
+     *
      * @return int|string|null normalized key value.
      */
-    private function normalizeModelKey(mixed $value): int|string|null
+    private function normalizeModelKey(int|null|string|Stringable $value): int|string|null
     {
         if ($value instanceof Stringable) {
             /**