X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2FWebRequest.php;h=f3edebc6b689dde175ec088c553701988f5bb04f;hb=87ec822c343ca246bcea7369f271092991395702;hp=c6ddf81697234fc29f50466737efeecb859fdc21;hpb=c9d8188f1ee27e8a816949bf6b74e340156aafc7;p=lhc%2Fweb%2Fwiklou.git diff --git a/includes/WebRequest.php b/includes/WebRequest.php index c6ddf81697..f3edebc6b6 100644 --- a/includes/WebRequest.php +++ b/includes/WebRequest.php @@ -28,6 +28,9 @@ use MediaWiki\Session\Session; use MediaWiki\Session\SessionId; use MediaWiki\Session\SessionManager; +// The point of this class is to be a wrapper around super globals +// phpcs:disable MediaWiki.Usage.SuperGlobalsUsage.SuperGlobals + /** * The WebRequest class encapsulates getting at data passed in the * URL or via a POSTed form stripping illegal input characters and @@ -126,7 +129,7 @@ class WebRequest { $a = parse_url( $url ); Wikimedia\restoreWarnings(); if ( $a ) { - $path = isset( $a['path'] ) ? $a['path'] : ''; + $path = $a['path'] ?? ''; global $wgScript; if ( $path == $wgScript && $want !== 'all' ) { @@ -272,8 +275,7 @@ class WebRequest { // This method is called from various error handlers and should be kept simple. if ( !self::$reqId ) { - self::$reqId = isset( $_SERVER['UNIQUE_ID'] ) - ? $_SERVER['UNIQUE_ID'] : wfRandomString( 24 ); + self::$reqId = $_SERVER['UNIQUE_ID'] ?? wfRandomString( 24 ); } return self::$reqId; @@ -455,7 +457,7 @@ class WebRequest { * @return mixed Old value if one was present, null otherwise */ public function setVal( $key, $value ) { - $ret = isset( $this->data[$key] ) ? $this->data[$key] : null; + $ret = $this->data[$key] ?? null; $this->data[$key] = $value; return $ret; } @@ -482,7 +484,7 @@ class WebRequest { * If no source and no default, returns null. * * @param string $name - * @param array $default Optional default (or null) + * @param array|null $default Optional default (or null) * @return array|null */ public function getArray( $name, $default = null ) { @@ -501,7 +503,7 @@ class WebRequest { * If an array is returned, contents are guaranteed to be integers. * * @param string $name - * @param array $default Option default (or null) + * @param array|null $default Option default (or null) * @return array Array of ints */ public function getIntArray( $name, $default = null ) { @@ -654,6 +656,18 @@ class WebRequest { return $_GET; } + /** + * Get the values passed via POST. + * No transformation is performed on the values. + * + * @since 1.32 + * @codeCoverageIgnore + * @return array + */ + public function getPostValues() { + return $_POST; + } + /** * Return the contents of the Query with no decoding. Use when you need to * know exactly what was sent, e.g. for an OAuth signature over the elements. @@ -699,7 +713,7 @@ class WebRequest { * @return string */ public function getMethod() { - return isset( $_SERVER['REQUEST_METHOD'] ) ? $_SERVER['REQUEST_METHOD'] : 'GET'; + return $_SERVER['REQUEST_METHOD'] ?? 'GET'; } /** @@ -762,8 +776,8 @@ class WebRequest { * Get a cookie from the $_COOKIE jar * * @param string $key The name of the cookie - * @param string $prefix A prefix to use for the cookie name, if not $wgCookiePrefix - * @param mixed $default What to return if the value isn't found + * @param string|null $prefix A prefix to use for the cookie name, if not $wgCookiePrefix + * @param mixed|null $default What to return if the value isn't found * @return mixed Cookie value or $default if the cookie not set */ public function getCookie( $key, $prefix = null, $default = null ) {