X-Git-Url: http://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2Flibs%2FMemoizedCallable.php;h=e9d1fc1ca3e15b6c56f194be8776d9aceeffba03;hb=5e2d030675f6ffaf3391e0483d10d6c4477a9231;hp=12a5cadb993f22354dd6e458654d699c52aaff96;hpb=7874fc4bec845ad92960b07e969c65f3c3fe74f2;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/libs/MemoizedCallable.php b/includes/libs/MemoizedCallable.php
index 12a5cadb99..e9d1fc1ca3 100644
--- a/includes/libs/MemoizedCallable.php
+++ b/includes/libs/MemoizedCallable.php
@@ -1,4 +1,24 @@
 <?php
+/**
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * http://www.gnu.org/copyleft/gpl.html
+ *
+ * @file
+ * @author Ori Livneh
+ */
+
 /**
  * APC-backed and APCu-backed function memoization
  *
@@ -18,23 +38,6 @@
  * MemoizedCallable::call( 'range', array( 5, 8 ) );  // same
  * @endcode
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- * http://www.gnu.org/copyleft/gpl.html
- *
- * @file
- * @author Ori Livneh
  * @since 1.27
  */
 class MemoizedCallable {
@@ -46,8 +49,6 @@ class MemoizedCallable {
 	private $callableName;
 
 	/**
-	 * Constructor.
-	 *
 	 * @throws InvalidArgumentException if $callable is not a callable.
 	 * @param callable $callable Function or method to memoize.
 	 * @param int $ttl TTL in seconds. Defaults to 3600 (1hr). Capped at 86400 (24h).
@@ -74,6 +75,7 @@ class MemoizedCallable {
 	 *
 	 * @param string $key
 	 * @param bool &$success
+	 * @return bool
 	 */
 	protected function fetchResult( $key, &$success ) {
 		$success = false;
@@ -121,7 +123,7 @@ class MemoizedCallable {
 		$success = false;
 		$result = $this->fetchResult( $key, $success );
 		if ( !$success ) {
-			$result = call_user_func_array( $this->callable, $args );
+			$result = ( $this->callable )( ...$args );
 			$this->storeResult( $key, $result );
 		}
 
@@ -133,7 +135,7 @@ class MemoizedCallable {
 	 *
 	 * Like MemoizedCallable::invokeArgs(), but variadic.
 	 *
-	 * @param mixed ...$params Parameters for memoized function or method.
+	 * @param mixed $params,... Parameters for memoized function or method.
 	 * @return mixed The memoized callable's return value.
 	 */
 	public function invoke() {
@@ -147,6 +149,7 @@ class MemoizedCallable {
 	 * @param callable $callable
 	 * @param array $args
 	 * @param int $ttl
+	 * @return mixed
 	 */
 	public static function call( $callable, array $args = [], $ttl = 3600 ) {
 		$instance = new self( $callable, $ttl );