[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Clean up "bad parameter" error messages in Message handler

2017-11-01 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/387843 )

Change subject: Clean up "bad parameter" error messages in Message handler
..


Clean up "bad parameter" error messages in Message handler

Change-Id: I64b54b1991d17ae97a8dd9414d6807daab982a3a
---
M includes/Message.php
1 file changed, 11 insertions(+), 5 deletions(-)

Approvals:
  BryanDavis: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/includes/Message.php b/includes/Message.php
index 0240fa7..2a55d0e 100644
--- a/includes/Message.php
+++ b/includes/Message.php
@@ -1167,11 +1167,17 @@
} elseif ( isset( $param['list'] ) ) {
return $this->formatListParam( $param['list'], 
$param['type'], $format );
} else {
-   $warning = 'Invalid parameter for message "' . 
$this->getKey() . '": ' .
-   htmlspecialchars( serialize( $param ) );
-   trigger_error( $warning, E_USER_WARNING );
-   $e = new Exception;
-   wfDebugLog( 'Bug58676', $warning . "\n" . 
$e->getTraceAsString() );
+   if ( !is_scalar( $param ) ) {
+   $param = serialize( $param );
+   }
+   \MediaWiki\Logger\LoggerFactory::getInstance( 
'Bug58676' )->warning(
+   'Invalid parameter for message 
"{msgkey}": {param}',
+   [
+   'exception' => new Exception,
+   'msgkey' => $this->getKey(),
+   'param' => htmlspecialchars( 
$param ),
+   ]
+   );
 
return [ 'before', '[INVALID]' ];
}

-- 
To view, visit https://gerrit.wikimedia.org/r/387843
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I64b54b1991d17ae97a8dd9414d6807daab982a3a
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Chad 
Gerrit-Reviewer: BryanDavis 
Gerrit-Reviewer: Nikerabbit 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Clean up "bad parameter" error messages in Message handler

2017-11-01 Thread Chad (Code Review) 
Hello BryanDavis, Nikerabbit,

I'd like you to do a code review.  Please visit

https://gerrit.wikimedia.org/r/387843

to review the following change.


Change subject: Clean up "bad parameter" error messages in Message handler
..

Clean up "bad parameter" error messages in Message handler

Change-Id: I64b54b1991d17ae97a8dd9414d6807daab982a3a
---
M includes/Message.php
1 file changed, 11 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/43/387843/1

diff --git a/includes/Message.php b/includes/Message.php
index 0240fa7..7a589cd 100644
--- a/includes/Message.php
+++ b/includes/Message.php
@@ -1167,11 +1167,17 @@
} elseif ( isset( $param['list'] ) ) {
return $this->formatListParam( $param['list'], 
$param['type'], $format );
} else {
-   $warning = 'Invalid parameter for message "' . 
$this->getKey() . '": ' .
-   htmlspecialchars( serialize( $param ) );
-   trigger_error( $warning, E_USER_WARNING );
-   $e = new Exception;
-   wfDebugLog( 'Bug58676', $warning . "\n" . 
$e->getTraceAsString() );
+   if ( !is_scalar( $param ) ) {
+   $param = serialize( $param );
+   }
+   \MediaWiki\Logger\LoggerFactory::getInstance( 
'Bug58676t' )->warning(
+   'Invalid parameter for message 
"{msgkey}": {param}',
+   [
+   'exception' => new Exception,
+   'msgkey' => $this->getKey(),
+   'param' => htmlspecialchars( 
$param ),
+   ]
+   );
 
return [ 'before', '[INVALID]' ];
}

-- 
To view, visit https://gerrit.wikimedia.org/r/387843
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I64b54b1991d17ae97a8dd9414d6807daab982a3a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Chad 
Gerrit-Reviewer: BryanDavis 
Gerrit-Reviewer: Nikerabbit 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits