tyler.durden
/
icingaweb2
mirror of https://github.com/Icinga/icingaweb2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Move session class files

This commit is contained in:
Johannes Meyer 2014-03-25 11:12:55 +01:00
parent 9ab53558f0
commit f802b36ca9
8 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
library/Icinga/Application/Web.php
View File

@ -50,7 +50,7 @@ use Icinga\Web\Request;
use Icinga\Web\View; use Icinga\Web\View;
use Icinga\Util\DateTimeFactory; use Icinga\Util\DateTimeFactory;
use Icinga\Session\Session as BaseSession; use Icinga\Web\Session\Session as BaseSession;
use Icinga\Web\Session; use Icinga\Web\Session;
use Icinga\Util\Translator; use Icinga\Util\Translator;

4
library/Icinga/Web/Session.php
View File

@ -29,8 +29,8 @@
namespace Icinga\Web; namespace Icinga\Web;
use Icinga\Session\PhpSession; use Icinga\Web\Session\PhpSession;
use Icinga\Session\Session as BaseSession; use Icinga\Web\Session\Session as BaseSession;
use Icinga\Exception\ProgrammingError; use Icinga\Exception\ProgrammingError;
/** /**

2
library/Icinga/Session/PhpSession.php → library/Icinga/Web/Session/PhpSession.php
View File

@ -27,7 +27,7 @@
*/ */
// {{{ICINGA_LICENSE_HEADER}}} // {{{ICINGA_LICENSE_HEADER}}}
namespace Icinga\Session; namespace Icinga\Web\Session;
use Icinga\Logger\Logger; use Icinga\Logger\Logger;
use \Icinga\Exception\ConfigurationError; use \Icinga\Exception\ConfigurationError;

3
library/Icinga/Session/Session.php → library/Icinga/Web/Session/Session.php
View File

@ -27,8 +27,7 @@
*/ */
// {{{ICINGA_LICENSE_HEADER}}} // {{{ICINGA_LICENSE_HEADER}}}
namespace Icinga\Session; namespace Icinga\Web\Session;
/** /**
* Base class for handling sessions * Base class for handling sessions

2
library/Icinga/Session/SessionNamespace.php → library/Icinga/Web/Session/SessionNamespace.php
View File

@ -27,7 +27,7 @@
*/ */
// {{{ICINGA_LICENSE_HEADER}}} // {{{ICINGA_LICENSE_HEADER}}}
namespace Icinga\Session; namespace Icinga\Web\Session;
use \Exception; use \Exception;
use \ArrayIterator; use \ArrayIterator;

6
test/php/library/Icinga/Authentication/SessionMock.php
View File

@ -32,7 +32,7 @@ namespace Tests\Icinga\Authentication;
require_once("../../library/Icinga/Session/SessionNamespace.php"); require_once("../../library/Icinga/Session/SessionNamespace.php");
require_once("../../library/Icinga/Session/Session.php"); require_once("../../library/Icinga/Session/Session.php");
use Icinga\Session\Session; use Icinga\Web\Session\Session;
class SessionMock extends Session class SessionMock extends Session
{ {
@ -72,4 +72,8 @@ class SessionMock extends Session
public function purge() public function purge()
{ {
} }
public function refreshId()
{
}
} }

9
test/php/library/Icinga/Session/PhpSessionTest.php
View File

@ -36,14 +36,15 @@ require_once realpath(__DIR__ . '/../../../../../library/Icinga/Test/BaseTestCas
use Icinga\Test\BaseTestCase; use Icinga\Test\BaseTestCase;
// @codingStandardsIgnoreStart // @codingStandardsIgnoreStart
require_once BaseTestCase::$libDir . '/Session/Session.php'; require_once BaseTestCase::$libDir . '/Web/Session/SessionNamespace.php';
require_once BaseTestCase::$libDir . '/Session/PhpSession.php'; require_once BaseTestCase::$libDir . '/Web/Session/Session.php';
require_once BaseTestCase::$libDir . '/Application/Logger.php'; require_once BaseTestCase::$libDir . '/Web/Session/PhpSession.php';
require_once BaseTestCase::$libDir . '/Logger/Logger.php';
require_once BaseTestCase::$libDir . '/Exception/ConfigurationError.php'; require_once BaseTestCase::$libDir . '/Exception/ConfigurationError.php';
require_once 'Zend/Log.php'; require_once 'Zend/Log.php';
// @codingStandardsIgnoreEnd // @codingStandardsIgnoreEnd
use Icinga\Session\PhpSession; use Icinga\Web\Session\PhpSession;
class PhpSessionTest extends BaseTestCase class PhpSessionTest extends BaseTestCase
{ {

4
test/php/library/Icinga/Session/SessionNamespaceTest.php
View File

@ -34,11 +34,11 @@ require_once realpath(__DIR__ . '/../../../../../library/Icinga/Test/BaseTestCas
use Icinga\Test\BaseTestCase; use Icinga\Test\BaseTestCase;
// @codingStandardsIgnoreStart // @codingStandardsIgnoreStart
require_once BaseTestCase::$libDir . '/Session/SessionNamespace.php'; require_once BaseTestCase::$libDir . '/Web/Session/SessionNamespace.php';
// @codingStandardsIgnoreEnd // @codingStandardsIgnoreEnd
use \Exception; use \Exception;
use Icinga\Session\SessionNamespace; use Icinga\Web\Session\SessionNamespace;
class SessionNamespaceTest extends BaseTestCase class SessionNamespaceTest extends BaseTestCase