Merge pull request 'Bluesky: Tags are now supported' (#1438) from heluecht/friendica...

[friendica-addons.git] / testdrive / testdrive.php

diff --git a/testdrive/testdrive.php b/testdrive/testdrive.php
index 903f80b11d6ebf287fc91c17208583cd65d38228..5564528451e1beba982bfab3ea0c2e64fc13e237 100644 (file)
--- a/testdrive/testdrive.php
+++ b/testdrive/testdrive.php
@@ -13,7 +13,7 @@ use Friendica\Database\DBA;
 use Friendica\DI;
 use Friendica\Model\Notification;
 use Friendica\Model\User;
-use Friendica\Core\Config\Util\ConfigFileLoader;
+use Friendica\Core\Config\Util\ConfigFileManager;
 use Friendica\Util\DateTimeFormat;
 
 function testdrive_install()
@@ -25,17 +25,17 @@ function testdrive_install()
        Hook::register('globaldir_update','addon/testdrive/testdrive.php', 'testdrive_globaldir_update');
 }
 
-function testdrive_load_config(App $a, ConfigFileLoader $loader)
+function testdrive_load_config(ConfigFileManager $loader)
 {
-       $a->getConfigCache()->load($loader->loadAddonConfig('testdrive'), \Friendica\Core\Config\ValueObject\Cache::SOURCE_STATIC);
+       DI::app()->getConfigCache()->load($loader->loadAddonConfig('testdrive'), \Friendica\Core\Config\ValueObject\Cache::SOURCE_STATIC);
 }
 
-function testdrive_globaldir_update(App $a, array &$b)
+function testdrive_globaldir_update(array &$b)
 {
        $b['url'] = '';
 }
 
-function testdrive_register_account(App $a, $b)
+function testdrive_register_account($b)
 {
        $uid = $b;
 
@@ -48,7 +48,7 @@ function testdrive_register_account(App $a, $b)
 }
 
 
-function testdrive_cron(App $a, $b)
+function testdrive_cron($b)
 {
        $users = DBA::selectToArray('user', [], ["`account_expires_on` < ? AND `expire_notification_sent` <= ?",
                DateTimeFormat::utc('now + 5 days'), DBA::NULL_DATETIME]);
@@ -59,8 +59,8 @@ function testdrive_cron(App $a, $b)
                        'uid' => $rr['uid'],
                        'system_type' => 'testdrive_expire',
                        'source_name'  => DI::l10n()->t('Administrator'),
-                       'source_link'  => DI::baseUrl()->get(),
-                       'source_photo' => DI::baseUrl()->get() . '/images/person-80.jpg',
+                       'source_link'  => DI::baseUrl(),
+                       'source_photo' => DI::baseUrl() . '/images/person-80.jpg',
                ]);
 
                DBA::update('user', ['expire_notification_sent' => DateTimeFormat::utcNow()], ['uid' => $rr['uid']]);
@@ -72,11 +72,11 @@ function testdrive_cron(App $a, $b)
        }
 }
 
-function testdrive_enotify(App $a, array &$b)
+function testdrive_enotify(array &$b)
 {
        if (!empty($b['params']) && $b['params']['type'] == Notification\Type::SYSTEM
                && !empty($b['params']['system_type']) && $b['params']['system_type'] === 'testdrive_expire') {
-               $b['itemlink'] = DI::baseUrl()->get();
+               $b['itemlink'] = DI::baseUrl();
                $b['epreamble'] = $b['preamble'] = DI::l10n()->t('Your account on %s will expire in a few days.', DI::config()->get('system', 'sitename'));
                $b['subject'] = DI::l10n()->t('Your Friendica test account is about to expire.');
                $b['body'] = DI::l10n()->t("Hi %1\$s,\n\nYour test account on %2\$s will expire in less than five days. We hope you enjoyed this test drive and use this opportunity to find a permanent Friendica website for your integrated social communications. A list of public sites is available at %s/siteinfo - and for more information on setting up your own Friendica server please see the Friendica project website at https://friendi.ca.", $b['params']['to_name'], "[url=".DI::config()->get('system', 'url')."]".DI::config()->get('config', 'sitename')."[/url]", Search::getGlobalDirectory());