From 360c00c6eb598c9cb99d7ecb3eb005fcbda36e8b Mon Sep 17 00:00:00 2001
From: "as2252258@163.com" <as22522582>
Date: Sat, 28 Aug 2021 02:14:10 +0800
Subject: [PATCH] 111

---
 src/ActiveRecord.php            |  3 ++-
 src/Base/AbstractCollection.php |  5 ++---
 src/Base/BaseActiveRecord.php   |  4 ++--
 src/ObjectToArray.php           | 11 -----------
 4 files changed, 6 insertions(+), 17 deletions(-)
 delete mode 100644 src/ObjectToArray.php

diff --git a/src/ActiveRecord.php b/src/ActiveRecord.php
index 7e0abd4..882f2ea 100644
--- a/src/ActiveRecord.php
+++ b/src/ActiveRecord.php
@@ -16,6 +16,7 @@ use Database\Traits\HasBase;
 use Exception;
 use Kiri\Exception\NotFindClassException;
 use Kiri\Kiri;
+use Kiri\ToArray;
 use ReflectionException;
 
 defined('SAVE_FAIL') or define('SAVE_FAIL', 3227);
@@ -295,7 +296,7 @@ class ActiveRecord extends BaseActiveRecord
 		if ($resolve instanceof HasBase) {
 			$resolve = $resolve->get();
 		}
-		if ($resolve instanceof ObjectToArray) {
+		if ($resolve instanceof ToArray) {
 			return $resolve->toArray();
 		} else if (is_object($resolve)) {
 			return get_object_vars($resolve);
diff --git a/src/Base/AbstractCollection.php b/src/Base/AbstractCollection.php
index 9063ebc..a48b640 100644
--- a/src/Base/AbstractCollection.php
+++ b/src/Base/AbstractCollection.php
@@ -13,18 +13,17 @@ namespace Database\Base;
 use ArrayIterator;
 use Database\ActiveQuery;
 use Database\ActiveRecord;
-use Database\ObjectToArray;
+use Kiri\ToArray;
 use Exception;
 use JetBrains\PhpStorm\Pure;
 use Kiri\Abstracts\Component;
-use Kiri\Kiri;
 use Traversable;
 
 /**
  * Class AbstractCollection
  * @package Database\Base
  */
-abstract class AbstractCollection extends Component implements \IteratorAggregate, \ArrayAccess, ObjectToArray
+abstract class AbstractCollection extends Component implements \IteratorAggregate, \ArrayAccess, ToArray
 {
 
     /**
diff --git a/src/Base/BaseActiveRecord.php b/src/Base/BaseActiveRecord.php
index 18266d8..069419f 100644
--- a/src/Base/BaseActiveRecord.php
+++ b/src/Base/BaseActiveRecord.php
@@ -21,9 +21,9 @@ use Database\HasMany;
 use Database\HasOne;
 use Database\IOrm;
 use Database\Mysql\Columns;
-use Database\ObjectToArray;
 use Database\Relation;
 use Database\SqlBuilder;
+use Kiri\ToArray;
 use Database\Traits\HasBase;
 use Exception;
 use JetBrains\PhpStorm\Pure;
@@ -49,7 +49,7 @@ use validator\Validator;
  * @property Application $container
  * @property EventDispatch $eventDispatch
  */
-abstract class BaseActiveRecord extends Component implements IOrm, ArrayAccess, ObjectToArray
+abstract class BaseActiveRecord extends Component implements IOrm, ArrayAccess, ToArray
 {
 
 
diff --git a/src/ObjectToArray.php b/src/ObjectToArray.php
deleted file mode 100644
index 7882de0..0000000
--- a/src/ObjectToArray.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-namespace Database;
-
-interface ObjectToArray
-{
-
-
-	public function toArray();
-
-}