e

src/ActiveRecord.php

@@ -268,9 +268,7 @@ class ActiveRecord extends BaseActiveRecord
 		if ($resolve instanceof HasBase) {
 			$resolve = $resolve->get();
 		}
-		if ($resolve instanceof Collection) {
+		if ($resolve instanceof ObjectToArray) {
-			return $resolve->toArray();
-		} else if ($resolve instanceof ActiveRecord) {
 			return $resolve->toArray();
 		} else if (is_object($resolve)) {
 			return get_object_vars($resolve);

src/Base/AbstractCollection.php

@@ -13,6 +13,7 @@ namespace Database\Base;
 use ArrayIterator;
 use Database\ActiveQuery;
 use Database\ActiveRecord;
+use Database\ObjectToArray;
 use Exception;
 use JetBrains\PhpStorm\Pure;
 use Kiri\Abstracts\Component;
@@ -23,7 +24,7 @@ use Traversable;
  * Class AbstractCollection
  * @package Database\Base
  */
-abstract class AbstractCollection extends Component implements \IteratorAggregate, \ArrayAccess
+abstract class AbstractCollection extends Component implements \IteratorAggregate, \ArrayAccess, ObjectToArray
 {
 
     /**

src/Base/BaseActiveRecord.php

@@ -20,6 +20,7 @@ use Database\HasMany;
 use Database\HasOne;
 use Database\IOrm;
 use Database\Mysql\Columns;
+use Database\ObjectToArray;
 use Database\Relation;
 use Database\SqlBuilder;
 use Database\Traits\HasBase;
@@ -47,7 +48,7 @@ use validator\Validator;
  * @property Application $container
  * @property EventDispatch $eventDispatch
  */
-abstract class BaseActiveRecord extends Component implements IOrm, ArrayAccess
+abstract class BaseActiveRecord extends Component implements IOrm, ArrayAccess, ObjectToArray
 {
 
 

src/ObjectToArray.php

@@ -0,0 +1,11 @@
+<?php
+
+namespace Database;
+
+interface ObjectToArray
+{
+
+
+	public function toArray();
+
+}