X-Git-Url: https://git.cyclocoop.org/%27.WWW_URL.%27admin/?a=blobdiff_plain;f=includes%2FGlobalFunctions.php;h=38daab5c327b2db7883760d66c4e4617dc0f1f41;hb=e9c6bf46518a09b8fef1f3d0035a9e2e9489a119;hp=4ae92371167a3c734f21169cea91f0b5956a4add;hpb=4e4f202e33a7b692ff98245b7369b8c0797bf454;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/GlobalFunctions.php b/includes/GlobalFunctions.php
index 4ae9237116..38daab5c32 100644
--- a/includes/GlobalFunctions.php
+++ b/includes/GlobalFunctions.php
@@ -2116,6 +2116,7 @@ function wfEscapeShellArg( ...$args ) {
  *     including errors from limit.sh
  *   - profileMethod: By default this function will profile based on the calling
  *     method. Set this to a string for an alternative method to profile from
+ * @phan-param array{duplicateStderr?:bool,profileMethod?:string} $options
  *
  * @return string Collected stdout as a string
  * @deprecated since 1.30 use class MediaWiki\Shell\Shell
@@ -2190,6 +2191,7 @@ function wfShellExecWithStderr( $cmd, &$retval = null, $environ = [], $limits =
  * @param array $options Associative array of options:
  *     'php': The path to the php executable
  *     'wrapper': Path to a PHP wrapper to handle the maintenance script
+ * @phan-param array{php?:string,wrapper?:string} $options
  * @return string
  */
 function wfShellWikiCmd( $script, array $parameters = [], array $options = [] ) {
@@ -2893,7 +2895,6 @@ function wfUnpack( $format, $data, $length = false ) {
 	$result = unpack( $format, $data );
 	Wikimedia\restoreWarnings();
 
-	// @phan-suppress-next-line PhanTypeComparisonFromArray Phan issue #3160
 	if ( $result === false ) {
 		// If it cannot extract the packed data.
 		throw new MWException( "unpack could not unpack binary data" );