Replace BaseObject class with DI::* calls

src/Model/APContact.php

@@ -6,7 +6,6 @@
 
 namespace Friendica\Model;
 
-use Friendica\BaseObject;
 use Friendica\Content\Text\HTML;
 use Friendica\Core\Logger;
 use Friendica\Core\Config;
@@ -17,7 +16,7 @@ use Friendica\Util\JsonLD;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Strings;
 
-class APContact extends BaseObject
+class APContact
 {
 	/**
 	 * Resolves the profile url from the address by using webfinger

src/Model/Attach.php

@@ -6,7 +6,6 @@
  */
 namespace Friendica\Model;
 
-use Friendica\BaseObject;
 use Friendica\Core\StorageManager;
 use Friendica\Core\System;
 use Friendica\Database\DBA;
@@ -21,7 +20,7 @@ use Friendica\Util\Security;
 /**
  * Class to handle attach dabatase table
  */
-class Attach extends BaseObject
+class Attach
 {
 
 	/**

src/Model/Contact.php

@@ -5,7 +5,6 @@
 namespace Friendica\Model;
 
 use Friendica\App\BaseURL;
-use Friendica\BaseObject;
 use Friendica\Content\Pager;
 use Friendica\Core\Config;
 use Friendica\Core\Hook;
@@ -18,7 +17,6 @@ use Friendica\Core\Worker;
 use Friendica\Database\DBA;
 use Friendica\DI;
 use Friendica\Network\Probe;
-use Friendica\Object\Image;
 use Friendica\Protocol\Activity;
 use Friendica\Protocol\ActivityPub;
 use Friendica\Protocol\DFRN;
@@ -33,7 +31,7 @@ use Friendica\Util\Strings;
 /**
  * @brief functions for interacting with a contact
  */
-class Contact extends BaseObject
+class Contact
 {
 	/**
 	 * @deprecated since version 2019.03

src/Model/Event.php

@@ -5,7 +5,6 @@
 
 namespace Friendica\Model;
 
-use Friendica\BaseObject;
 use Friendica\Content\Text\BBCode;
 use Friendica\Core\Hook;
 use Friendica\Core\L10n;
@@ -23,7 +22,7 @@ use Friendica\Util\XML;
 /**
  * @brief functions for interacting with the event database table
  */
-class Event extends BaseObject
+class Event
 {
 
 	public static function getHTML(array $event, $simple = false)

src/Model/Group.php

@@ -6,7 +6,6 @@
 namespace Friendica\Model;
 
 use Friendica\BaseModule;
-use Friendica\BaseObject;
 use Friendica\Core\L10n;
 use Friendica\Core\Logger;
 use Friendica\Core\Protocol;
@@ -16,7 +15,7 @@ use Friendica\Database\DBA;
 /**
  * @brief functions for interacting with the group database table
  */
-class Group extends BaseObject
+class Group
 {
 	const FOLLOWERS = '~';
 	const MUTUALS = '&';

src/Model/Item.php

@@ -6,7 +6,6 @@
 
 namespace Friendica\Model;
 
-use Friendica\BaseObject;
 use Friendica\Content\Text\BBCode;
 use Friendica\Content\Text\HTML;
 use Friendica\Core\Config;
@@ -26,7 +25,6 @@ use Friendica\Protocol\Activity;
 use Friendica\Protocol\ActivityPub;
 use Friendica\Protocol\Diaspora;
 use Friendica\Protocol\OStatus;
-use Friendica\Util\ACLFormatter;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Map;
 use Friendica\Util\Network;
@@ -36,7 +34,7 @@ use Friendica\Util\XML;
 use Friendica\Worker\Delivery;
 use Text_LanguageDetect;
 
-class Item extends BaseObject
+class Item
 {
 	// Posting types, inspired by https://www.w3.org/TR/activitystreams-vocabulary/#object-types
 	const PT_ARTICLE = 0;
@@ -1442,8 +1440,7 @@ class Item extends BaseObject
 			$item['parent-uri'] = $item['thr-parent'];
 		}
 
-		/** @var Activity $activity */
-		$activity = self::getClass(Activity::class);
+		$activity = DI::activity();
 
 		if (isset($item['gravity'])) {
 			$item['gravity'] = intval($item['gravity']);
@@ -2980,8 +2977,7 @@ class Item extends BaseObject
 	 */
 	public static function enumeratePermissions(array $obj, bool $check_dead = false)
 	{
-		/** @var ACLFormatter $aclFormater */
-		$aclFormater = self::getClass(ACLFormatter::class);
+		$aclFormater = DI::aclFormatter();
 
 		$allow_people = $aclFormater->expand($obj['allow_cid']);
 		$allow_groups = Group::expand($obj['uid'], $aclFormater->expand($obj['allow_gid']), $check_dead);

src/Model/ItemContent.php

@@ -6,12 +6,11 @@
 
 namespace Friendica\Model;
 
-use Friendica\BaseObject;
 use Friendica\Content\Text;
 use Friendica\Core\PConfig;
 use Friendica\Core\Protocol;
 
-class ItemContent extends BaseObject
+class ItemContent
 {
 	/**
 	 * @brief Convert a message into plaintext for connectors to other networks

src/Model/ItemURI.php

@@ -6,10 +6,9 @@
 
 namespace Friendica\Model;
 
-use Friendica\BaseObject;
 use Friendica\Database\DBA;
 
-class ItemURI extends BaseObject
+class ItemURI
 {
 	/**
 	 * @brief Insert an item-uri record and return its id

src/Model/Nodeinfo.php

@@ -2,7 +2,6 @@
 
 namespace Friendica\Model;
 
-use Friendica\BaseObject;
 use Friendica\Core\Addon;
 use Friendica\Database\DBA;
 use Friendica\DI;
@@ -10,7 +9,7 @@ use Friendica\DI;
 /**
  * Model interaction for the nodeinfo
  */
-class Nodeinfo extends BaseObject
+class Nodeinfo
 {
 	/**
 	 * Updates the info about the current node

src/Model/Notify.php

@@ -4,7 +4,6 @@ namespace Friendica\Model;
 
 use Exception;
 use Friendica\App;
-use Friendica\BaseObject;
 use Friendica\Content\Text\BBCode;
 use Friendica\Content\Text\HTML;
 use Friendica\Core\Config\PConfiguration;
@@ -26,7 +25,7 @@ use Friendica\Network\HTTPException;
  * @brief Methods for read and write notifications from/to database
  *  or for formatting notifications
  */
-final class Notify extends BaseObject
+final class Notify
 {
 	/** @var int The default limit of notifies per page */
 	const DEFAULT_PAGE_LIMIT = 80;

src/Model/PermissionSet.php

@@ -4,13 +4,12 @@
  */
 namespace Friendica\Model;
 
-use Friendica\BaseObject;
 use Friendica\Database\DBA;
 
 /**
  * @brief functions for interacting with the permission set of an object (item, photo, event, ...)
  */
-class PermissionSet extends BaseObject
+class PermissionSet
 {
 	/**
 	 * Fetch the id of a given permission set. Generate a new one when needed

src/Model/Photo.php

@@ -6,7 +6,6 @@
  */
 namespace Friendica\Model;
 
-use Friendica\BaseObject;
 use Friendica\Core\Cache;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
@@ -29,7 +28,7 @@ require_once "include/dba.php";
 /**
  * Class to handle photo dabatase table
  */
-class Photo extends BaseObject
+class Photo
 {
 	/**
 	 * @brief Select rows from the photo table and returns them as array

src/Model/Process.php

@@ -4,14 +4,13 @@
  */
 namespace Friendica\Model;
 
-use Friendica\BaseObject;
 use Friendica\Database\DBA;
 use Friendica\Util\DateTimeFormat;
 
 /**
  * @brief functions for interacting with a process
  */
-class Process extends BaseObject
+class Process
 {
 	/**
 	 * Insert a new process row. If the pid parameter is omitted, we use the current pid

src/Model/Search.php

@@ -2,13 +2,12 @@
 
 namespace Friendica\Model;
 
-use Friendica\BaseObject;
 use Friendica\Database\DBA;
 
 /**
  * Model for DB specific logic for the search entity
  */
-class Search extends BaseObject
+class Search
 {
 	/**
 	 * Returns the list of user defined tags (e.g. #Friendica)

src/Model/TwoFactor/AppSpecificPassword.php

@@ -2,7 +2,6 @@
 
 namespace Friendica\Model\TwoFactor;
 
-use Friendica\BaseObject;
 use Friendica\Database\DBA;
 use Friendica\Model\User;
 use Friendica\Util\DateTimeFormat;
@@ -14,7 +13,7 @@ use PragmaRX\Random\Random;
  *
  * @package Friendica\Model
  */
-class AppSpecificPassword extends BaseObject
+class AppSpecificPassword
 {
 	public static function countForUser($uid)
 	{

src/Model/TwoFactor/RecoveryCode.php

@@ -2,7 +2,6 @@
 
 namespace Friendica\Model\TwoFactor;
 
-use Friendica\BaseObject;
 use Friendica\Database\DBA;
 use Friendica\Util\DateTimeFormat;
 use PragmaRX\Random\Random;
@@ -13,7 +12,7 @@ use PragmaRX\Recovery\Recovery;
  *
  * @package Friendica\Model
  */
-class RecoveryCode extends BaseObject
+class RecoveryCode
 {
     /**
      * Returns the number of code the provided users can still use to replace a TOTP code