Using method-chaining for DICE

bin/auth_ejabberd.php

@@ -32,6 +32,7 @@
  *
  */
 
+use Dice\Dice;
 use Friendica\App\Mode;
 use Friendica\BaseObject;
 use Friendica\Util\ExAuth;
@@ -52,8 +53,7 @@ chdir($directory);
 
 require dirname(__DIR__) . '/vendor/autoload.php';
 
-$dice = new \Dice\Dice();
+$dice = (new Dice())->addRules(include __DIR__ . '/../static/dependencies.config.php');
-$dice = $dice->addRules(include __DIR__ . '/../static/dependencies.config.php');
 BaseObject::setDependencyInjection($dice);
 
 $appMode = $dice->create(Mode::class);

bin/console.php

@@ -1,9 +1,10 @@
 #!/usr/bin/env php
 <?php
 
+use Dice\Dice;
+
 require dirname(__DIR__) . '/vendor/autoload.php';
 
-$dice = new \Dice\Dice();
+$dice = (new Dice())->addRules(include __DIR__ . '/../static/dependencies.config.php');
-$dice = $dice->addRules(include __DIR__ . '/../static/dependencies.config.php');
 
 (new Friendica\Core\Console($dice, $argv))->execute();

bin/daemon.php

@@ -7,6 +7,7 @@
  * This script was taken from http://php.net/manual/en/function.pcntl-fork.php
  */
 
+use Dice\Dice;
 use Friendica\Core\Config;
 use Friendica\Core\Logger;
 use Friendica\Core\Worker;
@@ -31,8 +32,7 @@ if (!file_exists("boot.php") && (sizeof($_SERVER["argv"]) != 0)) {
 
 require dirname(__DIR__) . '/vendor/autoload.php';
 
-$dice = new \Dice\Dice();
+$dice = (new Dice())->addRules(include __DIR__ . '/../static/dependencies.config.php');
-$dice = $dice->addRules(include __DIR__ . '/../static/dependencies.config.php');
 
 \Friendica\BaseObject::setDependencyInjection($dice);
 $a = \Friendica\BaseObject::getApp();

bin/worker.php

@@ -5,7 +5,9 @@
  * @brief Starts the background processing
  */
 
+use Dice\Dice;
 use Friendica\App;
+use Friendica\BaseObject;
 use Friendica\Core\Config;
 use Friendica\Core\Update;
 use Friendica\Core\Worker;
@@ -29,11 +31,10 @@ if (!file_exists("boot.php") && (sizeof($_SERVER["argv"]) != 0)) {
 
 require dirname(__DIR__) . '/vendor/autoload.php';
 
-$dice = new \Dice\Dice();
+$dice = (new Dice())->addRules(include __DIR__ . '/../static/dependencies.config.php');
-$dice = $dice->addRules(include __DIR__ . '/../static/dependencies.config.php');
 
-\Friendica\BaseObject::setDependencyInjection($dice);
+BaseObject::setDependencyInjection($dice);
-$a = \Friendica\BaseObject::getApp();
+$a = BaseObject::getApp();
 
 // Check the database structure and possibly fixes it
 Update::check($a->getBasePath(), true, $a->getMode());

index.php

@@ -4,14 +4,15 @@
  * Friendica
  */
 
+use Dice\Dice;
+
 if (!file_exists(__DIR__ . '/vendor/autoload.php')) {
 	die('Vendor path not found. Please execute "bin/composer.phar --no-dev install" on the command line in the web root.');
 }
 
 require __DIR__ . '/vendor/autoload.php';
 
-$dice = new \Dice\Dice();
+$dice = (new Dice())->addRules(include __DIR__ . '/static/dependencies.config.php');
-$dice = $dice->addRules(include __DIR__ . '/static/dependencies.config.php');
 
 \Friendica\BaseObject::setDependencyInjection($dice);
 

tests/functional/DependencyCheckTest.php

@@ -32,8 +32,8 @@ class dependencyCheck extends TestCase
 
 		$this->setUpVfsDir();
 
-		$this->dice = new Dice();
+		$this->dice = (new Dice())
-		$this->dice = $this->dice->addRules(include __DIR__ . '/../../static/dependencies.config.php');
+			->addRules(include __DIR__ . '/../../static/dependencies.config.php');
 	}
 
 	/**
@@ -87,8 +87,7 @@ class dependencyCheck extends TestCase
 		]);
 
 		// create new DI-library because of shared instance rule (so the Profiler wouldn't get created twice)
-		$this->dice = new Dice(include __DIR__ . '/../../static/dependencies.config.php');
+		$this->dice = (new Dice())->create(Profiler::class, [$configCache]);
-		$profiler = $this->dice->create(Profiler::class, [$configCache]);
 
 		$this->assertInstanceOf(Profiler::class, $profiler);
 		$this->assertTrue($profiler->isRendertime());

tests/include/ApiTest.php

@@ -57,9 +57,9 @@ class ApiTest extends DatabaseTest
 	{
 		parent::setUp();
 
-		$this->dice = new Dice();
+		$this->dice = (new Dice())
-		$this->dice = $this->dice->addRules(include __DIR__ . '/../../static/dependencies.config.php');
+			->addRules(include __DIR__ . '/../../static/dependencies.config.php')
-		$this->dice = $this->dice->addRule(Database::class, ['instanceOf' => StaticDatabase::class, 'shared' => true]);
+			->addRule(Database::class, ['instanceOf' => StaticDatabase::class, 'shared' => true]);
 		BaseObject::setDependencyInjection($this->dice);
 
 		/** @var Database $dba */

tests/src/Database/DBATest.php

@@ -15,9 +15,9 @@ class DBATest extends DatabaseTest
 	{
 		parent::setUp();
 
-		$dice = new Dice();
+		$dice = (new Dice())
-		$dice = $dice->addRules(include __DIR__ . '/../../../static/dependencies.config.php');
+			->addRules(include __DIR__ . '/../../../static/dependencies.config.php')
-		$dice = $dice->addRule(Database::class, ['instanceOf' => StaticDatabase::class, 'shared' => true]);
+			->addRule(Database::class, ['instanceOf' => StaticDatabase::class, 'shared' => true]);
 		BaseObject::setDependencyInjection($dice);
 
 		// Default config

tests/src/Database/DBStructureTest.php

@@ -15,9 +15,9 @@ class DBStructureTest extends DatabaseTest
 	{
 		parent::setUp();
 
-		$dice = new Dice();
+		$dice = (new Dice())
-		$dice = $dice->addRules(include __DIR__ . '/../../../static/dependencies.config.php');
+			->addRules(include __DIR__ . '/../../../static/dependencies.config.php')
-		$dice = $dice->addRule(Database::class, ['instanceOf' => StaticDatabase::class, 'shared' => true]);
+			->addRule(Database::class, ['instanceOf' => StaticDatabase::class, 'shared' => true]);
 		BaseObject::setDependencyInjection($dice);
 	}