From 3fc3b9e5785556ed9576f3f3f4146795d73f06f4 Mon Sep 17 00:00:00 2001
From: Jakub Vrana <jakub@vrana.cz>
Date: Sat, 1 Dec 2018 10:02:48 +0100
Subject: [PATCH] Change typehint callback to callable

Found by PHPStan.

Change-Id: I77877a18131bd69996bad07f2ee1c5f3ba3ba2e7
---
 includes/libs/objectcache/BagOStuff.php   | 2 +-
 includes/libs/rdbms/database/Database.php | 4 ++--
 includes/parser/ParserOptions.php         | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/includes/libs/objectcache/BagOStuff.php b/includes/libs/objectcache/BagOStuff.php
index c6bcc7a841..bc5ea461c0 100644
--- a/includes/libs/objectcache/BagOStuff.php
+++ b/includes/libs/objectcache/BagOStuff.php
@@ -64,7 +64,7 @@ abstract class BagOStuff implements IExpiringStore, LoggerAwareInterface {
 	protected $keyspace = 'local';
 	/** @var LoggerInterface */
 	protected $logger;
-	/** @var callback|null */
+	/** @var callable|null */
 	protected $asyncHandler;
 	/** @var int Seconds */
 	protected $syncTimeout;
diff --git a/includes/libs/rdbms/database/Database.php b/includes/libs/rdbms/database/Database.php
index 2c40c72bc1..f151d85737 100644
--- a/includes/libs/rdbms/database/Database.php
+++ b/includes/libs/rdbms/database/Database.php
@@ -97,9 +97,9 @@ abstract class Database implements IDatabase, IMaintainableDatabase, LoggerAware
 	protected $connLogger;
 	/** @var LoggerInterface */
 	protected $queryLogger;
-	/** @var callback Error logging callback */
+	/** @var callable Error logging callback */
 	protected $errorLogger;
-	/** @var callback Deprecation logging callback */
+	/** @var callable Deprecation logging callback */
 	protected $deprecationLogger;
 
 	/** @var resource|null Database connection */
diff --git a/includes/parser/ParserOptions.php b/includes/parser/ParserOptions.php
index de67b84740..032d481faa 100644
--- a/includes/parser/ParserOptions.php
+++ b/includes/parser/ParserOptions.php
@@ -57,7 +57,7 @@ class ParserOptions {
 
 	/**
 	 * Lazy-loaded options
-	 * @var callback[]
+	 * @var callable[]
 	 */
 	private static $lazyOptions = [
 		'dateformat' => [ __CLASS__, 'initDateFormat' ],
-- 
2.20.1