Remove include/ requires that are now done directly from Composer

diff --git a/bin/auth_ejabberd.php b/bin/auth_ejabberd.php
index 1f03b94..fc57a74 100755 (executable)
--- a/bin/auth_ejabberd.php
+++ b/bin/auth_ejabberd.php
@@ -50,7 +50,6 @@ $directory = realpath($directory . DIRECTORY_SEPARATOR . "..");
 chdir($directory);
 
 require_once "boot.php";
-require_once "include/dba.php";
 
 $a = new App(dirname(__DIR__));
 

diff --git a/bin/daemon.php b/bin/daemon.php
index 9df8b89..de76c99 100755 (executable)
--- a/bin/daemon.php
+++ b/bin/daemon.php
@@ -31,7 +31,6 @@ if (!file_exists("boot.php") && (sizeof($_SERVER["argv"]) != 0)) {
 }
 
 require_once "boot.php";
-require_once "include/dba.php";
 
 $a = new App(dirname(__DIR__));
 

diff --git a/boot.php b/boot.php
index 222011f..d44cf24 100644 (file)
--- a/boot.php
+++ b/boot.php
@@ -35,8 +35,6 @@ use Friendica\Model\Contact;
 use Friendica\Model\Conversation;
 use Friendica\Util\DateTimeFormat;
 
-require_once 'include/text.php';
-
 define('FRIENDICA_PLATFORM',     'Friendica');
 define('FRIENDICA_CODENAME',     'The Tazmans Flax-lily');
 define('FRIENDICA_VERSION',      '2018.12-rc');

diff --git a/include/api.php b/include/api.php
index 77dfb74..1676748 100644 (file)
--- a/include/api.php
+++ b/include/api.php
@@ -46,7 +46,6 @@ use Friendica\Util\Proxy as ProxyUtils;
 use Friendica\Util\Strings;
 use Friendica\Util\XML;
 
-require_once 'include/conversation.php';
 require_once 'mod/share.php';
 require_once 'mod/item.php';
 require_once 'mod/wall_upload.php';

diff --git a/include/items.php b/include/items.php
index b4793b8..ddec223 100644 (file)
--- a/include/items.php
+++ b/include/items.php
@@ -24,10 +24,7 @@ use Friendica\Util\ParseUrl;
 use Friendica\Util\Strings;
 use Friendica\Util\Temporal;
 
-require_once 'include/text.php';
 require_once 'mod/share.php';
-require_once 'include/enotify.php';
-
 function add_page_info_data(array $data, $no_photos = false)
 {
        Addon::callHooks('page_info_data', $data);

diff --git a/include/text.php b/include/text.php
index ee83345..ff9fa55 100644 (file)
--- a/include/text.php
+++ b/include/text.php
@@ -30,8 +30,6 @@ use Friendica\Util\Strings;
 use Friendica\Util\XML;
 use Friendica\Content\Text\HTML;
 
-require_once "include/conversation.php";
-
 /**
  * Turn user/group ACLs stored as angle bracketed text into arrays
  *

diff --git a/mod/acl.php b/mod/acl.php
index 86eafe2..e919192 100644 (file)
--- a/mod/acl.php
+++ b/mod/acl.php
@@ -14,8 +14,6 @@ use Friendica\Model\Item;
 use Friendica\Util\Proxy as ProxyUtils;
 use Friendica\Util\Strings;
 
-require_once 'include/dba.php';
-
 function acl_content(App $a)
 {
        if (!local_user()) {

diff --git a/mod/admin.php b/mod/admin.php
index 8951439..db66eab 100644 (file)
--- a/mod/admin.php
+++ b/mod/admin.php
@@ -33,10 +33,6 @@ use Friendica\Util\Network;
 use Friendica\Util\Strings;
 use Friendica\Util\Temporal;
 
-require_once 'include/enotify.php';
-require_once 'include/text.php';
-require_once 'include/items.php';
-
 /**
  * @brief Process send data from the admin panels subpages
  *

diff --git a/mod/allfriends.php b/mod/allfriends.php
index b233a46..80da130 100644 (file)
--- a/mod/allfriends.php
+++ b/mod/allfriends.php
@@ -15,8 +15,6 @@ use Friendica\Module;
 use Friendica\Util\Proxy as ProxyUtils;
 
 
-require_once 'include/dba.php';
-
 function allfriends_content(App $a)
 {
        $o = '';

diff --git a/mod/attach.php b/mod/attach.php
index 9ca701b..cf2c8cc 100644 (file)
--- a/mod/attach.php
+++ b/mod/attach.php
@@ -8,8 +8,6 @@ use Friendica\Core\L10n;
 use Friendica\Database\DBA;
 use Friendica\Util\Security;
 
-require_once 'include/dba.php';
-
 function attach_init(App $a)
 {
        if ($a->argc != 2) {

diff --git a/mod/bookmarklet.php b/mod/bookmarklet.php
index d9c2f52..be3e1fd 100644 (file)
--- a/mod/bookmarklet.php
+++ b/mod/bookmarklet.php
@@ -11,9 +11,6 @@ use Friendica\Core\System;
 use Friendica\Module\Login;
 use Friendica\Util\Strings;
 
-require_once 'include/conversation.php';
-require_once 'include/items.php';
-
 function bookmarklet_init()
 {
        $_GET["mode"] = "minimal";

diff --git a/mod/common.php b/mod/common.php
index c88d6ee..5d98f07 100644 (file)
--- a/mod/common.php
+++ b/mod/common.php
@@ -14,8 +14,6 @@ use Friendica\Module;
 use Friendica\Util\Proxy as ProxyUtils;
 use Friendica\Util\Strings;
 
-require_once 'include/dba.php';
-
 function common_content(App $a)
 {
        $o = '';

diff --git a/mod/community.php b/mod/community.php
index 3666881..063e1c6 100644 (file)
--- a/mod/community.php
+++ b/mod/community.php
@@ -93,8 +93,6 @@ function community_content(App $a, $update = 0)
                }
        }
 
-       require_once 'include/conversation.php';
-
        if (!$update) {
                $tabs = [];
 

diff --git a/mod/dfrn_confirm.php b/mod/dfrn_confirm.php
index 6f365c5..c78cf45 100644 (file)
--- a/mod/dfrn_confirm.php
+++ b/mod/dfrn_confirm.php
@@ -36,9 +36,6 @@ use Friendica\Util\Network;
 use Friendica\Util\Strings;
 use Friendica\Util\XML;
 
-require_once 'include/enotify.php';
-require_once 'include/items.php';
-
 function dfrn_confirm_post(App $a, $handsfree = null)
 {
        $node = null;

diff --git a/mod/dfrn_notify.php b/mod/dfrn_notify.php
index 51576b3..b911a27 100644 (file)
--- a/mod/dfrn_notify.php
+++ b/mod/dfrn_notify.php
@@ -16,8 +16,6 @@ use Friendica\Protocol\DFRN;
 use Friendica\Protocol\Diaspora;
 use Friendica\Util\Strings;
 
-require_once 'include/items.php';
-
 function dfrn_notify_post(App $a) {
        Logger::log(__function__, Logger::TRACE);
 

diff --git a/mod/dfrn_poll.php b/mod/dfrn_poll.php
index 001202d..a46d215 100644 (file)
--- a/mod/dfrn_poll.php
+++ b/mod/dfrn_poll.php
@@ -17,8 +17,6 @@ use Friendica\Util\Network;
 use Friendica\Util\Strings;
 use Friendica\Util\XML;
 
-require_once 'include/items.php';
-
 function dfrn_poll_init(App $a)
 {
        Login::sessionAuth();

diff --git a/mod/dfrn_request.php b/mod/dfrn_request.php
index 16a2da5..35e3085 100644 (file)
--- a/mod/dfrn_request.php
+++ b/mod/dfrn_request.php
@@ -30,8 +30,6 @@ use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Network;
 use Friendica\Util\Strings;
 
-require_once 'include/enotify.php';
-
 function dfrn_request_init(App $a)
 {
        if ($a->argc > 1) {

diff --git a/mod/display.php b/mod/display.php
index 2a4d2ab..054ba19 100644 (file)
--- a/mod/display.php
+++ b/mod/display.php
@@ -214,8 +214,6 @@ function display_content(App $a, $update = false, $update_uid = 0)
                return;
        }
 
-       require_once 'include/conversation.php';
-
        $o = '';
 
        if ($update) {

diff --git a/mod/events.php b/mod/events.php
index f147e00..c61ad9d 100644 (file)
--- a/mod/events.php
+++ b/mod/events.php
@@ -22,8 +22,6 @@ use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Strings;
 use Friendica\Util\Temporal;
 
-require_once 'include/items.php';
-
 function events_init(App $a)
 {
        if (!local_user()) {

diff --git a/mod/feedtest.php b/mod/feedtest.php
index edb75ae..8508b93 100644 (file)
--- a/mod/feedtest.php
+++ b/mod/feedtest.php
@@ -12,10 +12,6 @@ use Friendica\Model\Contact;
 use Friendica\Protocol\Feed;
 use Friendica\Util\Network;
 
-require_once 'boot.php';
-require_once 'include/dba.php';
-require_once 'include/text.php';
-
 function feedtest_content(App $a)
 {
        if (!local_user()) {

diff --git a/mod/filer.php b/mod/filer.php
index 3508079..4580dc6 100644 (file)
--- a/mod/filer.php
+++ b/mod/filer.php
@@ -10,8 +10,6 @@ use Friendica\Core\Renderer;
 use Friendica\Model\FileTag;
 use Friendica\Util\XML;
 
-require_once 'include/items.php';
-
 function filer_content(App $a)
 {
        if (! local_user()) {

diff --git a/mod/item.php b/mod/item.php
index cc801df..02a61eb 100644 (file)
--- a/mod/item.php
+++ b/mod/item.php
@@ -38,10 +38,6 @@ use Friendica\Util\Emailer;
 use Friendica\Util\Security;
 use Friendica\Util\Strings;
 
-require_once 'include/enotify.php';
-require_once 'include/text.php';
-require_once 'include/items.php';
-
 function item_post(App $a) {
        if (!local_user() && !remote_user()) {
                return 0;
@@ -668,7 +664,6 @@ function item_post(App $a) {
 
        // preview mode - prepare the body for display and send it via json
        if ($preview) {
-               require_once 'include/conversation.php';
                // We set the datarray ID to -1 because in preview mode the dataray
                // doesn't have an ID.
                $datarray["id"] = -1;

diff --git a/mod/like.php b/mod/like.php
index 5ea30a3..7ce7b1a 100644 (file)
--- a/mod/like.php
+++ b/mod/like.php
@@ -5,8 +5,6 @@ use Friendica\Core\System;
 use Friendica\Model\Item;
 use Friendica\Util\Strings;
 
-require_once 'include/items.php';
-
 function like_content(App $a) {
        if (!local_user() && !remote_user()) {
                return false;

diff --git a/mod/lostpass.php b/mod/lostpass.php
index 42a1764..39209af 100644 (file)
--- a/mod/lostpass.php
+++ b/mod/lostpass.php
@@ -13,10 +13,6 @@ use Friendica\Model\User;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Strings;
 
-require_once 'boot.php';
-require_once 'include/enotify.php';
-require_once 'include/text.php';
-
 function lostpass_post(App $a)
 {
        $loginame = Strings::escapeTags(trim($_POST['login-name']));

diff --git a/mod/manage.php b/mod/manage.php
index b42b990..4d0b65d 100644 (file)
--- a/mod/manage.php
+++ b/mod/manage.php
@@ -10,8 +10,6 @@ use Friendica\Core\Renderer;
 use Friendica\Core\System;
 use Friendica\Database\DBA;
 
-require_once "include/text.php";
-
 function manage_post(App $a) {
 
        if (! local_user()) {

diff --git a/mod/message.php b/mod/message.php
index af19487..b812f5c 100644 (file)
--- a/mod/message.php
+++ b/mod/message.php
@@ -21,8 +21,6 @@ use Friendica\Util\Proxy as ProxyUtils;
 use Friendica\Util\Strings;
 use Friendica\Util\Temporal;
 
-require_once 'include/conversation.php';
-
 function message_init(App $a)
 {
        $tabs = '';

diff --git a/mod/network.php b/mod/network.php
index 46861e3..2c5a54c 100644 (file)
--- a/mod/network.php
+++ b/mod/network.php
@@ -30,9 +30,6 @@ use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Proxy as ProxyUtils;
 use Friendica\Util\Strings;
 
-require_once 'include/conversation.php';
-require_once 'include/items.php';
-
 function network_init(App $a)
 {
        if (!local_user()) {

diff --git a/mod/nodeinfo.php b/mod/nodeinfo.php
index ca4a622..d1df217 100644 (file)
--- a/mod/nodeinfo.php
+++ b/mod/nodeinfo.php
@@ -12,8 +12,6 @@ use Friendica\Core\Logger;
 use Friendica\Core\System;
 use Friendica\Database\DBA;
 use Friendica\Util\Network;
-require_once 'include/dba.php';
-
 function nodeinfo_wellknown(App $a) {
        $nodeinfo = ['links' => [['rel' => 'http://nodeinfo.diaspora.software/ns/schema/1.0',
                                        'href' => System::baseUrl().'/nodeinfo/1.0']]];

diff --git a/mod/notes.php b/mod/notes.php
index 90afa16..6ecc819 100644 (file)
--- a/mod/notes.php
+++ b/mod/notes.php
@@ -34,8 +34,6 @@ function notes_content(App $a, $update = false)
                return;
        }
 
-       require_once 'include/conversation.php';
-
        $o = Profile::getTabs($a, true);
 
        if (!$update) {

diff --git a/mod/parse_url.php b/mod/parse_url.php
index 07f319f..02fbfa1 100644 (file)
--- a/mod/parse_url.php
+++ b/mod/parse_url.php
@@ -15,8 +15,6 @@ use Friendica\Core\Logger;
 use Friendica\Util\Network;
 use Friendica\Util\ParseUrl;
 
-require_once 'include/items.php';
-
 function parse_url_content(App $a)
 {
        $text = null;

diff --git a/mod/photos.php b/mod/photos.php
index d1dffd4..0594335 100644 (file)
--- a/mod/photos.php
+++ b/mod/photos.php
@@ -34,8 +34,6 @@ use Friendica\Util\Temporal;
 use Friendica\Util\Strings;
 use Friendica\Util\XML;
 
-require_once 'include/items.php';
-
 function photos_init(App $a) {
 
        if ($a->argc > 1) {
@@ -946,8 +944,6 @@ function photos_content(App $a)
                return;
        }
 
-       require_once 'include/conversation.php';
-
        if (empty($a->data['user'])) {
                notice(L10n::t('No photos selected') . EOL);
                return;

diff --git a/mod/phpinfo.php b/mod/phpinfo.php
index ec2897d..0155609 100644 (file)
--- a/mod/phpinfo.php
+++ b/mod/phpinfo.php
@@ -3,8 +3,6 @@
  * @file mod/phpinfo.php
  */
 
-require_once 'boot.php';
-
 function phpinfo_content()
 {
        if (!is_site_admin()) {

diff --git a/mod/ping.php b/mod/ping.php
index 40700f3..b315ecf 100644 (file)
--- a/mod/ping.php
+++ b/mod/ping.php
@@ -22,8 +22,6 @@ use Friendica\Util\Temporal;
 use Friendica\Util\Proxy as ProxyUtils;
 use Friendica\Util\XML;
 
-require_once 'include/enotify.php';
-
 /**
  * @brief Outputs the counts and the lists of various notifications
  *

diff --git a/mod/poke.php b/mod/poke.php
index f1bad77..fb1fae8 100644 (file)
--- a/mod/poke.php
+++ b/mod/poke.php
@@ -25,8 +25,6 @@ use Friendica\Model\Item;
 use Friendica\Util\Strings;
 use Friendica\Util\XML;
 
-require_once 'include/items.php';
-
 function poke_init(App $a)
 {
        if (!local_user()) {

diff --git a/mod/profile.php b/mod/profile.php
index f84a4be..593e2ee 100644 (file)
--- a/mod/profile.php
+++ b/mod/profile.php
@@ -135,9 +135,6 @@ function profile_content(App $a, $update = 0)
                return Login::form();
        }
 
-       require_once 'include/conversation.php';
-       require_once 'include/items.php';
-
        $groups = [];
        $remote_cid = null;
 

diff --git a/mod/pubsub.php b/mod/pubsub.php
index cd2f21d..8d6e81a 100644 (file)
--- a/mod/pubsub.php
+++ b/mod/pubsub.php
@@ -9,8 +9,6 @@ use Friendica\Protocol\OStatus;
 use Friendica\Util\Strings;
 use Friendica\Core\System;
 
-require_once 'include/items.php';
-
 function hub_return($valid, $body)
 {
        if ($valid) {

diff --git a/mod/register.php b/mod/register.php
index 03d4cb0..b13ec22 100644 (file)
--- a/mod/register.php
+++ b/mod/register.php
@@ -18,8 +18,6 @@ use Friendica\Model;
 use Friendica\Module\Tos;
 use Friendica\Util\Strings;
 
-require_once 'include/enotify.php';
-
 function register_post(App $a)
 {
        BaseModule::checkFormSecurityTokenRedirectOnError('/register', 'register');

diff --git a/mod/regmod.php b/mod/regmod.php
index a7aebf6..a772a78 100644 (file)
--- a/mod/regmod.php
+++ b/mod/regmod.php
@@ -13,8 +13,6 @@ use Friendica\Model\Register;
 use Friendica\Model\User;
 use Friendica\Module\Login;
 
-require_once 'include/enotify.php';
-
 function user_allow($hash)
 {
        $a = get_app();

diff --git a/mod/removeme.php b/mod/removeme.php
index 19bf0bc..741a675 100644 (file)
--- a/mod/removeme.php
+++ b/mod/removeme.php
@@ -12,8 +12,6 @@ use Friendica\Database\DBA;
 use Friendica\Model\User;
 use Friendica\Util\Strings;
 
-require_once 'include/enotify.php';
-
 function removeme_post(App $a)
 {
        if (!local_user()) {

diff --git a/mod/salmon.php b/mod/salmon.php
index 02339c7..eef2510 100644 (file)
--- a/mod/salmon.php
+++ b/mod/salmon.php
@@ -14,8 +14,6 @@ use Friendica\Protocol\Salmon;
 use Friendica\Util\Crypto;
 use Friendica\Util\Strings;
 
-require_once 'include/items.php';
-
 function salmon_post(App $a, $xml = '') {
 
        if (empty($xml)) {

diff --git a/mod/search.php b/mod/search.php
index b40fe07..2cdfd6e 100644 (file)
--- a/mod/search.php
+++ b/mod/search.php
@@ -18,7 +18,6 @@ use Friendica\Database\DBA;
 use Friendica\Model\Item;
 use Friendica\Util\Strings;
 
-require_once 'include/conversation.php';
 require_once 'mod/dirfind.php';
 
 function search_saved_searches() {

diff --git a/mod/subthread.php b/mod/subthread.php
index 90ab5a3..bd7fee5 100644 (file)
--- a/mod/subthread.php
+++ b/mod/subthread.php
@@ -13,8 +13,6 @@ use Friendica\Util\Security;
 use Friendica\Util\Strings;
 use Friendica\Util\XML;
 
-require_once 'include/items.php';
-
 function subthread_content(App $a) {
 
        if (!local_user() && !remote_user()) {

diff --git a/mod/tagger.php b/mod/tagger.php
index f8979ae..78133a9 100644 (file)
--- a/mod/tagger.php
+++ b/mod/tagger.php
@@ -13,8 +13,6 @@ use Friendica\Model\Item;
 use Friendica\Util\Strings;
 use Friendica\Util\XML;
 
-require_once 'include/items.php';
-
 function tagger_content(App $a) {
 
        if (!local_user() && !remote_user()) {

diff --git a/mod/videos.php b/mod/videos.php
index 9e64321..d8aac18 100644 (file)
--- a/mod/videos.php
+++ b/mod/videos.php
@@ -18,8 +18,6 @@ use Friendica\Model\Profile;
 use Friendica\Protocol\DFRN;
 use Friendica\Util\Security;
 
-require_once 'include/items.php';
-
 function videos_init(App $a)
 {
        if ($a->argc > 1) {
@@ -195,8 +193,6 @@ function videos_content(App $a)
                return;
        }
 
-       require_once 'include/conversation.php';
-
        if (empty($a->data['user'])) {
                notice(L10n::t('No videos selected') . EOL );
                return;

diff --git a/src/App.php b/src/App.php
index 261c3e7..57d61d0 100644 (file)
--- a/src/App.php
+++ b/src/App.php
@@ -11,9 +11,6 @@ use Exception;
 use Friendica\Database\DBA;
 use Friendica\Network\HTTPException\InternalServerErrorException;
 
-require_once 'boot.php';
-require_once 'include/text.php';
-
 /**
  *
  * class: App

diff --git a/src/BaseObject.php b/src/BaseObject.php
index d006c24..33ed677 100644 (file)
--- a/src/BaseObject.php
+++ b/src/BaseObject.php
@@ -4,8 +4,6 @@
  */
 namespace Friendica;
 
-require_once 'boot.php';
-
 /**
  * Basic object
  *

diff --git a/src/Content/ForumManager.php b/src/Content/ForumManager.php
index 7b94735..ac745c5 100644 (file)
--- a/src/Content/ForumManager.php
+++ b/src/Content/ForumManager.php
@@ -15,8 +15,6 @@ use Friendica\Database\DBA;
 use Friendica\Model\Contact;
 use Friendica\Util\Proxy as ProxyUtils;
 
-require_once 'include/dba.php';
-
 /**
  * @brief This class handles methods related to the forum functionality
  */

diff --git a/src/Content/Nav.php b/src/Content/Nav.php
index 5166d58..81985ed 100644 (file)
--- a/src/Content/Nav.php
+++ b/src/Content/Nav.php
@@ -15,9 +15,6 @@ use Friendica\Database\DBA;
 use Friendica\Model\Contact;
 use Friendica\Model\Profile;
 
-require_once 'boot.php';
-require_once 'include/text.php';
-
 class Nav
 {
        private static $selected = [

diff --git a/src/Content/OEmbed.php b/src/Content/OEmbed.php
index 6eb11c7..243b2d9 100644 (file)
--- a/src/Content/OEmbed.php
+++ b/src/Content/OEmbed.php
@@ -23,8 +23,6 @@ use Friendica\Util\ParseUrl;
 use Friendica\Util\Proxy as ProxyUtils;
 use Friendica\Util\Strings;
 
-require_once 'include/dba.php';
-
 /**
  * Handles all OEmbed content fetching and replacement
  *

diff --git a/src/Content/Widget.php b/src/Content/Widget.php
index d4d4ff5..2a11cc5 100644 (file)
--- a/src/Content/Widget.php
+++ b/src/Content/Widget.php
@@ -21,9 +21,6 @@ use Friendica\Model\Profile;
 use Friendica\Util\Strings;
 use Friendica\Util\XML;
 
-require_once 'boot.php';
-require_once 'include/dba.php';
-
 class Widget
 {
        /**

diff --git a/src/Content/Widget/CalendarExport.php b/src/Content/Widget/CalendarExport.php
index e8bec0b..7bfa73c 100644 (file)
--- a/src/Content/Widget/CalendarExport.php
+++ b/src/Content/Widget/CalendarExport.php
@@ -10,9 +10,6 @@ use Friendica\Content\Feature;
 use Friendica\Core\L10n;
 use Friendica\Core\Renderer;
 
-require_once 'boot.php';
-require_once 'include/text.php';
-
 /**
  * TagCloud widget
  *

diff --git a/src/Content/Widget/TagCloud.php b/src/Content/Widget/TagCloud.php
index 23aac19..f214ba7 100644 (file)
--- a/src/Content/Widget/TagCloud.php
+++ b/src/Content/Widget/TagCloud.php
@@ -13,8 +13,6 @@ use Friendica\Database\DBA;
 use Friendica\Model\Item;
 use Friendica\Util\Security;
 
-require_once 'include/dba.php';
-
 /**
  * TagCloud widget
  *

diff --git a/src/Core/Config.php b/src/Core/Config.php
index a07bbd3..f191c10 100644 (file)
--- a/src/Core/Config.php
+++ b/src/Core/Config.php
@@ -12,8 +12,6 @@ use Friendica\App;
 use Friendica\BaseObject;
 use Friendica\Core\Config;
 
-require_once 'include/dba.php';
-
 /**
  * @brief Arbitrary system configuration storage
  *

diff --git a/src/Core/Config/JITConfigAdapter.php b/src/Core/Config/JITConfigAdapter.php
index 2018f58..ed5f1a3 100644 (file)
--- a/src/Core/Config/JITConfigAdapter.php
+++ b/src/Core/Config/JITConfigAdapter.php
@@ -4,8 +4,6 @@ namespace Friendica\Core\Config;
 use Friendica\BaseObject;
 use Friendica\Database\DBA;
 
-require_once 'include/dba.php';
-
 /**
  * JustInTime Configuration Adapter
  *

diff --git a/src/Core/Config/JITPConfigAdapter.php b/src/Core/Config/JITPConfigAdapter.php
index 512004b..bdaca40 100644 (file)
--- a/src/Core/Config/JITPConfigAdapter.php
+++ b/src/Core/Config/JITPConfigAdapter.php
@@ -4,8 +4,6 @@ namespace Friendica\Core\Config;
 use Friendica\BaseObject;
 use Friendica\Database\DBA;
 
-require_once 'include/dba.php';
-
 /**
  * JustInTime User Configuration Adapter
  *

diff --git a/src/Core/Config/PreloadConfigAdapter.php b/src/Core/Config/PreloadConfigAdapter.php
index 67cf308..ac59d94 100644 (file)
--- a/src/Core/Config/PreloadConfigAdapter.php
+++ b/src/Core/Config/PreloadConfigAdapter.php
@@ -6,8 +6,6 @@ use Exception;
 use Friendica\BaseObject;
 use Friendica\Database\DBA;
 
-require_once 'include/dba.php';
-
 /**
  * Preload Configuration Adapter
  *

diff --git a/src/Core/Config/PreloadPConfigAdapter.php b/src/Core/Config/PreloadPConfigAdapter.php
index ebccb01..6658efa 100644 (file)
--- a/src/Core/Config/PreloadPConfigAdapter.php
+++ b/src/Core/Config/PreloadPConfigAdapter.php
@@ -6,8 +6,6 @@ use Exception;
 use Friendica\BaseObject;
 use Friendica\Database\DBA;
 
-require_once 'include/dba.php';
-
 /**
  * Preload User Configuration Adapter
  *

diff --git a/src/Core/Console/AutomaticInstallation.php b/src/Core/Console/AutomaticInstallation.php
index e6065df..c2f9df3 100644 (file)
--- a/src/Core/Console/AutomaticInstallation.php
+++ b/src/Core/Console/AutomaticInstallation.php
@@ -11,8 +11,6 @@ use Friendica\Database\DBA;
 use Friendica\Database\DBStructure;
 use RuntimeException;
 
-require_once 'include/dba.php';
-
 class AutomaticInstallation extends Console
 {
        protected function getHelp()

diff --git a/src/Core/Console/DatabaseStructure.php b/src/Core/Console/DatabaseStructure.php
index f3badc1..47e6af5 100644 (file)
--- a/src/Core/Console/DatabaseStructure.php
+++ b/src/Core/Console/DatabaseStructure.php
@@ -8,9 +8,6 @@ use Friendica\Database\DBA;
 use Friendica\Database\DBStructure;
 use RuntimeException;
 
-require_once 'boot.php';
-require_once 'include/dba.php';
-
 /**
  * @brief Performs database updates from the command line
  *

diff --git a/src/Core/Console/GlobalCommunitySilence.php b/src/Core/Console/GlobalCommunitySilence.php
index 01413ca..a1753ed 100644 (file)
--- a/src/Core/Console/GlobalCommunitySilence.php
+++ b/src/Core/Console/GlobalCommunitySilence.php
@@ -8,8 +8,6 @@ use Friendica\Network\Probe;
 use Friendica\Util\Strings;
 use RuntimeException;
 
-require_once 'include/text.php';
-
 /**
  * @brief tool to silence accounts on the global community page
  *

diff --git a/src/Core/Console/Maintenance.php b/src/Core/Console/Maintenance.php
index c8214b1..0cb0da9 100644 (file)
--- a/src/Core/Console/Maintenance.php
+++ b/src/Core/Console/Maintenance.php
@@ -4,9 +4,6 @@ namespace Friendica\Core\Console;
 
 use Friendica\Core;
 
-require_once 'boot.php';
-require_once 'include/dba.php';
-
 /**
  * @brief Sets maintenance mode for this node
  *

diff --git a/src/Core/Installer.php b/src/Core/Installer.php
index b84bcd9..0169f72 100644 (file)
--- a/src/Core/Installer.php
+++ b/src/Core/Installer.php
@@ -578,7 +578,6 @@ class Installer
         */
        public function checkDB($dbhost, $dbuser, $dbpass, $dbdata)
        {
-               require_once 'include/dba.php';
                if (!DBA::connect($dbhost, $dbuser, $dbpass, $dbdata)) {
                        $this->addCheck(L10n::t('Could not connect to database.'), false, true, '');
 

diff --git a/src/Core/L10n.php b/src/Core/L10n.php
index 1283f87..aa36c2e 100644 (file)
--- a/src/Core/L10n.php
+++ b/src/Core/L10n.php
@@ -10,9 +10,6 @@ use Friendica\Core\Addon;
 use Friendica\Core\Logger;
 use Friendica\Core\System;
 
-require_once 'boot.php';
-require_once 'include/dba.php';
-
 /**
  * Provide Language, Translation, and Localization functions to the application
  * Localization can be referred to by the numeronym L10N (as in: "L", followed by ten more letters, and then "N").

diff --git a/src/Core/NotificationsManager.php b/src/Core/NotificationsManager.php
index d11fea0..5a2efe2 100644 (file)
--- a/src/Core/NotificationsManager.php
+++ b/src/Core/NotificationsManager.php
@@ -19,8 +19,6 @@ use Friendica\Util\Proxy as ProxyUtils;
 use Friendica\Util\Temporal;
 use Friendica\Util\XML;
 
-require_once 'include/dba.php';
-
 /**
  * @brief Methods for read and write notifications from/to database
  *  or for formatting notifications

diff --git a/src/Core/PConfig.php b/src/Core/PConfig.php
index 2080f71..752d919 100644 (file)
--- a/src/Core/PConfig.php
+++ b/src/Core/PConfig.php
@@ -11,8 +11,6 @@ namespace Friendica\Core;
 use Friendica\App;
 use Friendica\BaseObject;
 
-require_once 'include/dba.php';
-
 /**
  * @brief Management of user configuration storage
  * Note:

diff --git a/src/Core/Session/CacheSessionHandler.php b/src/Core/Session/CacheSessionHandler.php
index 1baf111..0849081 100644 (file)
--- a/src/Core/Session/CacheSessionHandler.php
+++ b/src/Core/Session/CacheSessionHandler.php
@@ -8,9 +8,6 @@ use Friendica\Core\Logger;
 use Friendica\Core\Session;
 use SessionHandlerInterface;
 
-require_once 'boot.php';
-require_once 'include/text.php';
-
 /**
  * SessionHandler using Friendica Cache
  *

diff --git a/src/Core/Session/DatabaseSessionHandler.php b/src/Core/Session/DatabaseSessionHandler.php
index c4f23b1..1c3da6e 100644 (file)
--- a/src/Core/Session/DatabaseSessionHandler.php
+++ b/src/Core/Session/DatabaseSessionHandler.php
@@ -8,10 +8,6 @@ use Friendica\Core\Session;
 use Friendica\Database\DBA;
 use SessionHandlerInterface;
 
-require_once 'boot.php';
-require_once 'include/dba.php';
-require_once 'include/text.php';
-
 /**
  * SessionHandler using database
  *

diff --git a/src/Core/Theme.php b/src/Core/Theme.php
index e502690..1524c29 100644 (file)
--- a/src/Core/Theme.php
+++ b/src/Core/Theme.php
@@ -9,8 +9,6 @@ namespace Friendica\Core;
 use Friendica\Core\Logger;
 use Friendica\Core\System;
 
-require_once 'boot.php';
-
 /**
  * Some functions to handle themes
  */

diff --git a/src/Core/UserImport.php b/src/Core/UserImport.php
index 70d93b0..59ab7af 100644 (file)
--- a/src/Core/UserImport.php
+++ b/src/Core/UserImport.php
@@ -13,8 +13,6 @@ use Friendica\Model\Photo;
 use Friendica\Object\Image;
 use Friendica\Util\Strings;
 
-require_once "include/dba.php";
-
 /**
  * @brief UserImport class
  */

diff --git a/src/Core/Worker.php b/src/Core/Worker.php
index f3736d2..2c811e3 100644 (file)
--- a/src/Core/Worker.php
+++ b/src/Core/Worker.php
@@ -11,8 +11,6 @@ use Friendica\Model\Process;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Network;
 
-require_once 'include/dba.php';
-
 /**
  * @file src/Core/Worker.php
  *

diff --git a/src/Database/DBA.php b/src/Database/DBA.php
index af0c25d..f1c0ead 100644 (file)
--- a/src/Database/DBA.php
+++ b/src/Database/DBA.php
@@ -16,8 +16,6 @@ use PDO;
 use PDOException;
 use PDOStatement;
 
-require_once 'include/dba.php';
-
 /**
  * @class MySQL database class
  *

diff --git a/src/Database/DBStructure.php b/src/Database/DBStructure.php
index 1a556b7..3043ae1 100644 (file)
--- a/src/Database/DBStructure.php
+++ b/src/Database/DBStructure.php
@@ -12,11 +12,6 @@ use Friendica\Core\L10n;
 use Friendica\Core\Logger;
 use Friendica\Util\DateTimeFormat;
 
-require_once 'boot.php';
-require_once 'include/dba.php';
-require_once 'include/enotify.php';
-require_once 'include/text.php';
-
 /**
  * @brief This class contain functions for the database management
  *

diff --git a/src/Database/PostUpdate.php b/src/Database/PostUpdate.php
index 94c0201..9329e31 100644 (file)
--- a/src/Database/PostUpdate.php
+++ b/src/Database/PostUpdate.php
@@ -13,8 +13,6 @@ use Friendica\Model\ItemURI;
 use Friendica\Model\PermissionSet;
 use Friendica\Database\DBA;
 
-require_once 'include/dba.php';
-
 /**
  * Post update functions
  */

diff --git a/src/Model/APContact.php b/src/Model/APContact.php
index c306b3e..bbaf6da 100644 (file)
--- a/src/Model/APContact.php
+++ b/src/Model/APContact.php
@@ -16,8 +16,6 @@ use Friendica\Util\JsonLD;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Strings;
 
-require_once 'boot.php';
-
 class APContact extends BaseObject
 {
        /**

diff --git a/src/Model/Contact.php b/src/Model/Contact.php
index 5894814..4a63a6b 100644 (file)
--- a/src/Model/Contact.php
+++ b/src/Model/Contact.php
@@ -27,10 +27,6 @@ use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Network;
 use Friendica\Util\Strings;
 
-require_once 'boot.php';
-require_once 'include/dba.php';
-require_once 'include/text.php';
-
 /**
  * @brief functions for interacting with a contact
  */
@@ -1376,8 +1372,6 @@ class Contact extends BaseObject
        {
                $a = self::getApp();
 
-               require_once 'include/conversation.php';
-
                $cid = Self::getIdForURL($contact_url);
 
                $contact = DBA::selectFirst('contact', ['contact-type', 'network'], ['id' => $cid]);

diff --git a/src/Model/Conversation.php b/src/Model/Conversation.php
index 159cd2f..b8e55e5 100644 (file)
--- a/src/Model/Conversation.php
+++ b/src/Model/Conversation.php
@@ -10,8 +10,6 @@ use Friendica\Core\Protocol;
 use Friendica\Database\DBA;
 use Friendica\Util\DateTimeFormat;
 
-require_once "include/dba.php";
-
 class Conversation
 {
        /*

diff --git a/src/Model/Event.php b/src/Model/Event.php
index 886f124..784a9ff 100644 (file)
--- a/src/Model/Event.php
+++ b/src/Model/Event.php
@@ -19,10 +19,6 @@ use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Map;
 use Friendica\Util\XML;
 
-require_once 'boot.php';
-require_once 'include/dba.php';
-require_once 'include/items.php';
-
 /**
  * @brief functions for interacting with the event database table
  */

diff --git a/src/Model/GContact.php b/src/Model/GContact.php
index 44d1ede..c3d58aa 100644 (file)
--- a/src/Model/GContact.php
+++ b/src/Model/GContact.php
@@ -19,8 +19,6 @@ use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Network;
 use Friendica\Util\Strings;
 
-require_once 'include/dba.php';
-
 /**
  * @brief This class handles GlobalContact related functions
  */

diff --git a/src/Model/Group.php b/src/Model/Group.php
index 5424b77..9a4fc23 100644 (file)
--- a/src/Model/Group.php
+++ b/src/Model/Group.php
@@ -12,10 +12,6 @@ use Friendica\Core\Renderer;
 use Friendica\Database\DBA;
 use Friendica\Util\Security;
 
-require_once 'boot.php';
-require_once 'include/dba.php';
-require_once 'include/text.php';
-
 /**
  * @brief functions for interacting with the group database table
  */

diff --git a/src/Model/Item.php b/src/Model/Item.php
index 9acff3b..939ee43 100644 (file)
--- a/src/Model/Item.php
+++ b/src/Model/Item.php
@@ -36,10 +36,6 @@ use Friendica\Util\Security;
 use Friendica\Util\Strings;
 use Text_LanguageDetect;
 
-require_once 'boot.php';
-require_once 'include/items.php';
-require_once 'include/text.php';
-
 class Item extends BaseObject
 {
        // Posting types, inspired by https://www.w3.org/TR/activitystreams-vocabulary/#object-types

diff --git a/src/Model/ItemContent.php b/src/Model/ItemContent.php
index c51f471..25ae6b8 100644 (file)
--- a/src/Model/ItemContent.php
+++ b/src/Model/ItemContent.php
@@ -11,10 +11,6 @@ use Friendica\Content\Text;
 use Friendica\Core\PConfig;
 use Friendica\Core\Protocol;
 
-require_once 'boot.php';
-require_once 'include/items.php';
-require_once 'include/text.php';
-
 class ItemContent extends BaseObject
 {
        /**

diff --git a/src/Model/ItemURI.php b/src/Model/ItemURI.php
index 452f7e5..56e9e1c 100644 (file)
--- a/src/Model/ItemURI.php
+++ b/src/Model/ItemURI.php
@@ -9,8 +9,6 @@ namespace Friendica\Model;
 use Friendica\BaseObject;
 use Friendica\Database\DBA;
 
-require_once 'boot.php';
-
 class ItemURI extends BaseObject
 {
        /**

diff --git a/src/Model/Mail.php b/src/Model/Mail.php
index 815b005..ec02311 100644 (file)
--- a/src/Model/Mail.php
+++ b/src/Model/Mail.php
@@ -13,8 +13,6 @@ use Friendica\Database\DBA;
 use Friendica\Network\Probe;
 use Friendica\Util\DateTimeFormat;
 
-require_once 'include/dba.php';
-
 /**
  * Class to handle private messages
  */

diff --git a/src/Model/PermissionSet.php b/src/Model/PermissionSet.php
index 6506c70..ab6c46a 100644 (file)
--- a/src/Model/PermissionSet.php
+++ b/src/Model/PermissionSet.php
@@ -7,8 +7,6 @@ namespace Friendica\Model;
 use Friendica\BaseObject;
 use Friendica\Database\DBA;
 
-require_once 'include/dba.php';
-
 /**
  * @brief functions for interacting with the permission set of an object (item, photo, event, ...)
  */

diff --git a/src/Model/Photo.php b/src/Model/Photo.php
index a877300..4a9e11c 100644 (file)
--- a/src/Model/Photo.php
+++ b/src/Model/Photo.php
@@ -16,8 +16,6 @@ use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Network;
 use Friendica\Util\Security;
 
-require_once 'include/dba.php';
-
 /**
  * Class to handle photo dabatase table
  */

diff --git a/src/Model/Process.php b/src/Model/Process.php
index 40f0c52..4d50ecd 100644 (file)
--- a/src/Model/Process.php
+++ b/src/Model/Process.php
@@ -8,8 +8,6 @@ use Friendica\BaseObject;
 use Friendica\Database\DBA;
 use Friendica\Util\DateTimeFormat;
 
-require_once 'include/dba.php';
-
 /**
  * @brief functions for interacting with a process
  */

diff --git a/src/Model/Profile.php b/src/Model/Profile.php
index 8267674..c0ee3ec 100644 (file)
--- a/src/Model/Profile.php
+++ b/src/Model/Profile.php
@@ -28,8 +28,6 @@ use Friendica\Util\Proxy as ProxyUtils;
 use Friendica\Util\Strings;
 use Friendica\Util\Temporal;
 
-require_once 'include/dba.php';
-
 class Profile
 {
        /**

diff --git a/src/Model/PushSubscriber.php b/src/Model/PushSubscriber.php
index 44495da..fb34bb5 100644 (file)
--- a/src/Model/PushSubscriber.php
+++ b/src/Model/PushSubscriber.php
@@ -9,8 +9,6 @@ use Friendica\Core\Worker;
 use Friendica\Database\DBA;
 use Friendica\Util\DateTimeFormat;
 
-require_once 'include/dba.php';
-
 class PushSubscriber
 {
        /**

diff --git a/src/Model/Queue.php b/src/Model/Queue.php
index 7ffc64b..b2c0025 100644 (file)
--- a/src/Model/Queue.php
+++ b/src/Model/Queue.php
@@ -9,8 +9,6 @@ use Friendica\Core\Logger;
 use Friendica\Database\DBA;
 use Friendica\Util\DateTimeFormat;
 
-require_once 'include/dba.php';
-
 class Queue
 {
        /**

diff --git a/src/Model/Term.php b/src/Model/Term.php
index 0d44acd..7f494fc 100644 (file)
--- a/src/Model/Term.php
+++ b/src/Model/Term.php
@@ -7,10 +7,6 @@ namespace Friendica\Model;
 use Friendica\Core\System;
 use Friendica\Database\DBA;
 
-require_once 'boot.php';
-require_once 'include/conversation.php';
-require_once 'include/dba.php';
-
 class Term
 {
        public static function tagTextFromItemId($itemid)

diff --git a/src/Model/User.php b/src/Model/User.php
index a6a9fc9..c71ae47 100644 (file)
--- a/src/Model/User.php
+++ b/src/Model/User.php
@@ -24,10 +24,6 @@ use Friendica\Util\Network;
 use Friendica\Util\Strings;
 use LightOpenID;
 
-require_once 'boot.php';
-require_once 'include/dba.php';
-require_once 'include/enotify.php';
-require_once 'include/text.php';
 /**
  * @brief This class handles User related functions
  */

diff --git a/src/Module/Hashtag.php b/src/Module/Hashtag.php
index 4d09183..411da5c 100644 (file)
--- a/src/Module/Hashtag.php
+++ b/src/Module/Hashtag.php
@@ -9,9 +9,6 @@ use Friendica\Core\System;
 use Friendica\Database\DBA;
 use Friendica\Util\Strings;
 
-require_once 'include/dba.php';
-require_once 'include/text.php';
-
 /**
  * Hashtag module.
  */

diff --git a/src/Module/Login.php b/src/Module/Login.php
index 82d7049..b312a78 100644 (file)
--- a/src/Module/Login.php
+++ b/src/Module/Login.php
@@ -20,9 +20,6 @@ use Friendica\Util\Network;
 use Friendica\Util\Strings;
 use LightOpenID;
 
-require_once 'boot.php';
-require_once 'include/text.php';
-
 /**
  * Login module
  *

diff --git a/src/Module/Logout.php b/src/Module/Logout.php
index f212a89..7024fc1 100644 (file)
--- a/src/Module/Logout.php
+++ b/src/Module/Logout.php
@@ -10,8 +10,6 @@ use Friendica\Core\Authentication;
 use Friendica\Core\L10n;
 use Friendica\Core\System;
 
-require_once 'boot.php';
-
 /**
  * Logout module
  *

diff --git a/src/Network/FKOAuthDataStore.php b/src/Network/FKOAuthDataStore.php
index 44e14f2..276ba2f 100644 (file)
--- a/src/Network/FKOAuthDataStore.php
+++ b/src/Network/FKOAuthDataStore.php
@@ -19,8 +19,6 @@ use OAuthToken;
 define('REQUEST_TOKEN_DURATION', 300);
 define('ACCESS_TOKEN_DURATION', 31536000);
 
-require_once 'include/dba.php';
-
 /**
  * @brief OAuthDataStore class
  */

diff --git a/src/Network/Probe.php b/src/Network/Probe.php
index b4e297a..f61eed4 100644 (file)
--- a/src/Network/Probe.php
+++ b/src/Network/Probe.php
@@ -28,8 +28,6 @@ use Friendica\Util\Strings;
 use Friendica\Util\XML;
 use DomXPath;
 
-require_once 'include/dba.php';
-
 /**
  * @brief This class contain functions for probing URL
  *

diff --git a/src/Object/Post.php b/src/Object/Post.php
index 1ca1e22..dd2628d 100644 (file)
--- a/src/Object/Post.php
+++ b/src/Object/Post.php
@@ -24,11 +24,6 @@ use Friendica\Util\Proxy as ProxyUtils;
 use Friendica\Util\Strings;
 use Friendica\Util\Temporal;
 
-require_once 'include/dba.php';
-require_once 'include/text.php';
-require_once 'boot.php';
-require_once 'include/conversation.php';
-
 /**
  * An item
  */

diff --git a/src/Object/Thread.php b/src/Object/Thread.php
index b6d92e7..0068fa2 100644 (file)
--- a/src/Object/Thread.php
+++ b/src/Object/Thread.php
@@ -10,9 +10,6 @@ use Friendica\Core\Protocol;
 use Friendica\Object\Post;
 use Friendica\Util\Security;
 
-require_once 'boot.php';
-require_once 'include/text.php';
-
 /**
  * A list of threads
  *

diff --git a/src/Protocol/DFRN.php b/src/Protocol/DFRN.php
index 7c807b9..c3366f5 100644 (file)
--- a/src/Protocol/DFRN.php
+++ b/src/Protocol/DFRN.php
@@ -37,12 +37,6 @@ use Friendica\Util\XML;
 use HTMLPurifier;
 use HTMLPurifier_Config;
 
-require_once 'boot.php';
-require_once 'include/dba.php';
-require_once "include/enotify.php";
-require_once "include/items.php";
-require_once "include/text.php";
-
 /**
  * @brief This class contain functions to create and send DFRN XML files
  */

diff --git a/src/Protocol/Diaspora.php b/src/Protocol/Diaspora.php
index d59eb7a..4ce6ef7 100644 (file)
--- a/src/Protocol/Diaspora.php
+++ b/src/Protocol/Diaspora.php
@@ -38,9 +38,6 @@ use Friendica\Util\Strings;
 use Friendica\Util\XML;
 use SimpleXMLElement;
 
-require_once 'include/dba.php';
-require_once 'include/items.php';
-
 /**
  * @brief This class contain functions to create and send Diaspora XML files
  *

diff --git a/src/Protocol/Feed.php b/src/Protocol/Feed.php
index 5939e5c..67e5412 100644 (file)
--- a/src/Protocol/Feed.php
+++ b/src/Protocol/Feed.php
@@ -17,9 +17,6 @@ use Friendica\Model\Item;
 use Friendica\Util\Network;
 use Friendica\Util\XML;
 
-require_once 'include/dba.php';
-require_once 'include/items.php';
-
 /**
  * @brief This class contain functions to import feeds
  *

diff --git a/src/Protocol/OStatus.php b/src/Protocol/OStatus.php
index 361d333..1a6f748 100644 (file)
--- a/src/Protocol/OStatus.php
+++ b/src/Protocol/OStatus.php
@@ -29,10 +29,7 @@ use Friendica\Util\Proxy as ProxyUtils;
 use Friendica\Util\Strings;
 use Friendica\Util\XML;
 
-require_once 'include/dba.php';
-require_once 'include/items.php';
 require_once 'mod/share.php';
-require_once 'include/enotify.php';
 require_once 'include/api.php';
 
 /**

diff --git a/src/Protocol/PortableContact.php b/src/Protocol/PortableContact.php
index cd85c1c..f446461 100644 (file)
--- a/src/Protocol/PortableContact.php
+++ b/src/Protocol/PortableContact.php
@@ -26,8 +26,6 @@ use Friendica\Util\Network;
 use Friendica\Util\Strings;
 use Friendica\Util\XML;
 
-require_once 'include/dba.php';
-
 class PortableContact
 {
        /**

diff --git a/src/Util/ExAuth.php b/src/Util/ExAuth.php
index 8d38b33..aa163f6 100644 (file)
--- a/src/Util/ExAuth.php
+++ b/src/Util/ExAuth.php
@@ -39,8 +39,6 @@ use Friendica\Core\PConfig;
 use Friendica\Database\DBA;
 use Friendica\Model\User;
 
-require_once 'include/dba.php';
-
 class ExAuth
 {
        private $bDebug;

diff --git a/src/Util/ParseUrl.php b/src/Util/ParseUrl.php
index 1188214..79d8d28 100644 (file)
--- a/src/Util/ParseUrl.php
+++ b/src/Util/ParseUrl.php
@@ -14,8 +14,6 @@ use Friendica\Database\DBA;
 use Friendica\Object\Image;
 use Friendica\Util\Strings;
 
-require_once 'include/dba.php';
-
 /**
  * @brief Class with methods for extracting certain content from an url
  */

diff --git a/src/Util/Temporal.php b/src/Util/Temporal.php
index 44b9601..d121d59 100644 (file)
--- a/src/Util/Temporal.php
+++ b/src/Util/Temporal.php
@@ -14,9 +14,6 @@ use Friendica\Core\PConfig;
 use Friendica\Core\Renderer;
 use Friendica\Database\DBA;
 
-require_once 'boot.php';
-require_once 'include/text.php';
-
 /**
  * @brief Temporal class
  */

diff --git a/src/Worker/Cron.php b/src/Worker/Cron.php
index 9b8eb1c..0e4b40b 100644 (file)
--- a/src/Worker/Cron.php
+++ b/src/Worker/Cron.php
@@ -15,8 +15,6 @@ use Friendica\Database\DBA;
 use Friendica\Model\Contact;
 use Friendica\Util\DateTimeFormat;
 
-require_once 'include/dba.php';
-
 class Cron
 {
        public static function execute($parameter = '', $generation = 0)

diff --git a/src/Worker/CronJobs.php b/src/Worker/CronJobs.php
index 164b1cf..b13afff 100644 (file)
--- a/src/Worker/CronJobs.php
+++ b/src/Worker/CronJobs.php
@@ -20,7 +20,6 @@ use Friendica\Network\Probe;
 use Friendica\Protocol\PortableContact;
 use Friendica\Util\Proxy as ProxyUtils;
 
-require_once 'include/dba.php';
 require_once 'mod/nodeinfo.php';
 
 class CronJobs

diff --git a/src/Worker/DBClean.php b/src/Worker/DBClean.php
index a722fa2..67f073b 100644 (file)
--- a/src/Worker/DBClean.php
+++ b/src/Worker/DBClean.php
@@ -11,8 +11,6 @@ use Friendica\Core\Logger;
 use Friendica\Core\Worker;
 use Friendica\Database\DBA;
 
-require_once 'include/dba.php';
-
 class DBClean {
        public static function execute($stage = 0) {
 

diff --git a/src/Worker/Delivery.php b/src/Worker/Delivery.php
index 0d56bfa..459660f 100644 (file)
--- a/src/Worker/Delivery.php
+++ b/src/Worker/Delivery.php
@@ -21,8 +21,6 @@ use Friendica\Protocol\Email;
 use Friendica\Util\Strings;
 use Friendica\Util\Network;
 
-require_once 'include/items.php';
-
 class Delivery extends BaseObject
 {
        const MAIL          = 'mail';

diff --git a/src/Worker/Expire.php b/src/Worker/Expire.php
index 21e8735..cb6bdba 100644 (file)
--- a/src/Worker/Expire.php
+++ b/src/Worker/Expire.php
@@ -14,16 +14,12 @@ use Friendica\Core\Worker;
 use Friendica\Database\DBA;
 use Friendica\Model\Item;
 
-require_once 'include/dba.php';
-
 class Expire
 {
        public static function execute($param = '', $hook_function = '')
        {
                $a = BaseObject::getApp();
 
-               require_once 'include/items.php';
-
                Hook::loadHooks();
 
                if ($param == 'delete') {

diff --git a/src/Worker/Notifier.php b/src/Worker/Notifier.php
index 00ad154..d82e294 100644 (file)
--- a/src/Worker/Notifier.php
+++ b/src/Worker/Notifier.php
@@ -24,9 +24,6 @@ use Friendica\Protocol\Diaspora;
 use Friendica\Protocol\OStatus;
 use Friendica\Protocol\Salmon;
 
-require_once 'include/dba.php';
-require_once 'include/items.php';
-
 /*
  * The notifier is typically called with:
  *

diff --git a/src/Worker/OnePoll.php b/src/Worker/OnePoll.php
index f254596..0579bfa 100644 (file)
--- a/src/Worker/OnePoll.php
+++ b/src/Worker/OnePoll.php
@@ -21,16 +21,12 @@ use Friendica\Util\Network;
 use Friendica\Util\Strings;
 use Friendica\Util\XML;
 
-require_once 'include/dba.php';
-
 class OnePoll
 {
        public static function execute($contact_id = 0, $command = '')
        {
                $a = BaseObject::getApp();
 
-               require_once 'include/items.php';
-
                Logger::log('start');
 
                $manual_id  = 0;

diff --git a/src/Worker/PubSubPublish.php b/src/Worker/PubSubPublish.php
index 801bdc8..9f5fcdc 100644 (file)
--- a/src/Worker/PubSubPublish.php
+++ b/src/Worker/PubSubPublish.php
@@ -13,8 +13,6 @@ use Friendica\Model\PushSubscriber;
 use Friendica\Protocol\OStatus;
 use Friendica\Util\Network;
 
-require_once 'include/items.php';
-
 class PubSubPublish
 {
        public static function execute($pubsubpublish_id = 0)

diff --git a/src/Worker/Queue.php b/src/Worker/Queue.php
index 8dc34a5..7ba18ae 100644 (file)
--- a/src/Worker/Queue.php
+++ b/src/Worker/Queue.php
@@ -20,9 +20,6 @@ use Friendica\Protocol\Diaspora;
 use Friendica\Protocol\PortableContact;
 use Friendica\Protocol\Salmon;
 
-require_once 'include/dba.php';
-require_once 'include/items.php';
-
 class Queue
 {
        public static function execute($queue_id = 0)

diff --git a/src/Worker/RemoveContact.php b/src/Worker/RemoveContact.php
index 2e3f16d..00027dc 100644 (file)
--- a/src/Worker/RemoveContact.php
+++ b/src/Worker/RemoveContact.php
@@ -9,8 +9,6 @@ use Friendica\Database\DBA;
 use Friendica\Core\Protocol;
 use Friendica\Model\Item;
 
-require_once 'include/dba.php';
-
 class RemoveContact {
        public static function execute($id) {
 

diff --git a/src/Worker/RemoveUser.php b/src/Worker/RemoveUser.php
index 10ede55..c7179a4 100644 (file)
--- a/src/Worker/RemoveUser.php
+++ b/src/Worker/RemoveUser.php
@@ -8,8 +8,6 @@ namespace Friendica\Worker;
 use Friendica\Database\DBA;
 use Friendica\Model\Item;
 
-require_once 'include/dba.php';
-
 class RemoveUser {
        public static function execute($uid)
        {

diff --git a/src/Worker/SpoolPost.php b/src/Worker/SpoolPost.php
index 2efd77d..bb01dea 100644 (file)
--- a/src/Worker/SpoolPost.php
+++ b/src/Worker/SpoolPost.php
@@ -9,8 +9,6 @@ use Friendica\Core\Config;
 use Friendica\Core\Logger;
 use Friendica\Model\Item;
 
-require_once "include/items.php";
-
 class SpoolPost {
        public static function execute() {
                $path = get_spoolpath();

diff --git a/tests/src/Core/InstallerTest.php b/tests/src/Core/InstallerTest.php
index 32a80a7..b15b91e 100644 (file)
--- a/tests/src/Core/InstallerTest.php
+++ b/tests/src/Core/InstallerTest.php
@@ -239,9 +239,6 @@ class InstallerTest extends MockedTest
                // Mocking that we can use CURL
                $this->setFunctions(['curl_init' => true]);
 
-               // needed because of "normalise_link"
-               require_once __DIR__ . '/../../../include/text.php';
-
                $install = new Installer();
 
                $this->assertFalse($install->checkHtAccess('https://test'));

diff --git a/tests/src/Network/CurlResultTest.php b/tests/src/Network/CurlResultTest.php
index 13a14d9..775c417 100644 (file)
--- a/tests/src/Network/CurlResultTest.php
+++ b/tests/src/Network/CurlResultTest.php
@@ -7,14 +7,6 @@ use PHPUnit\Framework\TestCase;
 
 class CurlResultTest extends TestCase
 {
-       public function setUp()
-       {
-               parent::setUp();
-
-               require_once __DIR__.'/../../../boot.php';
-               require_once __DIR__.'/../../../include/text.php';
-       }
-
        /**
         * @small
         */

diff --git a/update.php b/update.php
index 41b6fa9..22d1809 100644 (file)
--- a/update.php
+++ b/update.php
@@ -12,8 +12,6 @@ use Friendica\Model\Item;
 use Friendica\Model\User;
 use Friendica\Util\DateTimeFormat;
 
-require_once 'include/dba.php';
-
 /**
  *
  * update.php - automatic system update

diff --git a/view/theme/frio/php/scheme.php b/view/theme/frio/php/scheme.php
index 05829bb..ddce673 100644 (file)
--- a/view/theme/frio/php/scheme.php
+++ b/view/theme/frio/php/scheme.php
@@ -19,8 +19,6 @@
  */
 use Friendica\Core\PConfig;
 
-require_once 'boot.php';
-
 function get_scheme_info($scheme)
 {
        $theme = get_app()->getCurrentTheme();