Merge pull request #16913 from nextcloud/fix/declare_members
SessionMiddleware: declare session property
This commit is contained in:
commit
130fdf5006
|
@ -284,7 +284,6 @@ class DIContainer extends SimpleContainer implements IAppContainer {
|
||||||
|
|
||||||
$dispatcher->registerMiddleware(
|
$dispatcher->registerMiddleware(
|
||||||
new SessionMiddleware(
|
new SessionMiddleware(
|
||||||
$c->query(IRequest::class),
|
|
||||||
$c->query(IControllerMethodReflector::class),
|
$c->query(IControllerMethodReflector::class),
|
||||||
$c->query(ISession::class)
|
$c->query(ISession::class)
|
||||||
)
|
)
|
||||||
|
|
|
@ -34,25 +34,14 @@ use OCP\ISession;
|
||||||
|
|
||||||
class SessionMiddleware extends Middleware {
|
class SessionMiddleware extends Middleware {
|
||||||
|
|
||||||
/**
|
/** @var ControllerMethodReflector */
|
||||||
* @var IRequest
|
|
||||||
*/
|
|
||||||
private $request;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @var ControllerMethodReflector
|
|
||||||
*/
|
|
||||||
private $reflector;
|
private $reflector;
|
||||||
|
|
||||||
/**
|
/** @var ISession */
|
||||||
* @param IRequest $request
|
private $session;
|
||||||
* @param ControllerMethodReflector $reflector
|
|
||||||
*/
|
public function __construct(ControllerMethodReflector $reflector,
|
||||||
public function __construct(IRequest $request,
|
ISession $session) {
|
||||||
ControllerMethodReflector $reflector,
|
|
||||||
ISession $session
|
|
||||||
) {
|
|
||||||
$this->request = $request;
|
|
||||||
$this->reflector = $reflector;
|
$this->reflector = $reflector;
|
||||||
$this->session = $session;
|
$this->session = $session;
|
||||||
}
|
}
|
||||||
|
|
|
@ -25,20 +25,12 @@ class SessionMiddlewareTest extends \Test\TestCase {
|
||||||
/** @var ControllerMethodReflector */
|
/** @var ControllerMethodReflector */
|
||||||
private $reflector;
|
private $reflector;
|
||||||
|
|
||||||
/** @var Request */
|
|
||||||
private $request;
|
|
||||||
|
|
||||||
/** @var Controller */
|
/** @var Controller */
|
||||||
private $controller;
|
private $controller;
|
||||||
|
|
||||||
protected function setUp() {
|
protected function setUp() {
|
||||||
parent::setUp();
|
parent::setUp();
|
||||||
|
|
||||||
$this->request = new Request(
|
|
||||||
[],
|
|
||||||
$this->getMockBuilder('\OCP\Security\ISecureRandom')->getMock(),
|
|
||||||
$this->getMockBuilder(IConfig::class)->getMock()
|
|
||||||
);
|
|
||||||
$this->reflector = new ControllerMethodReflector();
|
$this->reflector = new ControllerMethodReflector();
|
||||||
$this->controller = $this->createMock(Controller::class);
|
$this->controller = $this->createMock(Controller::class);
|
||||||
}
|
}
|
||||||
|
@ -50,7 +42,7 @@ class SessionMiddlewareTest extends \Test\TestCase {
|
||||||
$session = $this->getSessionMock(0);
|
$session = $this->getSessionMock(0);
|
||||||
|
|
||||||
$this->reflector->reflect($this, __FUNCTION__);
|
$this->reflector->reflect($this, __FUNCTION__);
|
||||||
$middleware = new SessionMiddleware($this->request, $this->reflector, $session);
|
$middleware = new SessionMiddleware($this->reflector, $session);
|
||||||
$middleware->beforeController($this->controller, __FUNCTION__);
|
$middleware->beforeController($this->controller, __FUNCTION__);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -61,7 +53,7 @@ class SessionMiddlewareTest extends \Test\TestCase {
|
||||||
$session = $this->getSessionMock(1);
|
$session = $this->getSessionMock(1);
|
||||||
|
|
||||||
$this->reflector->reflect($this, __FUNCTION__);
|
$this->reflector->reflect($this, __FUNCTION__);
|
||||||
$middleware = new SessionMiddleware($this->request, $this->reflector, $session);
|
$middleware = new SessionMiddleware($this->reflector, $session);
|
||||||
$middleware->afterController($this->controller, __FUNCTION__, new Response());
|
$middleware->afterController($this->controller, __FUNCTION__, new Response());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -69,7 +61,7 @@ class SessionMiddlewareTest extends \Test\TestCase {
|
||||||
$session = $this->getSessionMock(1);
|
$session = $this->getSessionMock(1);
|
||||||
|
|
||||||
$this->reflector->reflect($this, __FUNCTION__);
|
$this->reflector->reflect($this, __FUNCTION__);
|
||||||
$middleware = new SessionMiddleware($this->request, $this->reflector, $session);
|
$middleware = new SessionMiddleware($this->reflector, $session);
|
||||||
$middleware->beforeController($this->controller, __FUNCTION__);
|
$middleware->beforeController($this->controller, __FUNCTION__);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -77,7 +69,7 @@ class SessionMiddlewareTest extends \Test\TestCase {
|
||||||
$session = $this->getSessionMock(0);
|
$session = $this->getSessionMock(0);
|
||||||
|
|
||||||
$this->reflector->reflect($this, __FUNCTION__);
|
$this->reflector->reflect($this, __FUNCTION__);
|
||||||
$middleware = new SessionMiddleware($this->request, $this->reflector, $session);
|
$middleware = new SessionMiddleware($this->reflector, $session);
|
||||||
$middleware->afterController($this->controller, __FUNCTION__, new Response());
|
$middleware->afterController($this->controller, __FUNCTION__, new Response());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue