Siebrand has uploaded a new change for review.
https://gerrit.wikimedia.org/r/132612
Change subject: Pass phpcs-strict on includes/profiler/
......................................................................
Pass phpcs-strict on includes/profiler/
Change-Id: Ic9058a650ea0735b71b3725703d76cc62b5c9fb1
---
M includes/profiler/Profiler.php
M includes/profiler/ProfilerSimpleDB.php
M includes/profiler/ProfilerStub.php
3 files changed, 36 insertions(+), 12 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/12/132612/1
diff --git a/includes/profiler/Profiler.php b/includes/profiler/Profiler.php
index efbdf05..f6bafd5 100644
--- a/includes/profiler/Profiler.php
+++ b/includes/profiler/Profiler.php
@@ -101,8 +101,10 @@
/** @var TransactionProfiler */
protected $trxProfiler;
- /** @var Profiler */
- public static $__instance = null; // do not call this outside Profiler
and ProfileSection
+ // @codingStandardsIgnoreStart
PSR2.Classes.PropertyDeclaration.Underscore
+ /** @var Profiler Do not call this outside Profiler and ProfileSection
*/
+ public static $__instance = null;
+ // @codingStandardsIgnoreEnd
/**
* @param array $params
diff --git a/includes/profiler/ProfilerSimpleDB.php
b/includes/profiler/ProfilerSimpleDB.php
index 6911d4b..38a6436 100644
--- a/includes/profiler/ProfilerSimpleDB.php
+++ b/includes/profiler/ProfilerSimpleDB.php
@@ -105,6 +105,7 @@
if ( $useTrx ) {
$dbw->commit();
}
- } catch ( DBError $e ) {}
+ } catch ( DBError $e ) {
+ }
}
}
diff --git a/includes/profiler/ProfilerStub.php
b/includes/profiler/ProfilerStub.php
index 6de97ba..1d3b65d 100644
--- a/includes/profiler/ProfilerStub.php
+++ b/includes/profiler/ProfilerStub.php
@@ -30,16 +30,37 @@
public function isStub() {
return true;
}
+
public function isPersistent() {
return false;
}
- public function profileIn( $fn ) {}
- public function profileOut( $fn ) {}
- public function getOutput() {}
- public function close() {}
- public function logData() {}
- public function getCurrentSection() { return ''; }
- public function transactionWritingIn( $server, $db, $id = '' ) {}
- public function transactionWritingOut( $server, $db, $id = '' ) {}
- public function getRawData() { return array(); }
+
+ public function profileIn( $fn ) {
+ }
+
+ public function profileOut( $fn ) {
+ }
+
+ public function getOutput() {
+ }
+
+ public function close() {
+ }
+
+ public function logData() {
+ }
+
+ public function getCurrentSection() {
+ return '';
+ }
+
+ public function transactionWritingIn( $server, $db, $id = '' ) {
+ }
+
+ public function transactionWritingOut( $server, $db, $id = '' ) {
+ }
+
+ public function getRawData() {
+ return array();
+ }
}
--
To view, visit https://gerrit.wikimedia.org/r/132612
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic9058a650ea0735b71b3725703d76cc62b5c9fb1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Siebrand <siebr...@kitano.nl>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
