X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FDI.php;h=c2f53e4df9e533d768f93089ebcfa5e7cd2d7906;hb=5a8f2021584ed86489b056037ca1ed673f26270f;hp=6eb1ed4b633c17d73c2f67cef8495f5063cdd8c4;hpb=df61be84fc3865f14c6ed84f0d20d86b2ad1f6e8;p=friendica.git

diff --git a/src/DI.php b/src/DI.php
index 6eb1ed4b63..c2f53e4df9 100644
--- a/src/DI.php
+++ b/src/DI.php
@@ -1,4 +1,23 @@
 <?php
+/**
+ * @copyright Copyright (C) 2010-2021, the Friendica project
+ *
+ * @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,31 +232,95 @@ 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\Attachment
+	 */
+	public static function mstdnAttachment()
+	{
+		return self::$dice->create(Factory\Api\Mastodon\Attachment::class);
+	}
+
+	/**
+	 * @return Factory\Api\Mastodon\Emoji
+	 */
+	public static function mstdnEmoji()
+	{
+		return self::$dice->create(Factory\Api\Mastodon\Emoji::class);
 	}
 
 	/**
-	 * @return Factory\Mastodon\FollowRequest
+	 * @return Factory\Api\Mastodon\Error
+	 */
+	public static function mstdnError()
+	{
+		return self::$dice->create(Factory\Api\Mastodon\Error::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 Factory\Api\Mastodon\Status
+	 */
+	public static function mstdnStatus()
+	{
+		return self::$dice->create(Factory\Api\Mastodon\Status::class);
+	}
+
+	/**
+	 * @return Factory\Api\Mastodon\Mention
+	 */
+	public static function mstdnMention()
+	{
+		return self::$dice->create(Factory\Api\Mastodon\Mention::class);
+	}
+
+	/**
+	 * @return Factory\Api\Mastodon\Tag
+	 */
+	public static function mstdnTag()
+	{
+		return self::$dice->create(Factory\Api\Mastodon\Tag::class);
+	}
+
+	/**
+	 * @return Factory\Api\Twitter\User
+	 */
+	public static function twitterUser()
+	{
+		return self::$dice->create(Factory\Api\Twitter\User::class);
 	}
 
 	/**
-	 * @return \Friendica\Factory\Notification\Notification
+	 * @return Factory\Notification\Notification
 	 */
 	public static function notification()
 	{
@@ -253,7 +328,7 @@ abstract class DI
 	}
 
 	/**
-	 * @return \Friendica\Factory\Notification\Introduction
+	 * @return Factory\Notification\Introduction
 	 */
 	public static function notificationIntro()
 	{
@@ -263,6 +338,13 @@ abstract class DI
 	//
 	// "Model" namespace instances
 	//
+	/**
+	 * @return Model\Process
+	 */
+	public static function modelProcess()
+	{
+		return self::$dice->create(Model\Process::class);
+	}
 
 	/**
 	 * @return Model\User\Cookie
@@ -273,25 +355,37 @@ abstract class DI
 	}
 
 	/**
-	 * @return Repository\Notify
+	 * @return Model\Storage\IStorage
 	 */
-	public static function notify()
+	public static function storage()
 	{
-		return self::$dice->create(Repository\Notify::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
 	 */
@@ -316,6 +410,14 @@ abstract class DI
 		return self::$dice->create(Repository\ProfileField::class);
 	}
 
+	/**
+	 * @return Repository\Notification
+	 */
+	public static function notify()
+	{
+		return self::$dice->create(Repository\Notification::class);
+	}
+
 	//
 	// "Protocol" namespace instances
 	//
@@ -328,6 +430,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
 	//
@@ -340,6 +454,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
 	 */