fixing PHPDoc comments and syntax

diff --git a/lib/private/avatar.php b/lib/private/avatar.php
index e82e517b0916484e41b55457a2ab9f1dc64aa606..814a9b22bed19e39afc14edfa5fc1c5ce7084bdb 100644 (file)
--- a/lib/private/avatar.php
+++ b/lib/private/avatar.php
@@ -54,7 +54,9 @@ class OC_Avatar implements \OCP\IAvatar {
 
                $img = new OC_Image($data);
                $type = substr($img->mimeType(), -3);
-               if ($type === 'peg') { $type = 'jpg'; }
+               if ($type === 'peg') {
+                       $type = 'jpg';
+               }
                if ($type !== 'jpg' && $type !== 'png') {
                        $l = \OC_L10N::get('lib');
                        throw new \Exception($l->t("Unknown filetype"));

diff --git a/lib/private/server.php b/lib/private/server.php
index 7711269acf7517659ba891d3a5b9a1798ed35477..77c3732a9cabdc2a76101c9552ef8d238241ade4 100644 (file)
--- a/lib/private/server.php
+++ b/lib/private/server.php
@@ -132,7 +132,7 @@ class Server extends SimpleContainer implements IServerContainer {
                        return new ActivityManager();
                });
                $this->registerService('AvatarManager', function($c) {
-                       return new AvatarManager(); //TODO AvatarManager needs $user
+                       return new AvatarManager();
                });
        }
 
@@ -176,7 +176,7 @@ class Server extends SimpleContainer implements IServerContainer {
        /**
         * Returns the avatar manager, used for avatar functionality
         *
-        * @return \OCP\IAvatar
+        * @return \OCP\IAvatarManager
         */
        function getAvatarManager() {
                return $this->query('AvatarManager');

diff --git a/lib/public/iservercontainer.php b/lib/public/iservercontainer.php
index 6556b52c3b091c993ccee8bd5dd2941b8f6a82ca..36296a59850c888d9691ac72d2386ae0b49f1594 100644 (file)
--- a/lib/public/iservercontainer.php
+++ b/lib/public/iservercontainer.php
@@ -156,7 +156,7 @@ interface IServerContainer {
 
        /**
         * @brief Returns an avatar manager, used for avatar functionality
-        * @return \OCP\IAvatar
+        * @return \OCP\IAvatarManager
         */
        function getAvatarManager();