X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=src%2FDI.php;h=9ed0c5b24d353f5ed5c1c124c31eae1ebce86cd5;hb=06a18abf5a746232c99b5271d907687b30e72651;hp=5794f08f54a7fea1e9e0ec1db7094362fd5c5916;hpb=0e6a675cb5ef99545caf587740b73ff7b4d590d9;p=friendica.git

diff --git a/src/DI.php b/src/DI.php
index 5794f08f54..9ed0c5b24d 100644
--- a/src/DI.php
+++ b/src/DI.php
@@ -1,9 +1,27 @@
 <?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;
 
 use Dice\Dice;
-use Friendica\Core\L10n;
 use Psr\Log\LoggerInterface;
 
 /**
@@ -134,19 +152,19 @@ abstract class DI
 	}
 
 	/**
-	 * @return Core\Config\IConfiguration
+	 * @return Core\Config\IConfig
 	 */
 	public static function config()
 	{
-		return self::$dice->create(Core\Config\IConfiguration::class);
+		return self::$dice->create(Core\Config\IConfig::class);
 	}
 
 	/**
-	 * @return Core\Config\IPConfiguration
+	 * @return Core\PConfig\IPConfig
 	 */
 	public static function pConfig()
 	{
-		return self::$dice->create(Core\Config\IPConfiguration::class);
+		return self::$dice->create(Core\PConfig\IPConfig::class);
 	}
 
 	/**
@@ -158,7 +176,7 @@ abstract class DI
 	}
 
 	/**
-	 * @return L10n
+	 * @return Core\L10n
 	 */
 	public static function l10n()
 	{
@@ -222,27 +240,67 @@ 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\Mastodon\FollowRequest
+	 * @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\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);
 	}
 
 	//
@@ -257,14 +315,6 @@ abstract class DI
 		return self::$dice->create(Model\User\Cookie::class);
 	}
 
-	/**
-	 * @return Model\Notify
-	 */
-	public static function notify()
-	{
-		return self::$dice->create(Model\Notify::class);
-	}
-
 	/**
 	 * @return Model\Storage\IStorage
 	 */
@@ -277,6 +327,14 @@ abstract class DI
 	// "Repository" namespace
 	//
 
+	/**
+	 * @return Repository\FSuggest;
+	 */
+	public static function fsuggest()
+	{
+		return self::$dice->create(Repository\FSuggest::class);
+	}
+
 	/**
 	 * @return Repository\Introduction
 	 */
@@ -285,6 +343,30 @@ abstract class DI
 		return self::$dice->create(Repository\Introduction::class);
 	}
 
+	/**
+	 * @return Repository\PermissionSet
+	 */
+	public static function permissionSet()
+	{
+		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
 	//
@@ -309,6 +391,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
 	 */
@@ -332,4 +422,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);
+	}
 }