From: Aaron Schulz <aschulz@wikimedia.org>
Date: Fri, 30 Sep 2016 22:57:33 +0000 (-0700)
Subject: Fix SectionProfileCallback type error
X-Git-Tag: 1.31.0-rc.0~5253^2
X-Git-Url: http://git.cyclocoop.org//%27http:/jquery.khurshid.com/ifixpng.php/%27?a=commitdiff_plain;h=058707ef3874b501056fd6711f082e33866306d0;p=lhc%2Fweb%2Fwiklou.git

Fix SectionProfileCallback type error

Avoids "Argument 1 passed to Profiler::scopedProfileOut() must
be an instance of ScopedCallback, SectionProfileCallback given"

Change-Id: I92713de71df9722d8a5d7e5cd04460aff71cf096
---

diff --git a/includes/profiler/Profiler.php b/includes/profiler/Profiler.php
index 297dcb20a1..db9c95b195 100644
--- a/includes/profiler/Profiler.php
+++ b/includes/profiler/Profiler.php
@@ -162,9 +162,9 @@ abstract class Profiler {
 	abstract public function scopedProfileIn( $section );
 
 	/**
-	 * @param ScopedCallback $section
+	 * @param SectionProfileCallback $section
 	 */
-	public function scopedProfileOut( ScopedCallback &$section = null ) {
+	public function scopedProfileOut( SectionProfileCallback &$section = null ) {
 		$section = null;
 	}
 
diff --git a/includes/profiler/SectionProfiler.php b/includes/profiler/SectionProfiler.php
index bbe139b0ae..7e3c398bb0 100644
--- a/includes/profiler/SectionProfiler.php
+++ b/includes/profiler/SectionProfiler.php
@@ -58,7 +58,7 @@ class SectionProfiler {
 
 	/**
 	 * @param string $section
-	 * @return ScopedCallback
+	 * @return SectionProfileCallback
 	 */
 	public function scopedProfileIn( $section ) {
 		$this->profileInInternal( $section );