From a1238613f9d924a249a9ac032bdd1b49b5ae77b5 Mon Sep 17 00:00:00 2001
From: xl <as2252258@163.com>
Date: Mon, 13 Nov 2023 17:52:38 +0800
Subject: [PATCH] eee

---
 Base/AbstractCollection.php | 3 +--
 Base/Model.php              | 3 +--
 Model.php                   | 2 +-
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/Base/AbstractCollection.php b/Base/AbstractCollection.php
index 95d75aa..fcf331a 100644
--- a/Base/AbstractCollection.php
+++ b/Base/AbstractCollection.php
@@ -17,14 +17,13 @@ use Exception;
 use JetBrains\PhpStorm\Pure;
 use Kiri\Abstracts\Component;
 use ReturnTypeWillChange;
-use Kiri\ToArray;
 use Traversable;
 
 /**
  * Class AbstractCollection
  * @package Database\Base
  */
-abstract class AbstractCollection extends Component implements \IteratorAggregate, \ArrayAccess, ToArray
+abstract class AbstractCollection extends Component implements \IteratorAggregate, \ArrayAccess, \Arrayable
 {
 
 	/**
diff --git a/Base/Model.php b/Base/Model.php
index 8c4c91f..964d89e 100644
--- a/Base/Model.php
+++ b/Base/Model.php
@@ -25,7 +25,6 @@ use Exception;
 use Kiri;
 use Kiri\Abstracts\Component;
 use ReturnTypeWillChange;
-use Kiri\ToArray;
 use ReflectionException;
 use validator\Validator;
 
@@ -38,7 +37,7 @@ use validator\Validator;
  * @property array $attributes
  * @property array $oldAttributes
  */
-abstract class Model extends Component implements ModelInterface, ArrayAccess, ToArray
+abstract class Model extends Component implements ModelInterface, ArrayAccess, \Arrayable
 {
 
     /** @var array */
diff --git a/Model.php b/Model.php
index 13191c2..a8537e3 100644
--- a/Model.php
+++ b/Model.php
@@ -273,7 +273,7 @@ class Model extends Base\Model
         $with = $this->getWith();
         foreach ($with as $value) {
             $join = $this->withRelate($value);
-            if ($join instanceof Kiri\ToArray) {
+            if ($join instanceof \Arrayable) {
                 $join = $join->toArray();
             }
             $data[$value] = $join;