X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2FWebRequest.php;h=78d744415656d3c7d3677f1698563549bcd2e9fb;hb=faf7cc4a09848c538320bd2b9067b1a77c0a0183;hp=3ef3bc1e0be49b58a62748473a8b9de3a7d1b271;hpb=202f695f671bb1b6c25ebec219da348e9935692e;p=lhc%2Fweb%2Fwiklou.git diff --git a/includes/WebRequest.php b/includes/WebRequest.php index 3ef3bc1e0b..7bfb5a43e4 100644 --- a/includes/WebRequest.php +++ b/includes/WebRequest.php @@ -216,7 +216,7 @@ class WebRequest { $host = $parts[0]; if ( $wgAssumeProxiesUseDefaultProtocolPorts && isset( $_SERVER['HTTP_X_FORWARDED_PROTO'] ) ) { - // Bug 70021: Assume that upstream proxy is running on the default + // T72021: Assume that upstream proxy is running on the default // port based on the protocol. We have no reliable way to determine // the actual port in use upstream. $port = $stdPort; @@ -238,7 +238,7 @@ class WebRequest { * This is for use prior to Setup.php, when no WebRequest object is available. * At other times, use the non-static function getProtocol(). * - * @return array + * @return string */ public static function detectProtocol() { if ( ( !empty( $_SERVER['HTTPS'] ) && $_SERVER['HTTPS'] !== 'off' ) || @@ -308,7 +308,7 @@ class WebRequest { * available variant URLs. */ public function interpolateTitle() { - // bug 16019: title interpolation on API queries is useless and sometimes harmful + // T18019: title interpolation on API queries is useless and sometimes harmful if ( defined( 'MW_API' ) ) { return; } @@ -407,8 +407,8 @@ class WebRequest { * * @since 1.28 * @param string $name - * @param string|null $default Optional default - * @return string + * @param string|null $default + * @return string|null */ public function getRawVal( $name, $default = null ) { $name = strtr( $name, '.', '_' ); // See comment in self::getGPCVal() @@ -432,7 +432,7 @@ class WebRequest { * * @param string $name * @param string $default Optional default (or null) - * @return string + * @return string|null */ public function getVal( $name, $default = null ) { $val = $this->getGPCVal( $this->data, $name, $default ); @@ -482,7 +482,7 @@ class WebRequest { * * @param string $name * @param array $default Optional default (or null) - * @return array + * @return array|null */ public function getArray( $name, $default = null ) { $val = $this->getGPCVal( $this->data, $name, $default ); @@ -757,22 +757,6 @@ class WebRequest { return $this->sessionId; } - /** - * Returns true if the request has a persistent session. - * This does not necessarily mean that the user is logged in! - * - * @deprecated since 1.27, use - * \MediaWiki\Session\SessionManager::singleton()->getPersistedSessionId() - * instead. - * @return bool - */ - public function checkSessionCookie() { - global $wgInitialSessionId; - wfDeprecated( __METHOD__, '1.27' ); - return $wgInitialSessionId !== null && - $this->getSession()->getId() === (string)$wgInitialSessionId; - } - /** * Get a cookie from the $_COOKIE jar * @@ -972,7 +956,7 @@ class WebRequest { public function response() { /* Lazy initialization of response object for this request */ if ( !is_object( $this->response ) ) { - $class = ( $this instanceof FauxRequest ) ? 'FauxResponse' : 'WebResponse'; + $class = ( $this instanceof FauxRequest ) ? FauxResponse::class : WebResponse::class; $this->response = new $class(); } return $this->response; @@ -1099,6 +1083,7 @@ class WebRequest { header( 'Content-Type: text/html' ); $encUrl = htmlspecialchars( $url ); echo << Security redirect @@ -1244,7 +1229,7 @@ HTML; if ( IP::isPublic( $ipchain[$i + 1] ) || $wgUsePrivateIPs || - $proxyLookup->isConfiguredProxy( $curIP ) // bug 48919; treat IP as sane + $proxyLookup->isConfiguredProxy( $curIP ) // T50919; treat IP as sane ) { // Follow the next IP according to the proxy $nextIP = IP::canonicalize( $ipchain[$i + 1] );