double use

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

diff --git a/src/Factory/SessionFactory.php b/src/Factory/SessionFactory.php
index ed2f787b4273aafc79f0db0ee2d2315b5998bc8e..f2bfd10d4ede64be3ba66ff1e77ab83b2bddfb84 100644 (file)
--- a/src/Factory/SessionFactory.php
+++ b/src/Factory/SessionFactory.php
@@ -6,18 +6,18 @@ use Friendica\App;
 use Friendica\Core\Cache\Cache;
 use Friendica\Core\Cache\ICache;
 use Friendica\Core\Config\Configuration;
-use Friendica\Core\Session\CacheSession;
-use Friendica\Core\Session\DatabaseSession;
 use Friendica\Core\Session\ISession;
 use Friendica\Core\Session\Memory;
-use Friendica\Core\Session\MemorySession;
-use Friendica\Core\Session\NativeSession;
+use Friendica\Core\Session\Native;
 use Friendica\Core\System;
 use Friendica\Database\Database;
 use Friendica\Model\User\Cookie;
 use Friendica\Util\Profiler;
 use Psr\Log\LoggerInterface;
 
+/**
+ * Factory for creating a valid Session for this run
+ */
 class SessionFactory
 {
        /** @var string The plain, PHP internal session management */
@@ -49,24 +49,24 @@ class SessionFactory
 
                try {
                        if ($mode->isInstall() || $mode->isBackend()) {
-                               $session = new MemorySession();
+                               $session = new Memory();
                        } else {
                                $session_handler = $config->get('system', 'session_handler', self::DEFAULT);
 
                                switch ($session_handler) {
                                        case self::INTERNAL:
-                                               $session = new NativeSession($config, $cookie);
+                                               $session = new Native($config, $cookie);
                                                break;
                                        case self::DATABASE:
                                        default:
-                                               $session = new DatabaseSession($config, $cookie, $dba, $logger, $server);
+                                               $session = new Database($config, $cookie, $dba, $logger, $server);
                                                break;
                                        case self::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) {
-                                                       $session = new DatabaseSession($config, $cookie, $dba, $logger, $server);
+                                                       $session = new Database($config, $cookie, $dba, $logger, $server);
                                                } else {
-                                                       $session = new CacheSession($config, $cookie, $cache, $logger, $server);
+                                                       $session = new Cache($config, $cookie, $cache, $logger, $server);
                                                }
                                                break;
                                }