Merge pull request #12050 from nupplaphil/bug/notf_session_fix

[friendica.git] / static / dependencies.config.php

diff --git a/static/dependencies.config.php b/static/dependencies.config.php
index c11d51cbaa19916d95fd02ca5c5fd8f19161dca5..f7f98bb6763e5088688f4789ad6c5c600c51ee9f 100644 (file)
--- a/static/dependencies.config.php
+++ b/static/dependencies.config.php
@@ -41,8 +41,11 @@ use Friendica\Core\PConfig;
 use Friendica\Core\L10n;
 use Friendica\Core\Lock;
 use Friendica\Core\Session\Capability\IHandleSessions;
+use Friendica\Core\Session\Capability\IHandleUserSessions;
 use Friendica\Core\Storage\Repository\StorageManager;
 use Friendica\Database\Database;
+use Friendica\Database\Definition\DbaDefinition;
+use Friendica\Database\Definition\ViewDefinition;
 use Friendica\Factory;
 use Friendica\Core\Storage\Capability\ICanWriteToStorage;
 use Friendica\Model\User\Cookie;
@@ -106,6 +109,22 @@ return [
                        ['create', [], Dice::CHAIN_CALL],
                ]
        ],
+       DbaDefinition::class => [
+               'constructParams' => [
+                       [Dice::INSTANCE => '$basepath'],
+               ],
+               'call' => [
+                       ['load', [false], Dice::CHAIN_CALL],
+               ],
+       ],
+       ViewDefinition::class => [
+               'constructParams' => [
+                       [Dice::INSTANCE => '$basepath'],
+               ],
+               'call' => [
+                       ['load', [false], Dice::CHAIN_CALL],
+               ],
+       ],
        Database::class                         => [
                'constructParams' => [
                        [Dice::INSTANCE => \Psr\Log\NullLogger::class],
@@ -206,9 +225,12 @@ return [
                        ['start', [], Dice::CHAIN_CALL],
                ],
        ],
+       IHandleUserSessions::class => [
+               'instanceOf' => \Friendica\Core\Session\Model\UserSession::class,
+       ],
        Cookie::class => [
                'constructParams' => [
-                       $_SERVER, $_COOKIE
+                       $_COOKIE
                ],
        ],
        ICanWriteToStorage::class => [
@@ -238,4 +260,9 @@ return [
                        $_SERVER
                ],
        ],
+       App\Request::class => [
+               'constructParams' => [
+                       $_SERVER
+               ],
+       ]
 ];