X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FBaseCollection.php;h=97e772f168b330bd2706eefc208d576153d764f1;hb=7b02585b978f7aef9d5c5a2c5d2b238cb674a4b7;hp=5a20acee7f4f2a0f1ccf6e34fd6d2a6e03330d64;hpb=09de4a5b47439542d5e73d5452e1d30da26c3ae6;p=friendica.git

diff --git a/src/BaseCollection.php b/src/BaseCollection.php
index 5a20acee7f..97e772f168 100644
--- a/src/BaseCollection.php
+++ b/src/BaseCollection.php
@@ -1,14 +1,32 @@
 <?php
+/**
+ * @copyright Copyright (C) 2010-2023, the Friendica project
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ */
 
 namespace Friendica;
 
 /**
- * The Collection classes inheriting from this abstract class are meant to represent a list of database record.
- * The associated model class has to be provided in the child classes.
+ * The Collection classes inheriting from this class are meant to represent a list of structured objects of a single type.
  *
  * Collections can be used with foreach(), accessed like an array and counted.
  */
-abstract class BaseCollection extends \ArrayIterator
+class BaseCollection extends \ArrayIterator
 {
 	/**
 	 * This property is used with paginated results to hold the total number of items satisfying the paginated request.
@@ -17,44 +35,48 @@ abstract class BaseCollection extends \ArrayIterator
 	protected $totalCount = 0;
 
 	/**
-	 * @param BaseModel[] $models
-	 * @param int|null    $totalCount
+	 * @param BaseEntity[] $entities
+	 * @param int|null     $totalCount
 	 */
-	public function __construct(array $models = [], int $totalCount = null)
+	public function __construct(array $entities = [], int $totalCount = null)
 	{
-		parent::__construct($models);
+		parent::__construct($entities);
 
-		$this->totalCount = $totalCount ?? count($models);
+		$this->totalCount = $totalCount ?? count($entities);
 	}
 
 	/**
 	 * @inheritDoc
 	 */
-	public function offsetSet($offset, $value)
+	#[\ReturnTypeWillChange]
+	public function offsetSet($key, $value): void
 	{
-		if (is_null($offset)) {
+		if (is_null($key)) {
 			$this->totalCount++;
 		}
 
-		parent::offsetSet($offset, $value);
+		parent::offsetSet($key, $value);
 	}
 
 	/**
 	 * @inheritDoc
 	 */
-	public function offsetUnset($offset)
+	#[\ReturnTypeWillChange]
+	public function offsetUnset($key): void
 	{
-		if ($this->offsetExists($offset)) {
+		if ($this->offsetExists($key)) {
 			$this->totalCount--;
 		}
 
-		parent::offsetUnset($offset);
+		parent::offsetUnset($key);
 	}
 
 	/**
-	 * @return int
+	 * Getter for total count
+	 *
+	 * @return int Total count
 	 */
-	public function getTotalCount()
+	public function getTotalCount(): int
 	{
 		return $this->totalCount;
 	}
@@ -67,9 +89,9 @@ abstract class BaseCollection extends \ArrayIterator
 	 * @return array
 	 * @see array_column()
 	 */
-	public function column($column, $index_key = null)
+	public function column(string $column, $index_key = null): array
 	{
-		return array_column($this->getArrayCopy(), $column, $index_key);
+		return array_column($this->getArrayCopy(true), $column, $index_key);
 	}
 
 	/**
@@ -79,7 +101,7 @@ abstract class BaseCollection extends \ArrayIterator
 	 * @return BaseCollection
 	 * @see array_map()
 	 */
-	public function map(callable $callback)
+	public function map(callable $callback): BaseCollection
 	{
 		return new static(array_map($callback, $this->getArrayCopy()), $this->getTotalCount());
 	}
@@ -92,8 +114,35 @@ abstract class BaseCollection extends \ArrayIterator
 	 * @return BaseCollection
 	 * @see array_filter()
 	 */
-	public function filter(callable $callback = null, int $flag = 0)
+	public function filter(callable $callback = null, int $flag = 0): BaseCollection
 	{
 		return new static(array_filter($this->getArrayCopy(), $callback, $flag));
 	}
+
+	/**
+	 * Reverse the orders of the elements in the collection
+	 *
+	 * @return $this
+	 */
+	public function reverse(): BaseCollection
+	{
+		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());
+	}
 }