Merge remote-tracking branch 'upstream/master'

[quix0rs-gnu-social.git] / classes / Foreign_user.php

diff --git a/classes/Foreign_user.php b/classes/Foreign_user.php
index c1739d318a08737cedccfec1a8af17b316ee9e71..1f6c77851d8768ef2275ec6fb52dea004dc3b414 100644 (file)
--- a/classes/Foreign_user.php
+++ b/classes/Foreign_user.php
@@ -41,33 +41,39 @@ class Foreign_user extends Managed_DataObject
         );
     }
 
-    static function getForeignUser($id, $service) {
+    static function getForeignUser($id, $service)
+    {
+        if (empty($id) || empty($service)) {
+            throw new ServerException('Empty foreign user id or service for Foreign_user::getForeignUser');
+        }
 
         $fuser = new Foreign_user();
-
         $fuser->id      = $id;
         $fuser->service = $service;
-
         $fuser->limit(1);
 
-        $result = $fuser->find(true);
+        if (!$fuser->find(true)) {
+            throw new NoResultException($fuser);
+        }
 
-        return empty($result) ? null : $fuser;
+        return $fuser;
     }
 
     static function getByNickname($nickname, $service)
     {
         if (empty($nickname) || empty($service)) {
-            return null;
-        } else {
-            $fuser = new Foreign_user();
-           $fuser->service = $service;
-           $fuser->nickname = $nickname;
-            $fuser->limit(1);
+            throw new ServerException('Empty nickname or service for Foreign_user::getByNickname');
+        }
 
-            $result = $fuser->find(true);
+        $fuser = new Foreign_user();
+        $fuser->service = $service;
+        $fuser->nickname = $nickname;
+        $fuser->limit(1);
 
-            return empty($result) ? null : $fuser;
+        if (!$fuser->find(true)) {
+            throw new NoResultException($fuser);
         }
+
+        return $fuser;
     }
 }