Replace BaseObject class with DI::* calls

tests/src/Console/AutomaticInstallationConsoleTest.php

@@ -4,13 +4,13 @@ namespace Friendica\Test\src\Console;
 
 use Dice\Dice;
 use Friendica\App;
-use Friendica\BaseObject;
 use Friendica\Console\AutomaticInstallation;
 use Friendica\Core\Config\Cache\ConfigCache;
 use Friendica\Core\Installer;
 use Friendica\Core\L10n\L10n;
 use Friendica\Core\Logger;
 use Friendica\Database\Database;
+use Friendica\DI;
 use Friendica\Test\Util\DBAMockTrait;
 use Friendica\Test\Util\DBStructureMockTrait;
 use Friendica\Test\Util\RendererMockTrait;
@@ -77,7 +77,7 @@ class AutomaticInstallationConsoleTest extends ConsoleTest
 		           ->with(L10n::class)
 		           ->andReturn($l10nMock);
 
-		BaseObject::setDependencyInjection($this->dice);
+		DI::init($this->dice);
 
 		$this->configCache = new ConfigCache();
 		$this->configCache->set('system', 'basepath', $this->root->url());

tests/src/Core/InstallerTest.php

@@ -4,10 +4,9 @@
 namespace Friendica\Core;
 
 use Dice\Dice;
-use Friendica\BaseObject;
 use Friendica\Core\Config\Cache\ConfigCache;
+use Friendica\DI;
 use Friendica\Network\CurlResult;
-use Friendica\Object\Image;
 use Friendica\Test\MockedTest;
 use Friendica\Test\Util\VFSTrait;
 use Friendica\Util\Network;
@@ -38,7 +37,7 @@ class InstallerTest extends MockedTest
 		           ->with(\Friendica\Core\L10n\L10n::class)
 		           ->andReturn($this->l10nMock);
 
-		BaseObject::setDependencyInjection($dice);
+		DI::init($dice);
 	}
 
 	private function mockL10nT(string $text, $times = null)

tests/src/Core/Lock/SemaphoreLockTest.php

@@ -4,9 +4,9 @@ namespace Friendica\Test\src\Core\Lock;
 
 use Dice\Dice;
 use Friendica\App;
-use Friendica\BaseObject;
 use Friendica\Core\Config\Configuration;
 use Friendica\Core\Lock\SemaphoreLock;
+use Friendica\DI;
 
 class SemaphoreLockTest extends LockTest
 {
@@ -26,7 +26,7 @@ class SemaphoreLockTest extends LockTest
 		$dice->shouldReceive('create')->with(Configuration::class)->andReturn($configMock);
 
 		// @todo Because "get_temppath()" is using static methods, we have to initialize the BaseObject
-		BaseObject::setDependencyInjection($dice);
+		DI::init($dice);
 
 		parent::setUp();
 	}

tests/src/Database/DBATest.php

@@ -2,10 +2,10 @@
 namespace Friendica\Test\src\Database;
 
 use Dice\Dice;
-use Friendica\BaseObject;
 use Friendica\Core\Config;
 use Friendica\Database\Database;
 use Friendica\Database\DBA;
+use Friendica\DI;
 use Friendica\Test\DatabaseTest;
 use Friendica\Test\Util\Database\StaticDatabase;
 
@@ -18,7 +18,7 @@ class DBATest extends DatabaseTest
 		$dice = (new Dice())
 			->addRules(include __DIR__ . '/../../../static/dependencies.config.php')
 			->addRule(Database::class, ['instanceOf' => StaticDatabase::class, 'shared' => true]);
-		BaseObject::setDependencyInjection($dice);
+		DI::init($dice);
 
 		// Default config
 		Config::set('config', 'hostname', 'localhost');

tests/src/Database/DBStructureTest.php

@@ -3,9 +3,9 @@
 namespace Friendica\Test\src\Database;
 
 use Dice\Dice;
-use Friendica\BaseObject;
 use Friendica\Database\Database;
 use Friendica\Database\DBStructure;
+use Friendica\DI;
 use Friendica\Test\DatabaseTest;
 use Friendica\Test\Util\Database\StaticDatabase;
 
@@ -18,7 +18,7 @@ class DBStructureTest extends DatabaseTest
 		$dice = (new Dice())
 			->addRules(include __DIR__ . '/../../../static/dependencies.config.php')
 			->addRule(Database::class, ['instanceOf' => StaticDatabase::class, 'shared' => true]);
-		BaseObject::setDependencyInjection($dice);
+		DI::init($dice);
 	}
 
 	/**

tests/src/Network/CurlResultTest.php

@@ -3,7 +3,7 @@
 namespace Friendica\Test\src\Network;
 
 use Dice\Dice;
-use Friendica\BaseObject;
+use Friendica\DI;
 use Friendica\Network\CurlResult;
 use Mockery\MockInterface;
 use PHPUnit\Framework\TestCase;
@@ -26,7 +26,7 @@ class CurlResultTest extends TestCase
 		           ->with(LoggerInterface::class)
 		           ->andReturn($logger);
 
-		BaseObject::setDependencyInjection($dice);
+		DI::init($dice);
 	}
 
 	/**