Replace BaseObject class with DI::* calls

src/Core/ACL.php

@@ -7,7 +7,6 @@
 namespace Friendica\Core;
 
 use Friendica\App\Page;
-use Friendica\BaseObject;
 use Friendica\Database\DBA;
 use Friendica\DI;
 use Friendica\Model\Contact;
@@ -18,7 +17,7 @@ use Friendica\Model\Group;
  *
  * @author Hypolite Petovan <hypolite@mrpetovan.com>
  */
-class ACL extends BaseObject
+class ACL
 {
 	/**
 	 * Returns a select input tag with all the contact of the local user

src/Core/Addon.php

@@ -5,7 +5,6 @@
 
 namespace Friendica\Core;
 
-use Friendica\BaseObject;
 use Friendica\Database\DBA;
 use Friendica\DI;
 use Friendica\Util\Strings;
@@ -13,7 +12,7 @@ use Friendica\Util\Strings;
 /**
  * Some functions to handle addons
  */
-class Addon extends BaseObject
+class Addon
 {
 	/**
 	 * The addon sub-directory

src/Core/Cache.php

@@ -4,14 +4,13 @@
  */
 namespace Friendica\Core;
 
-use Friendica\BaseObject;
 use Friendica\Core\Cache\Cache as CacheClass;
-use Friendica\Core\Cache\ICache;
+use Friendica\DI;
 
 /**
  * @brief Class for storing data for a short time
  */
-class Cache extends BaseObject
+class Cache
 {
 	/** @deprecated Use CacheClass::MONTH */
 	const MONTH        = CacheClass::MONTH;
@@ -42,7 +41,7 @@ class Cache extends BaseObject
 	 */
 	public static function getAllKeys($prefix = null)
 	{
-		return self::getClass(ICache::class)->getAllKeys($prefix);
+		return DI::cache()->getAllKeys($prefix);
 	}
 
 	/**
@@ -55,7 +54,7 @@ class Cache extends BaseObject
 	 */
 	public static function get($key)
 	{
-		return self::getClass(ICache::class)->get($key);
+		return DI::cache()->get($key);
 	}
 
 	/**
@@ -72,7 +71,7 @@ class Cache extends BaseObject
 	 */
 	public static function set($key, $value, $duration = CacheClass::MONTH)
 	{
-		return self::getClass(ICache::class)->set($key, $value, $duration);
+		return DI::cache()->set($key, $value, $duration);
 	}
 
 	/**
@@ -85,7 +84,7 @@ class Cache extends BaseObject
 	 */
 	public static function delete($key)
 	{
-		return self::getClass(ICache::class)->delete($key);
+		return DI::cache()->delete($key);
 	}
 
 	/**
@@ -98,6 +97,6 @@ class Cache extends BaseObject
 	 */
 	public static function clear($outdated = true)
 	{
-		return self::getClass(ICache::class)->clear($outdated);
+		return DI::cache()->clear($outdated);
 	}
 }

src/Core/Config.php

@@ -8,8 +8,7 @@
  */
 namespace Friendica\Core;
 
-use Friendica\BaseObject;
-use Friendica\Core\Config\Configuration;
+use Friendica\DI;
 
 /**
  * @brief Arbitrary system configuration storage
@@ -18,7 +17,7 @@ use Friendica\Core\Config\Configuration;
  * If we ever would decide to return exactly the variable type as entered,
  * we will have fun with the additional features. :-)
  */
-class Config extends BaseObject
+class Config
 {
 	/**
 	 * @brief Loads all configuration values of family into a cached storage.
@@ -29,7 +28,7 @@ class Config extends BaseObject
 	 */
 	public static function load($cat = "config")
 	{
-		self::getClass(Configuration::class)->load($cat);
+		DI::config()->load($cat);
 	}
 
 	/**
@@ -45,7 +44,7 @@ class Config extends BaseObject
 	 */
 	public static function get($cat, $key, $default_value = null, $refresh = false)
 	{
-		return self::getClass(Configuration::class)->get($cat, $key, $default_value, $refresh);
+		return DI::config()->get($cat, $key, $default_value, $refresh);
 	}
 
 	/**
@@ -63,7 +62,7 @@ class Config extends BaseObject
 	 */
 	public static function set($cat, $key, $value)
 	{
-		return self::getClass(Configuration::class)->set($cat, $key, $value);
+		return DI::config()->set($cat, $key, $value);
 	}
 
 	/**
@@ -76,6 +75,6 @@ class Config extends BaseObject
 	 */
 	public static function delete($cat, $key)
 	{
-		return self::getClass(Configuration::class)->delete($cat, $key);
+		return DI::config()->delete($cat, $key);
 	}
 }

src/Core/Console.php

@@ -146,7 +146,7 @@ HELP;
 
 		$className = $this->subConsoles[$command];
 
-		Friendica\BaseObject::setDependencyInjection($this->dice);
+		Friendica\DI::init($this->dice);
 
 		/** @var Console $subconsole */
 		$subconsole = $this->dice->create($className, [$subargs]);

src/Core/Hook.php

@@ -5,7 +5,6 @@
 namespace Friendica\Core;
 
 use Friendica\App;
-use Friendica\BaseObject;
 use Friendica\Database\DBA;
 use Friendica\DI;
 use Friendica\Util\Strings;
@@ -13,7 +12,7 @@ use Friendica\Util\Strings;
 /**
  * Some functions to handle hooks
  */
-class Hook extends BaseObject
+class Hook
 {
 	/**
 	 * Array of registered hooks

src/Core/L10n.php

@@ -4,14 +4,14 @@
  */
 namespace Friendica\Core;
 
-use Friendica\BaseObject;
 use Friendica\Core\L10n\L10n as L10nClass;
+use Friendica\DI;
 
 /**
  * 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").
  */
-class L10n extends BaseObject
+class L10n
 {
 	/**
 	 * Returns the current language code
@@ -20,7 +20,7 @@ class L10n extends BaseObject
 	 */
 	public static function getCurrentLang()
 	{
-		return self::getClass(L10nClass::class)->getCurrentLang();
+		return DI::l10n()->getCurrentLang();
 	}
 
 	/**
@@ -32,7 +32,7 @@ class L10n extends BaseObject
 	 */
 	public static function withLang(string $lang)
 	{
-		return self::getClass(L10nClass::class)->withLang($lang);
+		DI::l10n()->withLang($lang);
 	}
 
 	/**
@@ -54,7 +54,7 @@ class L10n extends BaseObject
 	 */
 	public static function t($s, ...$vars)
 	{
-		return self::getClass(L10nClass::class)->t($s, ...$vars);
+		return DI::l10n()->t($s, ...$vars);
 	}
 
 	/**
@@ -79,7 +79,7 @@ class L10n extends BaseObject
 	 */
 	public static function tt(string $singular, string $plural, int $count)
 	{
-		return self::getClass(L10nClass::class)->tt($singular, $plural, $count);
+		return DI::l10n()->tt($singular, $plural, $count);
 	}
 
 	/**
@@ -107,7 +107,7 @@ class L10n extends BaseObject
 	 */
 	public static function getDay($s)
 	{
-		return self::getClass(L10nClass::class)->getDay($s);
+		return DI::l10n()->getDay($s);
 	}
 
 	/**
@@ -119,7 +119,7 @@ class L10n extends BaseObject
 	 */
 	public static function getDayShort($s)
 	{
-		return self::getClass(L10nClass::class)->getDayShort($s);
+		return DI::l10n()->getDayShort($s);
 	}
 
 	/**
@@ -131,6 +131,6 @@ class L10n extends BaseObject
 	 */
 	public static function getPokeVerbs()
 	{
-		return self::getClass(L10nClass::class)->getPokeVerbs();
+		return DI::l10n()->getPokeVerbs();
 	}
 }

src/Core/Lock.php

@@ -7,14 +7,13 @@
 
 namespace Friendica\Core;
 
-use Friendica\BaseObject;
 use Friendica\Core\Cache\Cache;
-use Friendica\Core\Lock\ILock;
+use Friendica\DI;
 
 /**
  * This class contain Functions for preventing parallel execution of functions
  */
-class Lock extends BaseObject
+class Lock
 {
 	/**
 	 * @brief Acquires a lock for a given name
@@ -28,7 +27,7 @@ class Lock extends BaseObject
 	 */
 	public static function acquire($key, $timeout = 120, $ttl = Cache::FIVE_MINUTES)
 	{
-		return self::getClass(ILock::class)->acquireLock($key, $timeout, $ttl);
+		return DI::lock()->acquireLock($key, $timeout, $ttl);
 	}
 
 	/**
@@ -37,12 +36,12 @@ class Lock extends BaseObject
 	 * @param string $key      Name of the lock
 	 * @param bool   $override Overrides the lock to get releases
 	 *
-	 * @return void
+	 * @return bool
 	 * @throws \Exception
 	 */
 	public static function release($key, $override = false)
 	{
-		return self::getClass(ILock::class)->releaseLock($key, $override);
+		return DI::lock()->releaseLock($key, $override);
 	}
 
 	/**
@@ -52,6 +51,6 @@ class Lock extends BaseObject
 	 */
 	public static function releaseAll()
 	{
-		self::getClass(ILock::class)->releaseAll();
+		DI::lock()->releaseAll();
 	}
 }

src/Core/Logger.php

@@ -4,7 +4,7 @@
  */
 namespace Friendica\Core;
 
-use Friendica\BaseObject;
+use Friendica\DI;
 use Friendica\Util\Logger\WorkerLogger;
 use Psr\Log\LoggerInterface;
 use Psr\Log\LogLevel;
@@ -12,7 +12,7 @@ use Psr\Log\LogLevel;
 /**
  * @brief Logger functions
  */
-class Logger extends BaseObject
+class Logger
 {
 	/**
 	 * @see Logger::error()
@@ -66,6 +66,18 @@ class Logger extends BaseObject
 		self::DATA => 'Data',
 	];
 
+	/**
+	 * @return LoggerInterface
+	 */
+	private static function getWorker()
+	{
+		if (self::$type === self::TYPE_LOGGER) {
+			return DI::logger();
+		} else {
+			return DI::workerLogger();
+		}
+	}
+
 	/**
 	 * Enable additional logging for worker usage
 	 *
@@ -76,7 +88,7 @@ class Logger extends BaseObject
 	public static function enableWorker(string $functionName)
 	{
 		self::$type = self::TYPE_WORKER;
-		self::getClass(self::$type)->setFunctionName($functionName);
+		self::getWorker()->setFunctionName($functionName);
 	}
 
 	/**
@@ -100,7 +112,7 @@ class Logger extends BaseObject
 	 */
 	public static function emergency($message, $context = [])
 	{
-		self::getClass(self::$type)->emergency($message, $context);
+		self::getWorker()->emergency($message, $context);
 	}
 
 	/**
@@ -118,7 +130,7 @@ class Logger extends BaseObject
 	 */
 	public static function alert($message, $context = [])
 	{
-		self::getClass(self::$type)->alert($message, $context);
+		self::getWorker()->alert($message, $context);
 	}
 
 	/**
@@ -135,7 +147,7 @@ class Logger extends BaseObject
 	 */
 	public static function critical($message, $context = [])
 	{
-		self::getClass(self::$type)->critical($message, $context);
+		self::getWorker()->critical($message, $context);
 	}
 
 	/**
@@ -151,7 +163,7 @@ class Logger extends BaseObject
 	 */
 	public static function error($message, $context = [])
 	{
-		self::getClass(self::$type)->error($message, $context);
+		self::getWorker()->error($message, $context);
 	}
 
 	/**
@@ -169,7 +181,7 @@ class Logger extends BaseObject
 	 */
 	public static function warning($message, $context = [])
 	{
-		self::getClass(self::$type)->warning($message, $context);
+		self::getWorker()->warning($message, $context);
 	}
 
 	/**
@@ -184,7 +196,7 @@ class Logger extends BaseObject
 	 */
 	public static function notice($message, $context = [])
 	{
-		self::getClass(self::$type)->notice($message, $context);
+		self::getWorker()->notice($message, $context);
 	}
 
 	/**
@@ -201,7 +213,7 @@ class Logger extends BaseObject
 	 */
 	public static function info($message, $context = [])
 	{
-		self::getClass(self::$type)->info($message, $context);
+		self::getWorker()->info($message, $context);
 	}
 
 	/**
@@ -216,7 +228,7 @@ class Logger extends BaseObject
 	 */
 	public static function debug($message, $context = [])
 	{
-		self::getClass(self::$type)->debug($message, $context);
+		self::getWorker()->debug($message, $context);
 	}
 
 	    /**
@@ -230,7 +242,7 @@ class Logger extends BaseObject
 	 */
 	public static function log($msg, $level = LogLevel::INFO)
 	{
-		self::getClass(self::$type)->log($level, $msg);
+		self::getWorker()->log($level, $msg);
 	}
 
 	/**
@@ -245,6 +257,6 @@ class Logger extends BaseObject
 	 */
 	public static function devLog($msg, $level = LogLevel::DEBUG)
 	{
-		self::getClass('$devLogger')->log($level, $msg);
+		DI::devLogger()->log($level, $msg);
 	}
 }

src/Core/PConfig.php

@@ -8,8 +8,7 @@
  */
 namespace Friendica\Core;
 
-use Friendica\BaseObject;
-use Friendica\Core\Config\PConfiguration;
+use Friendica\DI;
 
 /**
  * @brief Management of user configuration storage
@@ -18,7 +17,7 @@ use Friendica\Core\Config\PConfiguration;
  * The PConfig::get() functions return boolean false for keys that are unset,
  * and this could lead to subtle bugs.
  */
-class PConfig extends BaseObject
+class PConfig
 {
 	/**
 	 * @brief Loads all configuration values of a user's config family into a cached storage.
@@ -30,7 +29,7 @@ class PConfig extends BaseObject
 	 */
 	public static function load(int $uid, string $cat)
 	{
-		self::getClass(PConfiguration::class)->load($uid, $cat);
+		DI::pConfig()->load($uid, $cat);
 	}
 
 	/**
@@ -47,7 +46,7 @@ class PConfig extends BaseObject
 	 */
 	public static function get(int $uid, string $cat, string $key, $default_value = null, bool $refresh = false)
 	{
-		return self::getClass(PConfiguration::class)->get($uid, $cat, $key, $default_value, $refresh);
+		return DI::pConfig()->get($uid, $cat, $key, $default_value, $refresh);
 	}
 
 	/**
@@ -62,7 +61,7 @@ class PConfig extends BaseObject
 	 */
 	public static function set(int $uid, string $cat, string $key, $value)
 	{
-		return self::getClass(PConfiguration::class)->set($uid, $cat, $key, $value);
+		return DI::pConfig()->set($uid, $cat, $key, $value);
 	}
 
 	/**
@@ -76,6 +75,6 @@ class PConfig extends BaseObject
 	 */
 	public static function delete(int $uid, string $cat, string $key)
 	{
-		return self::getClass(PConfiguration::class)->delete($uid, $cat, $key);
+		return DI::pConfig()->delete($uid, $cat, $key);
 	}
 }

src/Core/Renderer.php

@@ -6,7 +6,6 @@
 namespace Friendica\Core;
 
 use Exception;
-use Friendica\BaseObject;
 use Friendica\DI;
 use Friendica\Render\FriendicaSmarty;
 use Friendica\Render\ITemplateEngine;
@@ -14,7 +13,7 @@ use Friendica\Render\ITemplateEngine;
 /**
  * @brief This class handles Renderer related functions.
  */
-class Renderer extends BaseObject
+class Renderer
 {
 	/**
 	 * @brief An array of registered template engines ('name'=>'class name')

src/Core/Search.php

@@ -2,7 +2,6 @@
 
 namespace Friendica\Core;
 
-use Friendica\BaseObject;
 use Friendica\Database\DBA;
 use Friendica\DI;
 use Friendica\Model\Contact;
@@ -21,7 +20,7 @@ use Friendica\Util\Strings;
  * - Search in the local directory
  * - Search in the global directory
  */
-class Search extends BaseObject
+class Search
 {
 	const DEFAULT_DIRECTORY = 'https://dir.friendica.social';
 

src/Core/Session.php

@@ -5,9 +5,8 @@
  */
 namespace Friendica\Core;
 
-use Friendica\BaseObject;
-use Friendica\Core\Session\ISession;
 use Friendica\Database\DBA;
+use Friendica\DI;
 use Friendica\Model\Contact;
 use Friendica\Util\Strings;
 
@@ -16,39 +15,39 @@ use Friendica\Util\Strings;
  *
  * @author Hypolite Petovan <hypolite@mrpetovan.com>
  */
-class Session extends BaseObject
+class Session
 {
 	public static $exists = false;
 	public static $expire = 180000;
 
 	public static function exists($name)
 	{
-		return self::getClass(ISession::class)->exists($name);
+		return DI::session()->exists($name);
 	}
 
 	public static function get($name, $defaults = null)
 	{
-		return self::getClass(ISession::class)->get($name, $defaults);
+		return DI::session()->get($name, $defaults);
 	}
 
 	public static function set($name, $value)
 	{
-		self::getClass(ISession::class)->set($name, $value);
+		DI::session()->set($name, $value);
 	}
 
 	public static function setMultiple(array $values)
 	{
-		self::getClass(ISession::class)->setMultiple($values);
+		DI::session()->setMultiple($values);
 	}
 
 	public static function remove($name)
 	{
-		self::getClass(ISession::class)->remove($name);
+		DI::session()->remove($name);
 	}
 
 	public static function clear()
 	{
-		self::getClass(ISession::class)->clear();
+		DI::session()->clear();
 	}
 
 	/**
@@ -59,8 +58,7 @@ class Session extends BaseObject
 	 */
 	public static function getRemoteContactID($uid)
 	{
-		/** @var ISession $session */
-		$session = self::getClass(ISession::class);
+		$session = DI::session();
 
 		if (empty($session->get('remote')[$uid])) {
 			return false;
@@ -77,8 +75,7 @@ class Session extends BaseObject
 	 */
 	public static function getUserIDForVisitorContactID($cid)
 	{
-		/** @var ISession $session */
-		$session = self::getClass(ISession::class);
+		$session = DI::session();
 
 		if (empty($session->get('remote'))) {
 			return false;
@@ -94,8 +91,7 @@ class Session extends BaseObject
 	 */
 	public static function setVisitorsContacts()
 	{
-		/** @var ISession $session */
-		$session = self::getClass(ISession::class);
+		$session = DI::session();
 
 		$session->set('remote', []);
 
@@ -117,8 +113,7 @@ class Session extends BaseObject
 	 */
 	public static function isAuthenticated()
 	{
-		/** @var ISession $session */
-		$session = self::getClass(ISession::class);
+		$session = DI::session();
 
 		return $session->get('authenticated', false);
 	}

src/Core/System.php

@@ -4,8 +4,6 @@
  */
 namespace Friendica\Core;
 
-use Friendica\App\BaseURL;
-use Friendica\BaseObject;
 use Friendica\DI;
 use Friendica\Network\HTTPException\InternalServerErrorException;
 use Friendica\Util\XML;
@@ -20,18 +18,17 @@ use Friendica\Util\XML;
 /**
  * @brief System methods
  */
-class System extends BaseObject
+class System
 {
 	/**
 	 * @brief Retrieves the Friendica instance base URL
 	 *
 	 * @param bool $ssl Whether to append http or https under BaseURL::SSL_POLICY_SELFSIGN
 	 * @return string Friendica server base URL
-	 * @throws InternalServerErrorException
 	 */
 	public static function baseUrl($ssl = false)
 	{
-		return self::getClass(BaseURL::class)->get($ssl);
+		return DI::baseUrl()->get($ssl);
 	}
 
 	/**

src/Core/Theme.php

@@ -6,7 +6,6 @@
 
 namespace Friendica\Core;
 
-use Friendica\BaseObject;
 use Friendica\DI;
 use Friendica\Model\Profile;
 use Friendica\Util\Strings;

src/Core/Worker.php

@@ -4,7 +4,6 @@
  */
 namespace Friendica\Core;
 
-use Friendica\BaseObject;
 use Friendica\Core;
 use Friendica\Database\DBA;
 use Friendica\DI;