Merge pull request #8179 from MrPetovan/bug/notices

[friendica.git] / src / Factory / SessionFactory.php

diff --git a/src/Factory/SessionFactory.php b/src/Factory/SessionFactory.php
index 017eab0adb1fbca1e8130c41ba6bd02e0535ebe9..d4ad1e7ca11bb7e734bd72e6403bc471ccfde252 100644 (file)
--- a/src/Factory/SessionFactory.php
+++ b/src/Factory/SessionFactory.php
@@ -3,13 +3,12 @@
 namespace Friendica\Factory;
 
 use Friendica\App;
-use Friendica\Core\Cache\Cache;
 use Friendica\Core\Cache\ICache;
-use Friendica\Core\Config\Configuration;
+use Friendica\Core\Cache\Type;
+use Friendica\Core\Config\IConfig;
 use Friendica\Core\Session;
 use Friendica\Core\System;
 use Friendica\Database\Database;
-use Friendica\Model\User\Cookie;
 use Friendica\Util\Profiler;
 use Psr\Log\LoggerInterface;
 
@@ -30,8 +29,7 @@ class SessionFactory
        /**
         * @param App\Mode        $mode
         * @param App\BaseURL     $baseURL
-        * @param Configuration   $config
-        * @param Cookie          $cookie
+        * @param IConfig         $config
         * @param Database        $dba
         * @param ICache          $cache
         * @param LoggerInterface $logger
@@ -39,14 +37,14 @@ class SessionFactory
         *
         * @return Session\ISession
         */
-       public function createSession(App\Mode $mode, App\BaseURL $baseURL, Configuration $config, Cookie $cookie, Database $dba, ICache $cache, LoggerInterface $logger, Profiler $profiler, array $server = [])
+       public function createSession(App\Mode $mode, App\BaseURL $baseURL, IConfig $config, Database $dba, ICache $cache, LoggerInterface $logger, Profiler $profiler, array $server = [])
        {
                $stamp1  = microtime(true);
                $session = null;
 
                try {
                        if ($mode->isInstall() || $mode->isBackend()) {
-                               $session = new Session\Memory($cookie);
+                               $session = new Session\Memory();
                        } else {
                                $session_handler = $config->get('system', 'session_handler', self::HANDLER_DEFAULT);
                                $handler = null;
@@ -57,7 +55,7 @@ class SessionFactory
                                                break;
                                        case self::HANDLER_CACHE:
                                                // In case we're using the db as cache driver, use the native db session, not the cache
-                                               if ($config->get('system', 'cache_driver') === Cache::TYPE_DATABASE) {
+                                               if ($config->get('system', 'cache_driver') === Type::DATABASE) {
                                                        $handler = new Session\Handler\Database($dba, $logger, $server);
                                                } else {
                                                        $handler = new Session\Handler\Cache($cache, $logger, $server);
@@ -65,7 +63,7 @@ class SessionFactory
                                                break;
                                }
 
-                               $session = new Session\Native($baseURL, $cookie, $handler);
+                               $session = new Session\Native($baseURL, $handler);
                        }
                } finally {
                        $profiler->saveTimestamp($stamp1, 'parser', System::callstack());