From 5f867f98c2060429042cc7ce020417cb12fbdc76 Mon Sep 17 00:00:00 2001 From: Mikael Nordfeldth Date: Sun, 6 Oct 2013 03:48:41 +0200 Subject: [PATCH] Typing and static declaration in PoCo class --- lib/activityobject.php | 2 +- lib/poco.php | 12 ++---------- 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/lib/activityobject.php b/lib/activityobject.php index a4fa62fb96..aa9eb1837b 100644 --- a/lib/activityobject.php +++ b/lib/activityobject.php @@ -505,7 +505,7 @@ class ActivityObject return $object; } - static function fromGroup($group) + static function fromGroup(User_group $group) { $object = new ActivityObject(); diff --git a/lib/poco.php b/lib/poco.php index baea5b33b0..2bc9e72762 100644 --- a/lib/poco.php +++ b/lib/poco.php @@ -137,12 +137,8 @@ class PoCo return null; } - function fromProfile($profile) + static function fromProfile(Profile $profile) { - if (empty($profile)) { - return null; - } - $poco = new PoCo(); $poco->preferredUsername = $profile->nickname; @@ -168,12 +164,8 @@ class PoCo return $poco; } - function fromGroup($group) + static function fromGroup(User_group $group) { - if (empty($group)) { - return null; - } - $poco = new PoCo(); $poco->preferredUsername = $group->nickname;