This commit is contained in:
2020-09-08 00:54:23 +08:00
parent 6bab3c8f1e
commit e541ba9227
+5 -5
View File
@@ -152,7 +152,7 @@ class Collection extends AbstractCollection
public function toArray() public function toArray()
{ {
$array = []; $array = [];
foreach ($this->_item as $value) { foreach ($this as $value) {
if (!is_object($value)) { if (!is_object($value)) {
continue; continue;
} }
@@ -173,7 +173,7 @@ class Collection extends AbstractCollection
return false; return false;
} }
$ids = []; $ids = [];
foreach ($this->_item as $item) { foreach ($this as $item) {
$ids[] = $item->{$model::getPrimary()}; $ids[] = $item->{$model::getPrimary()};
} }
$ids = array_filter($ids); $ids = array_filter($ids);
@@ -193,10 +193,10 @@ class Collection extends AbstractCollection
public function filter(array $condition) public function filter(array $condition)
{ {
if (empty($condition)) { if (empty($condition)) {
return new Filters($this->_item); return new Filters($this);
} }
$_filters = []; $_filters = [];
foreach ($this->_item as $value) { foreach ($this as $value) {
$_value = $value; $_value = $value;
if ($_value instanceof ActiveRecord) { if ($_value instanceof ActiveRecord) {
$_value = $_value->toArray(); $_value = $_value->toArray();
@@ -217,7 +217,7 @@ class Collection extends AbstractCollection
*/ */
public function exists($key, $value) public function exists($key, $value)
{ {
foreach ($this->_item as $item) { foreach ($this as $item) {
if ($item->$key === $value) { if ($item->$key === $value) {
return $item; return $item;
} }