Merge pull request #11107 from annando/api-oauth

[friendica.git] / src / BaseCollection.php

diff --git a/src/BaseCollection.php b/src/BaseCollection.php
index 1aa13ae9611403df74bd3078f4b83bcd2989bfa2..d2212e244b921d3e6ec18fbcb0e03eb79f0e6861 100644 (file)
--- a/src/BaseCollection.php
+++ b/src/BaseCollection.php
@@ -87,7 +87,7 @@ class BaseCollection extends \ArrayIterator
         */
        public function column($column, $index_key = null)
        {
-               return array_column($this->getArrayCopy(), $column, $index_key);
+               return array_column($this->getArrayCopy(true), $column, $index_key);
        }
 
        /**
@@ -124,4 +124,21 @@ class BaseCollection extends \ArrayIterator
        {
                return new static(array_reverse($this->getArrayCopy()), $this->getTotalCount());
        }
+
+       /**
+        * @inheritDoc
+        *
+        * includes recursion for entity::toArray() function
+        * @see BaseEntity::toArray()
+        */
+       public function getArrayCopy(bool $recursive = false): array
+       {
+               if (!$recursive) {
+                       return parent::getArrayCopy();
+               }
+
+               return array_map(function ($item) {
+                       return is_object($item) ? $item->toArray() : $item;
+               }, parent::getArrayCopy());
+       }
 }