Knah-Tsaeb
/
MyShaarli
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #1016 from virtualtam/refactor/session 

Improve SessionManager constructor and tests
This commit is contained in:
VirtualTam 2017-11-24 23:53:15 +01:00 committed by GitHub
parent 4e58d2edf7 dd883aaf09
commit d9514becc4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 25 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
application/SessionManager.php
View File

@ -12,12 +12,12 @@ class SessionManager
* Constructor
*
* @param array $session The $_SESSION array (reference)
* @param ConfigManager $conf ConfigManager instance (reference)
* @param ConfigManager $conf ConfigManager instance
*/
public function __construct(& $session, & $conf)
public function __construct(& $session, $conf)
{
$this->session = &$session;
$this->conf = &$conf;
$this->conf = $conf;
}
/**

31
tests/SessionManagerTest.php
View File

@ -1,4 +1,6 @@
<?php
require_once 'tests/utils/FakeConfigManager.php';
// Initialize reference data _before_ PHPUnit starts a session
require_once 'tests/utils/ReferenceSessionIdHashes.php';
ReferenceSessionIdHashes::genAllHashes();
@ -7,18 +9,6 @@ use \Shaarli\SessionManager;
use \PHPUnit\Framework\TestCase;
/**
* Fake ConfigManager
*/
class FakeConfigManager
{
public static function get($key)
{
return $key;
}
}
/**
* Test coverage for SessionManager
*/
@ -27,12 +17,16 @@ class SessionManagerTest extends TestCase
// Session ID hashes
protected static $sidHashes = null;
// Fake ConfigManager
protected static $conf = null;
/**
* Assign reference data
*/
public static function setUpBeforeClass()
{
self::$sidHashes = ReferenceSessionIdHashes::getHashes();
self::$conf = new FakeConfigManager();
}
/**
@ -41,8 +35,7 @@ class SessionManagerTest extends TestCase
public function testGenerateToken()
{
$session = [];
$conf = new FakeConfigManager();
$sessionManager = new SessionManager($session, $conf);
$sessionManager = new SessionManager($session, self::$conf);
$token = $sessionManager->generateToken();
@ -61,9 +54,7 @@ class SessionManagerTest extends TestCase
$token => 1,
],
];
$conf = new FakeConfigManager();
$sessionManager = new SessionManager($session, $conf);
$sessionManager = new SessionManager($session, self::$conf);
// check and destroy the token
$this->assertTrue($sessionManager->checkToken($token));
@ -79,8 +70,7 @@ class SessionManagerTest extends TestCase
public function testGenerateAndCheckToken()
{
$session = [];
$conf = new FakeConfigManager();
$sessionManager = new SessionManager($session, $conf);
$sessionManager = new SessionManager($session, self::$conf);
$token = $sessionManager->generateToken();
@ -102,8 +92,7 @@ class SessionManagerTest extends TestCase
public function testCheckInvalidToken()
{
$session = [];
$conf = new FakeConfigManager();
$sessionManager = new SessionManager($session, $conf);
$sessionManager = new SessionManager($session, self::$conf);
$this->assertFalse($sessionManager->checkToken('4dccc3a45ad9d03e5542b90c37d8db6d10f2b38b'));
}

12
tests/utils/FakeConfigManager.php Normal file
View File

@ -0,0 +1,12 @@
<?php
/**
* Fake ConfigManager
*/
class FakeConfigManager
{
public static function get($key)
{
return $key;
}
}