X-Git-Url: http://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2FWebResponse.php;h=45cc7df7a60fb596c802850fd6852b61801bdcdc;hb=748c5eae2fd5d897c94c48771161c259941a7488;hp=3a4faf0faa1f6846521198c03bfa57a8f982a0aa;hpb=55ffac2024448afd1c73c56fdd369c0f67409afb;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/WebResponse.php b/includes/WebResponse.php
index 3a4faf0faa..45cc7df7a6 100644
--- a/includes/WebResponse.php
+++ b/includes/WebResponse.php
@@ -205,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 ];
 				}
 			}
@@ -235,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;
-	}
-}