Merge "Change typehint callback to callable"

diff --git a/includes/libs/objectcache/WANObjectCache.php b/includes/libs/objectcache/WANObjectCache.php
index e7586cf..ed5c7f5 100644 (file)
--- a/includes/libs/objectcache/WANObjectCache.php
+++ b/includes/libs/objectcache/WANObjectCache.php
@@ -1166,7 +1166,7 @@ class WANObjectCache implements IExpiringStore, LoggerAwareInterface {
         *
         * @param string $key
         * @param int $ttl
-        * @param callback $callback
+        * @param callable $callback
         * @param array $opts Options map for getWithSetCallback()
         * @param float|null &$asOf Cache generation timestamp of returned value [returned]
         * @return mixed

diff --git a/includes/search/SearchSuggestionSet.php b/includes/search/SearchSuggestionSet.php
index cb1f831..f1da246 100644 (file)
--- a/includes/search/SearchSuggestionSet.php
+++ b/includes/search/SearchSuggestionSet.php
@@ -80,7 +80,7 @@ class SearchSuggestionSet {
 
        /**
         * Call array_map on the suggestions array
-        * @param callback $callback
+        * @param callable $callback
         * @return array
         */
        public function map( $callback ) {
@@ -89,7 +89,7 @@ class SearchSuggestionSet {
 
        /**
         * Filter the suggestions array
-        * @param callback $callback Callable accepting single SearchSuggestion
+        * @param callable $callback Callable accepting single SearchSuggestion
         *  instance returning bool false to remove the item.
         * @return int The number of suggestions removed
         */