dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix return type of CeeFormatter::format
[lhc/web/wiklou.git]
/
includes
/
DerivativeRequest.php
diff --git
a/includes/DerivativeRequest.php
b/includes/DerivativeRequest.php
index
dda1358
..
e2d59b0
100644
(file)
--- a/
includes/DerivativeRequest.php
+++ b/
includes/DerivativeRequest.php
@@
-33,6
+33,7
@@
*/
class DerivativeRequest extends FauxRequest {
private $base;
*/
class DerivativeRequest extends FauxRequest {
private $base;
+ private $ip;
/**
* @param WebRequest $base
/**
* @param WebRequest $base
@@
-49,10
+50,6
@@
class DerivativeRequest extends FauxRequest {
return $this->base->getCookie( $key, $prefix, $default );
}
return $this->base->getCookie( $key, $prefix, $default );
}
- public function checkSessionCookie() {
- return $this->base->checkSessionCookie();
- }
-
public function getHeader( $name, $flags = 0 ) {
return $this->base->getHeader( $name, $flags );
}
public function getHeader( $name, $flags = 0 ) {
return $this->base->getHeader( $name, $flags );
}
@@
-61,6
+58,10
@@
class DerivativeRequest extends FauxRequest {
return $this->base->getAllHeaders();
}
return $this->base->getAllHeaders();
}
+ public function getSession() {
+ return $this->base->getSession();
+ }
+
public function getSessionData( $key ) {
return $this->base->getSessionData( $key );
}
public function getSessionData( $key ) {
return $this->base->getSessionData( $key );
}
@@
-74,7
+75,11
@@
class DerivativeRequest extends FauxRequest {
}
public function getIP() {
}
public function getIP() {
- return $this->base->getIP();
+ return $this->ip ?: $this->base->getIP();
+ }
+
+ public function setIP( $ip ) {
+ $this->ip = $ip;
}
public function getProtocol() {
}
public function getProtocol() {