Force arrays in constructors of ActivityStreamJSONDocument and JSONActivityCollection

Started using PHP7+ and it started complaining about count() being fed objects
that weren't "Countable". .)

diff --git a/lib/activitystreamjsondocument.php b/lib/activitystreamjsondocument.php
index 12c3882c25d444b299293f27544294762719010d..11b4e51ec86e0ee863c051fb6bb69bcc1d94001d 100644 (file)
--- a/lib/activitystreamjsondocument.php
+++ b/lib/activitystreamjsondocument.php
@@ -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);
 

diff --git a/lib/jsonactivitycollection.php b/lib/jsonactivitycollection.php
index 1d1b482e043f8092348acbc384c7aeb2691577e5..1e4f181ffae78bef8497184893964c69b3d5696c 100644 (file)
--- a/lib/jsonactivitycollection.php
+++ b/lib/jsonactivitycollection.php
@@ -1,4 +1,5 @@
 <?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);