Commit a7df79ac authored by mmn's avatar mmn

Force arrays in constructors of ActivityStreamJSONDocument and JSONActivityCollection

Started using PHP7+ and it started complaining about count() being fed objects
that weren't "Countable". .)
parent 31866be9
......@@ -27,10 +27,7 @@
* @link http://status.net/
*/
if (!defined('STATUSNET'))
{
exit(1);
}
if (!defined('GNUSOCIAL')) { exit(1); }
/**
* A class for generating JSON documents that represent an Activity Streams
......@@ -72,7 +69,7 @@ class ActivityStreamJSONDocument extends JSONActivityCollection
* @param User $cur the current authenticated user
*/
function __construct($cur = null, $title = null, $items = null, $links = null, $url = null)
function __construct($cur = null, $title = null, array $items=[], $links = null, $url = null)
{
parent::__construct($items, $url);
......
<?php
if (!defined('GNUSOCIAL')) { exit(1); }
/*
* Collection primarily as the root of an Activity Streams doc but can be used as the value
......@@ -24,7 +25,7 @@ class JSONActivityCollection {
* @param string $url url of a doc list all the objs in the collection
* @param int $totalItems total number of items in the collection
*/
function __construct($items = null, $url = null)
function __construct(array $items=[], $url = null)
{
$this->items = empty($items) ? array() : $items;
$this->totalItems = count($items);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment