X-Git-Url: http://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2FWebResponse.php;h=45cc7df7a60fb596c802850fd6852b61801bdcdc;hb=326d52f9613c5227d75f97361be6ec6ef78b214e;hp=0e5999ddfbe5a445ffe612814a12e7cc35ffe188;hpb=9c185ca85c3c58f96e866c9347c2b7f031ddb289;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/WebResponse.php b/includes/WebResponse.php
index 0e5999ddfb..45cc7df7a6 100644
--- a/includes/WebResponse.php
+++ b/includes/WebResponse.php
@@ -151,21 +151,19 @@ class WebResponse {
 			$expire = time() + $wgCookieExpiration;
 		}
 
-		$cookie = $options['prefix'] . $name;
-		$data = [
-			'name' => (string)$cookie,
-			'value' => (string)$value,
-			'expire' => (int)$expire,
-			'path' => (string)$options['path'],
-			'domain' => (string)$options['domain'],
-			'secure' => (bool)$options['secure'],
-			'httpOnly' => (bool)$options['httpOnly'],
-		];
-
 		if ( self::$disableForPostSend ) {
+			$cookie = $options['prefix'] . $name;
 			wfDebugLog( 'cookie', 'ignored post-send cookie {cookie}', 'all', [
 				'cookie' => $cookie,
-				'data' => $data,
+				'data' => [
+					'name' => (string)$cookie,
+					'value' => (string)$value,
+					'expire' => (int)$expire,
+					'path' => (string)$options['path'],
+					'domain' => (string)$options['domain'],
+					'secure' => (bool)$options['secure'],
+					'httpOnly' => (bool)$options['httpOnly'],
+				],
 				'exception' => new RuntimeException( 'Ignored post-send cookie' ),
 			] );
 			return;
@@ -174,6 +172,19 @@ class WebResponse {
 		$func = $options['raw'] ? 'setrawcookie' : 'setcookie';
 
 		if ( Hooks::run( 'WebResponseSetCookie', [ &$name, &$value, &$expire, &$options ] ) ) {
+			// Note: Don't try to move this earlier to reuse it for self::$disableForPostSend,
+			// we need to use the altered values from the hook here. (T198525)
+			$cookie = $options['prefix'] . $name;
+			$data = [
+				'name' => (string)$cookie,
+				'value' => (string)$value,
+				'expire' => (int)$expire,
+				'path' => (string)$options['path'],
+				'domain' => (string)$options['domain'],
+				'secure' => (bool)$options['secure'],
+				'httpOnly' => (bool)$options['httpOnly'],
+			];
+
 			// Per RFC 6265, key is name + domain + path
 			$key = "{$data['name']}\n{$data['domain']}\n{$data['path']}";
 
@@ -194,7 +205,7 @@ class WebResponse {
 				wfDebugLog( 'cookie', 'already set ' . $func . ': "' . implode( '", "', $data ) . '"' );
 			} else {
 				wfDebugLog( 'cookie', $func . ': "' . implode( '", "', $data ) . '"' );
-				if ( call_user_func_array( $func, array_values( $data ) ) ) {
+				if ( $func( ...array_values( $data ) ) ) {
 					self::$setCookies[$key] = $deleting ? null : [ $func, $data ];
 				}
 			}
@@ -224,132 +235,3 @@ class WebResponse {
 		return (bool)self::$setCookies;
 	}
 }
-
-/**
- * @ingroup HTTP
- */
-class FauxResponse extends WebResponse {
-	private $headers;
-	private $cookies = [];
-	private $code;
-
-	/**
-	 * Stores a HTTP header
-	 * @param string $string Header to output
-	 * @param bool $replace Replace current similar header
-	 * @param null|int $http_response_code Forces the HTTP response code to the specified value.
-	 */
-	public function header( $string, $replace = true, $http_response_code = null ) {
-		if ( substr( $string, 0, 5 ) == 'HTTP/' ) {
-			$parts = explode( ' ', $string, 3 );
-			$this->code = intval( $parts[1] );
-		} else {
-			list( $key, $val ) = array_map( 'trim', explode( ":", $string, 2 ) );
-
-			$key = strtoupper( $key );
-
-			if ( $replace || !isset( $this->headers[$key] ) ) {
-				$this->headers[$key] = $val;
-			}
-		}
-
-		if ( $http_response_code !== null ) {
-			$this->code = intval( $http_response_code );
-		}
-	}
-
-	/**
-	 * @since 1.26
-	 * @param int $code Status code
-	 */
-	public function statusHeader( $code ) {
-		$this->code = intval( $code );
-	}
-
-	public function headersSent() {
-		return false;
-	}
-
-	/**
-	 * @param string $key The name of the header to get (case insensitive).
-	 * @return string|null The header value (if set); null otherwise.
-	 */
-	public function getHeader( $key ) {
-		$key = strtoupper( $key );
-
-		return $this->headers[$key] ?? null;
-	}
-
-	/**
-	 * Get the HTTP response code, null if not set
-	 *
-	 * @return int|null
-	 */
-	public function getStatusCode() {
-		return $this->code;
-	}
-
-	/**
-	 * @param string $name The name of the cookie.
-	 * @param string $value The value to be stored in the cookie.
-	 * @param int|null $expire Ignored in this faux subclass.
-	 * @param array $options Ignored in this faux subclass.
-	 */
-	public function setCookie( $name, $value, $expire = 0, $options = [] ) {
-		global $wgCookiePath, $wgCookiePrefix, $wgCookieDomain;
-		global $wgCookieSecure, $wgCookieExpiration, $wgCookieHttpOnly;
-
-		$options = array_filter( $options, function ( $a ) {
-			return $a !== null;
-		} ) + [
-			'prefix' => $wgCookiePrefix,
-			'domain' => $wgCookieDomain,
-			'path' => $wgCookiePath,
-			'secure' => $wgCookieSecure,
-			'httpOnly' => $wgCookieHttpOnly,
-			'raw' => false,
-		];
-
-		if ( $expire === null ) {
-			$expire = 0; // Session cookie
-		} elseif ( $expire == 0 && $wgCookieExpiration != 0 ) {
-			$expire = time() + $wgCookieExpiration;
-		}
-
-		$this->cookies[$options['prefix'] . $name] = [
-			'value' => (string)$value,
-			'expire' => (int)$expire,
-			'path' => (string)$options['path'],
-			'domain' => (string)$options['domain'],
-			'secure' => (bool)$options['secure'],
-			'httpOnly' => (bool)$options['httpOnly'],
-			'raw' => (bool)$options['raw'],
-		];
-	}
-
-	/**
-	 * @param string $name
-	 * @return string|null
-	 */
-	public function getCookie( $name ) {
-		if ( isset( $this->cookies[$name] ) ) {
-			return $this->cookies[$name]['value'];
-		}
-		return null;
-	}
-
-	/**
-	 * @param string $name
-	 * @return array|null
-	 */
-	public function getCookieData( $name ) {
-		return $this->cookies[$name] ?? null;
-	}
-
-	/**
-	 * @return array
-	 */
-	public function getCookies() {
-		return $this->cookies;
-	}
-}