bitPickups/friendica_2019-12_sharedHosting_hotFix
1
1
Fork 0
Code Pull requests Activity

Renaming class

Browse source
This commit is contained in:
Philipp Holzer 2019-12-10 08:49:33 +01:00
parent 26bd956912
commit ce2610000b
No known key found for this signature in database
GPG key ID: D8365C3D36B77D90
5 changed files with 16 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/Core/Session/CacheSession.php → src/Core/Session/Cache.php
View file

@ -14,7 +14,7 @@ use SessionHandlerInterface;
*
* @author Hypolite Petovan <hypolite@mrpetovan.com>
*/
final class CacheSession extends NativeSession implements SessionHandlerInterface
final class Cache extends Native implements SessionHandlerInterface
{
/** @var ICache */
private $cache;

2
src/Core/Session/DatabaseSession.php → src/Core/Session/Database.php
View file

@ -14,7 +14,7 @@ use SessionHandlerInterface;
*
* @author Hypolite Petovan <hypolite@mrpetovan.com>
*/
final class DatabaseSession extends NativeSession implements SessionHandlerInterface
final class Database extends Native implements SessionHandlerInterface
{
/** @var Database */
private $dba;

5
src/Core/Session/MemorySession.php → src/Core/Session/Memory.php
View file

@ -5,12 +5,15 @@ namespace Friendica\Core\Session;
/**
* Usable for backend processes (daemon/worker) and testing
*/
final class MemorySession implements ISession
final class Memory implements ISession
{
private $data = [];
public function start()
{
// Backward compatibility until all Session variables are replaced
// with the Session class
$_SESSION = [];
$this->clear();
return $this;
}

2
src/Core/Session/NativeSession.php → src/Core/Session/Native.php
View file

@ -9,7 +9,7 @@ use Friendica\Model\User\Cookie;
/**
* The native Session class which uses the PHP internal Session function
*/
class NativeSession implements ISession
class Native implements ISession
{
/** @var Cookie */
protected $cookie;

18
src/Factory/SessionFactory.php
View file

@ -6,12 +6,12 @@ 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\Cache;
use Friendica\Core\Session\Database;
use Friendica\Core\Session\ISession;
use Friendica\Core\Session\Memory;
use Friendica\Core\Session\MemorySession;
use Friendica\Core\Session\NativeSession;
use Friendica\Core\Session\Memory;
use Friendica\Core\Session\Native;
use Friendica\Core\System;
use Friendica\Database\Database;
use Friendica\Model\User\Cookie;
@ -52,24 +52,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;
}