X-Git-Url: https://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=blobdiff_plain;f=includes%2Fcache%2FCacheHelper.php;h=6c6b18473547f0adccdb6908664695822c2e8fea;hp=e77e2515869545decbbc0410cc47529c6086e517;hb=1facc21e49541fe48945ad9a1e9486bfff32c3de;hpb=9bf44d08f938cc9a85dc647b8a00665d5bd01fb6 diff --git a/includes/cache/CacheHelper.php b/includes/cache/CacheHelper.php index e77e251586..6c6b184735 100644 --- a/includes/cache/CacheHelper.php +++ b/includes/cache/CacheHelper.php @@ -18,7 +18,7 @@ * http://www.gnu.org/copyleft/gpl.html * * @file - * @license GNU GPL v2 or later + * @license GPL-2.0-or-later * @author Jeroen De Dauw < jeroendedauw@gmail.com > */ @@ -294,7 +294,7 @@ class CacheHelper implements ICacheHelper { $args = [ $args ]; } - $value = call_user_func_array( $computeFunction, $args ); + $value = $computeFunction( ...$args ); if ( $this->cacheEnabled ) { if ( is_null( $key ) ) { @@ -350,7 +350,7 @@ class CacheHelper implements ICacheHelper { throw new MWException( 'No cache key set, so cannot obtain or save the CacheHelper values.' ); } - return call_user_func_array( 'wfMemcKey', $this->cacheKey ); + return wfMemcKey( ...array_values( $this->cacheKey ) ); } /**