wrapping up 2019.12

[friendica.git] / index.php

diff --git a/index.php b/index.php
index 216fbe90add90fedf84f5b7b3af9883f737b7291..5407532d494fdec91eefcf52b00c966ba8c26056 100644 (file)
--- a/index.php
+++ b/index.php
@@ -4,10 +4,7 @@
  * Friendica
  */
 
-use Friendica\App;
-use Friendica\Core\Config;
-use Friendica\Factory;
-use Friendica\Util\BasePath;
+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.');
@@ -15,14 +12,15 @@ if (!file_exists(__DIR__ . '/vendor/autoload.php')) {
 
 require __DIR__ . '/vendor/autoload.php';
 
-$basedir = BasePath::create(__DIR__, $_SERVER);
-$configLoader = new Config\ConfigCacheLoader($basedir);
-$config = Factory\ConfigFactory::createCache($configLoader);
-$logger = Factory\LoggerFactory::create('index', $config);
-$profiler = Factory\ProfilerFactory::create($logger, $config);
+$dice = (new Dice())->addRules(include __DIR__ . '/static/dependencies.config.php');
+$dice = $dice->addRule(Friendica\App\Mode::class, ['call' => [['determineRunMode', [false, $_SERVER], Dice::CHAIN_CALL]]]);
 
-// We assume that the index.php is called by a frontend process
-// The value is set to "true" by default in App
-$a = new App($config, $logger, $profiler, false);
+\Friendica\BaseObject::setDependencyInjection($dice);
 
-$a->runFrontend();
+$a = \Friendica\BaseObject::getApp();
+
+$a->runFrontend(
+       $dice->create(\Friendica\App\Module::class),
+       $dice->create(\Friendica\App\Router::class),
+       $dice->create(\Friendica\Core\Config\PConfiguration::class)
+);