Browse Source

Using method-chaining for DICE

tags/2019.09
Philipp Holzer 11 months ago
parent
commit
9682cc440c
No known key found for this signature in database GPG Key ID: D8365C3D36B77D90
9 changed files with 27 additions and 25 deletions
  1. +2
    -2
      bin/auth_ejabberd.php
  2. +3
    -2
      bin/console.php
  3. +2
    -2
      bin/daemon.php
  4. +5
    -4
      bin/worker.php
  5. +3
    -2
      index.php
  6. +3
    -4
      tests/functional/DependencyCheckTest.php
  7. +3
    -3
      tests/include/ApiTest.php
  8. +3
    -3
      tests/src/Database/DBATest.php
  9. +3
    -3
      tests/src/Database/DBStructureTest.php

+ 2
- 2
bin/auth_ejabberd.php View File

@@ -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 = $dice->addRules(include __DIR__ . '/../static/dependencies.config.php');
$dice = (new Dice())->addRules(include __DIR__ . '/../static/dependencies.config.php');
BaseObject::setDependencyInjection($dice);

$appMode = $dice->create(Mode::class);


+ 3
- 2
bin/console.php View File

@@ -1,9 +1,10 @@
#!/usr/bin/env php
<?php

use Dice\Dice;

require dirname(__DIR__) . '/vendor/autoload.php';

$dice = new \Dice\Dice();
$dice = $dice->addRules(include __DIR__ . '/../static/dependencies.config.php');
$dice = (new Dice())->addRules(include __DIR__ . '/../static/dependencies.config.php');

(new Friendica\Core\Console($dice, $argv))->execute();

+ 2
- 2
bin/daemon.php View File

@@ -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 = $dice->addRules(include __DIR__ . '/../static/dependencies.config.php');
$dice = (new Dice())->addRules(include __DIR__ . '/../static/dependencies.config.php');

\Friendica\BaseObject::setDependencyInjection($dice);
$a = \Friendica\BaseObject::getApp();


+ 5
- 4
bin/worker.php View File

@@ -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 = $dice->addRules(include __DIR__ . '/../static/dependencies.config.php');
$dice = (new Dice())->addRules(include __DIR__ . '/../static/dependencies.config.php');

\Friendica\BaseObject::setDependencyInjection($dice);
$a = \Friendica\BaseObject::getApp();
BaseObject::setDependencyInjection($dice);
$a = BaseObject::getApp();

// Check the database structure and possibly fixes it
Update::check($a->getBasePath(), true, $a->getMode());


+ 3
- 2
index.php View File

@@ -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 = $dice->addRules(include __DIR__ . '/static/dependencies.config.php');
$dice = (new Dice())->addRules(include __DIR__ . '/static/dependencies.config.php');

\Friendica\BaseObject::setDependencyInjection($dice);



+ 3
- 4
tests/functional/DependencyCheckTest.php View File

@@ -32,8 +32,8 @@ class dependencyCheck extends TestCase

$this->setUpVfsDir();

$this->dice = new Dice();
$this->dice = $this->dice->addRules(include __DIR__ . '/../../static/dependencies.config.php');
$this->dice = (new Dice())
->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');
$profiler = $this->dice->create(Profiler::class, [$configCache]);
$this->dice = (new Dice())->create(Profiler::class, [$configCache]);

$this->assertInstanceOf(Profiler::class, $profiler);
$this->assertTrue($profiler->isRendertime());


+ 3
- 3
tests/include/ApiTest.php View File

@@ -57,9 +57,9 @@ class ApiTest extends DatabaseTest
{
parent::setUp();

$this->dice = new Dice();
$this->dice = $this->dice->addRules(include __DIR__ . '/../../static/dependencies.config.php');
$this->dice = $this->dice->addRule(Database::class, ['instanceOf' => StaticDatabase::class, 'shared' => true]);
$this->dice = (new Dice())
->addRules(include __DIR__ . '/../../static/dependencies.config.php')
->addRule(Database::class, ['instanceOf' => StaticDatabase::class, 'shared' => true]);
BaseObject::setDependencyInjection($this->dice);

/** @var Database $dba */


+ 3
- 3
tests/src/Database/DBATest.php View File

@@ -15,9 +15,9 @@ class DBATest extends DatabaseTest
{
parent::setUp();

$dice = new Dice();
$dice = $dice->addRules(include __DIR__ . '/../../../static/dependencies.config.php');
$dice = $dice->addRule(Database::class, ['instanceOf' => StaticDatabase::class, 'shared' => true]);
$dice = (new Dice())
->addRules(include __DIR__ . '/../../../static/dependencies.config.php')
->addRule(Database::class, ['instanceOf' => StaticDatabase::class, 'shared' => true]);
BaseObject::setDependencyInjection($dice);

// Default config


+ 3
- 3
tests/src/Database/DBStructureTest.php View File

@@ -15,9 +15,9 @@ class DBStructureTest extends DatabaseTest
{
parent::setUp();

$dice = new Dice();
$dice = $dice->addRules(include __DIR__ . '/../../../static/dependencies.config.php');
$dice = $dice->addRule(Database::class, ['instanceOf' => StaticDatabase::class, 'shared' => true]);
$dice = (new Dice())
->addRules(include __DIR__ . '/../../../static/dependencies.config.php')
->addRule(Database::class, ['instanceOf' => StaticDatabase::class, 'shared' => true]);
BaseObject::setDependencyInjection($dice);
}



Loading…
Cancel
Save