Merge pull request #8250 from annando/issue-8233

[friendica.git] / src / DI.php

diff --git a/src/DI.php b/src/DI.php
index 3034bd971c6c371f06a905d342b2a6be6565710f..430db847700642f640a1d3ea8d8de3cf0ec275bc 100644 (file)
--- a/src/DI.php
+++ b/src/DI.php
@@ -141,7 +141,7 @@ abstract class DI
        }
 
        /**
-        * @return \Friendica\Core\PConfig\IPConfig
+        * @return Core\PConfig\IPConfig
         */
        public static function pConfig()
        {
@@ -221,31 +221,47 @@ abstract class DI
        //
 
        /**
-        * @return Factory\Mastodon\Account
+        * @return Factory\Api\Mastodon\Account
         */
        public static function mstdnAccount()
        {
-               return self::$dice->create(Factory\Mastodon\Account::class);
+               return self::$dice->create(Factory\Api\Mastodon\Account::class);
        }
 
        /**
-        * @return Factory\Mastodon\FollowRequest
+        * @return Factory\Api\Mastodon\Emoji
+        */
+       public static function mstdnEmoji()
+       {
+               return self::$dice->create(Factory\Api\Mastodon\Emoji::class);
+       }
+
+       /**
+        * @return Factory\Api\Mastodon\Field
+        */
+       public static function mstdnField()
+       {
+               return self::$dice->create(Factory\Api\Mastodon\Field::class);
+       }
+
+       /**
+        * @return Factory\Api\Mastodon\FollowRequest
         */
        public static function mstdnFollowRequest()
        {
-               return self::$dice->create(Factory\Mastodon\FollowRequest::class);
+               return self::$dice->create(Factory\Api\Mastodon\FollowRequest::class);
        }
 
        /**
-        * @return Factory\Mastodon\Relationship
+        * @return Factory\Api\Mastodon\Relationship
         */
        public static function mstdnRelationship()
        {
-               return self::$dice->create(Factory\Mastodon\Relationship::class);
+               return self::$dice->create(Factory\Api\Mastodon\Relationship::class);
        }
 
        /**
-        * @return \Friendica\Factory\Notification\Notification
+        * @return Factory\Notification\Notification
         */
        public static function notification()
        {
@@ -253,7 +269,7 @@ abstract class DI
        }
 
        /**
-        * @return \Friendica\Factory\Notification\Introduction
+        * @return Factory\Notification\Introduction
         */
        public static function notificationIntro()
        {
@@ -272,14 +288,6 @@ abstract class DI
                return self::$dice->create(Model\User\Cookie::class);
        }
 
-       /**
-        * @return Repository\Notify
-        */
-       public static function notify()
-       {
-               return self::$dice->create(Repository\Notify::class);
-       }
-
        /**
         * @return Model\Storage\IStorage
         */
@@ -292,6 +300,14 @@ abstract class DI
        // "Repository" namespace
        //
 
+       /**
+        * @return Repository\FSuggest;
+        */
+       public static function fsuggest()
+       {
+               return self::$dice->create(Repository\FSuggest::class);
+       }
+
        /**
         * @return Repository\Introduction
         */
@@ -316,6 +332,14 @@ abstract class DI
                return self::$dice->create(Repository\ProfileField::class);
        }
 
+       /**
+        * @return Repository\Notify
+        */
+       public static function notify()
+       {
+               return self::$dice->create(Repository\Notify::class);
+       }
+
        //
        // "Protocol" namespace instances
        //
@@ -363,4 +387,12 @@ abstract class DI
        {
                return self::$dice->create(Util\Profiler::class);
        }
+
+       /**
+        * @return Util\Emailer
+        */
+       public static function emailer()
+       {
+               return self::$dice->create(Util\Emailer::class);
+       }
 }