wikimedia/mediawiki-extensions-Echo
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/Echo synced 2024-11-28 01:30:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "EventPresentationModel:🏭 Force type Language for $language"

Browse source
This commit is contained in:
jenkins-bot 2018-05-29 21:18:07 +00:00 committed by Gerrit Code Review
parent be3ede420c e20d0aaf4d
commit 10cdc61aa1
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
includes/formatters/EventPresentationModel.php
View file

@ -60,14 +60,14 @@ abstract class EchoEventPresentationModel implements JsonSerializable {
/**
* @param EchoEvent $event
* @param Language|string $language
* @param Language $language
* @param User $user Only used for permissions checking and GENDER
* @param string $distributionType
*/
protected function __construct( EchoEvent $event, $language, User $user, $distributionType ) {
protected function __construct( EchoEvent $event, Language $language, User $user, $distributionType ) {
$this->event = $event;
$this->type = $event->getType();
$this->language = wfGetLangObj( $language );
$this->language = $language;
$this->user = $user;
$this->distributionType = $distributionType;
}
@ -86,12 +86,12 @@ abstract class EchoEventPresentationModel implements JsonSerializable {
/**
* @param EchoEvent $event
* @param Language|string $language
* @param Language $language
* @param User $user
* @param string $distributionType 'web' or 'email'
* @return EchoEventPresentationModel
*/
public static function factory( EchoEvent $event, $language, User $user, $distributionType = 'web' ) {
public static function factory( EchoEvent $event, Language $language, User $user, $distributionType = 'web' ) {
global $wgEchoNotifications;
// @todo don't depend upon globals