Replace obsolete references to App baseURL and getApp by DI

diff --git a/mod/pubsub.php b/mod/pubsub.php
index 4c1c2759d8a62fb0e3b8478aaf3dd87a66f991df..31c0634dcf0e7639ec15c466850c541115a95169 100644 (file)
--- a/mod/pubsub.php
+++ b/mod/pubsub.php
@@ -4,6 +4,7 @@ use Friendica\App;
 use Friendica\Core\Logger;
 use Friendica\Core\Protocol;
 use Friendica\Database\DBA;
+use Friendica\DI;
 use Friendica\Model\Contact;
 use Friendica\Protocol\OStatus;
 use Friendica\Util\Strings;

diff --git a/src/Api/Mastodon/Instance.php b/src/Api/Mastodon/Instance.php
index 0e9142e5f44f14726f1fccf3750822ce3043eab9..73541ee237c8c6ac6c7a5c31d8bc310bf0e6013c 100644 (file)
--- a/src/Api/Mastodon/Instance.php
+++ b/src/Api/Mastodon/Instance.php
@@ -7,6 +7,7 @@ use Friendica\Api\Mastodon\Account;
 use Friendica\Api\Mastodon\Stats;
 use Friendica\Core\Config;
 use Friendica\Database\DBA;
+use Friendica\DI;
 use Friendica\Model\APContact;
 use Friendica\Model\User;
 use Friendica\Module\Register;
@@ -53,18 +54,19 @@ class Instance
         * @return Instance
         * @throws \Friendica\Network\HTTPException\InternalServerErrorException
         */
-       public static function get(App $app) {
+       public static function get()
+       {
                $register_policy = intval(Config::get('config', 'register_policy'));
 
                $instance = new Instance();
-               $instance->uri = $app->getBaseURL();
+               $instance->uri = DI::baseUrl()->get();
                $instance->title = Config::get('config', 'sitename');
                $instance->description = Config::get('config', 'info');
                $instance->email = Config::get('config', 'admin_email');
                $instance->version = FRIENDICA_VERSION;
                $instance->urls = []; // Not supported
                $instance->stats = Stats::get();
-               $instance->thumbnail = $app->getBaseURL() . (Config::get('system', 'shortcut_icon') ?? 'images/friendica-32.png');
+               $instance->thumbnail = DI::baseUrl()->get() . (Config::get('system', 'shortcut_icon') ?? 'images/friendica-32.png');
                $instance->languages = [Config::get('system', 'language')];
                $instance->max_toot_chars = (int)Config::get('config', 'api_import_size', Config::get('config', 'max_import_size'));
                $instance->registrations = ($register_policy != Register::CLOSED);

diff --git a/src/Module/Api/Mastodon/Instance.php b/src/Module/Api/Mastodon/Instance.php
index 6a2b3abb636c42d128b047d5c65082d82c61d095..559fa68cc407d8d66d3d7e662f10dda4099c9c09 100644 (file)
--- a/src/Module/Api/Mastodon/Instance.php
+++ b/src/Module/Api/Mastodon/Instance.php
@@ -17,6 +17,6 @@ class Instance extends Api
         */
        public static function rawContent(array $parameters = [])
        {
-               System::jsonExit(InstanceEntity::get(self::getApp()));
+               System::jsonExit(InstanceEntity::get());
        }
 }

diff --git a/src/Module/HoverCard.php b/src/Module/HoverCard.php
index e8570d73d22ba4abd89e30c22d9ca3db1184809d..8f4186b03b1c3593aee0f877bbc6b583cab19834 100644 (file)
--- a/src/Module/HoverCard.php
+++ b/src/Module/HoverCard.php
@@ -16,7 +16,7 @@ class HoverCard extends BaseModule
 {
        public static function rawContent(array $parameters = [])
        {
-               $a = self::getApp();
+               $a = DI::app();
 
                if ((local_user()) && ($parameters['action'] ?? '') === 'view') {
                        // A logged in user views a profile of a user

diff --git a/src/Module/Security/OpenID.php b/src/Module/Security/OpenID.php
index 0baa8bb543bdd755b5902573293bfec433304430..331c709b2c778aeaa12f6b3d4194db208fb2b077 100644 (file)
--- a/src/Module/Security/OpenID.php
+++ b/src/Module/Security/OpenID.php
@@ -52,7 +52,7 @@ class OpenID extends BaseModule
                                        // successful OpenID login
                                        $session->remove('openid');
 
-                                       DI::auth()->setForUser(self::getApp(), $user, true, true);
+                                       DI::auth()->setForUser(DI::app(), $user, true, true);
 
                                        // just in case there was no return url set
                                        // and we fell through