Remove include/ requires that are now done directly from Composer

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__));
 

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__));
 

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');

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';

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);

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
  *

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()) {

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
  *

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 = '';

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) {

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";

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 = '';

mod/community.php

@@ -93,8 +93,6 @@ function community_content(App $a, $update = 0)
 		}
 	}
 
-	require_once 'include/conversation.php';
-
 	if (!$update) {
 		$tabs = [];
 

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;

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);
 

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();

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) {

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) {

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()) {

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()) {

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()) {

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;

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;

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']));

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()) {

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 = '';

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()) {

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']]];

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) {

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;

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;

mod/phpinfo.php

@@ -3,8 +3,6 @@
  * @file mod/phpinfo.php
  */
 
-require_once 'boot.php';
-
 function phpinfo_content()
 {
 	if (!is_site_admin()) {

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
  *

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()) {

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;
 

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) {

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');

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();

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()) {

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)) {

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() {

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()) {

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()) {

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;

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

src/BaseObject.php

@@ -4,8 +4,6 @@
  */
 namespace Friendica;
 
-require_once 'boot.php';
-
 /**
  * Basic object
  *

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
  */

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 = [

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
  *

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
 {
 	/**

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
  *

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
  *

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
  *

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
  *

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
  *

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
  *

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
  *

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()

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
  *

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
  *

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
  *

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, '');
 

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").

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

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:

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
  *

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
  *

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
  */

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
  */

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
  *

src/Database/DBA.php

@@ -16,8 +16,6 @@ use PDO;
 use PDOException;
 use PDOStatement;
 
-require_once 'include/dba.php';
-
 /**
  * @class MySQL database class
  *

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
  *

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
  */

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
 {
 	/**

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]);

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
 {
 	/*

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
  */

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
  */

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
  */

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

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
 {
 	/**

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
 {
 	/**

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
  */

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, ...)
  */

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
  */

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
  */

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
 {
 	/**

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
 {
 	/**

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
 {
 	/**

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)

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
  */

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.
  */

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
  *

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
  *

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
  */

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
  *

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
  */

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
  *

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
  */

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
  *