Revert "Fix redirect logging"

[friendica.git] / src / DI.php

diff --git a/src/DI.php b/src/DI.php
index 67e0b17315d78c4fb42138f76dbef5a7e9cc1153..73f9b7811d37abf5e6f38752e5c2f599ebb4980c 100644 (file)
--- a/src/DI.php
+++ b/src/DI.php
@@ -1,4 +1,23 @@
 <?php
+/**
+ * @copyright Copyright (C) 2020, Friendica
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ */
 
 namespace Friendica;
 
@@ -44,14 +63,6 @@ abstract class DI
        // "App" namespace instances
        //
 
-       /**
-        * @return App\Authentication
-        */
-       public static function auth()
-       {
-               return self::$dice->create(App\Authentication::class);
-       }
-
        /**
         * @return App\Arguments
         */
@@ -141,7 +152,7 @@ abstract class DI
        }
 
        /**
-        * @return \Friendica\Core\PConfig\IPConfig
+        * @return Core\PConfig\IPConfig
         */
        public static function pConfig()
        {
@@ -221,32 +232,87 @@ 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\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\Mastodon\FollowRequest
+        * @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 Factory\Api\Mastodon\Status
+        */
+       public static function mstdnStatus()
+       {
+               return self::$dice->create(Factory\Api\Mastodon\Status::class);
+       }
+
+       /**
+        * @return Factory\Api\Twitter\User
+        */
+       public static function twitterUser()
+       {
+               return self::$dice->create(Factory\Api\Twitter\User::class);
+       }
+
+       /**
+        * @return Factory\Notification\Notification
+        */
+       public static function notification()
+       {
+               return self::$dice->create(Factory\Notification\Notification::class);
+       }
+
+       /**
+        * @return Factory\Notification\Introduction
+        */
+       public static function notificationIntro()
+       {
+               return self::$dice->create(Factory\Notification\Introduction::class);
        }
 
        //
        // "Model" namespace instances
        //
+       /**
+        * @return Model\Process
+        */
+       public static function modelProcess()
+       {
+               return self::$dice->create(Model\Process::class);
+       }
 
        /**
         * @return Model\User\Cookie
@@ -257,25 +323,37 @@ abstract class DI
        }
 
        /**
-        * @return Model\Notification
+        * @return Model\Storage\IStorage
         */
-       public static function notification()
+       public static function storage()
        {
-               return self::$dice->create(Model\Notification::class);
+               return self::$dice->create(Model\Storage\IStorage::class);
        }
 
+       //
+       // "Network" namespace
+       //
+
        /**
-        * @return Model\Storage\IStorage
+        * @return Network\IHTTPRequest
         */
-       public static function storage()
+       public static function httpRequest()
        {
-               return self::$dice->create(Model\Storage\IStorage::class);
+               return self::$dice->create(Network\IHTTPRequest::class);
        }
 
        //
        // "Repository" namespace
        //
 
+       /**
+        * @return Repository\FSuggest;
+        */
+       public static function fsuggest()
+       {
+               return self::$dice->create(Repository\FSuggest::class);
+       }
+
        /**
         * @return Repository\Introduction
         */
@@ -292,6 +370,22 @@ abstract class DI
                return self::$dice->create(Repository\PermissionSet::class);
        }
 
+       /**
+        * @return Repository\ProfileField
+        */
+       public static function profileField()
+       {
+               return self::$dice->create(Repository\ProfileField::class);
+       }
+
+       /**
+        * @return Repository\Notify
+        */
+       public static function notify()
+       {
+               return self::$dice->create(Repository\Notify::class);
+       }
+
        //
        // "Protocol" namespace instances
        //
@@ -304,6 +398,18 @@ abstract class DI
                return self::$dice->create(Protocol\Activity::class);
        }
 
+       //
+       // "Security" namespace instances
+       //
+
+       /**
+        * @return \Friendica\Security\Authentication
+        */
+       public static function auth()
+       {
+               return self::$dice->create(Security\Authentication::class);
+       }
+
        //
        // "Util" namespace instances
        //
@@ -316,6 +422,14 @@ abstract class DI
                return self::$dice->create(Util\ACLFormatter::class);
        }
 
+       /**
+        * @return string
+        */
+       public static function basePath()
+       {
+               return self::$dice->create('$basepath');
+       }
+
        /**
         * @return Util\DateTimeFormat
         */
@@ -339,4 +453,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);
+       }
 }