From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Tue, 17 Sep 2019 20:32:17 +0000 (+0000)
Subject: Merge "DefaultPreferencesFactory: Remove fallback for null PermissionManager"
X-Git-Tag: 1.34.0-rc.0~174
X-Git-Url: https://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=commitdiff_plain;h=4e9eb2f8d75784c78715e7dc3a9c8084d5c54943;hp=-c

Merge "DefaultPreferencesFactory: Remove fallback for null PermissionManager"
---

4e9eb2f8d75784c78715e7dc3a9c8084d5c54943
diff --combined includes/preferences/DefaultPreferencesFactory.php
index a7c7a492be,10c88ff348..68236e5f2e
--- a/includes/preferences/DefaultPreferencesFactory.php
+++ b/includes/preferences/DefaultPreferencesFactory.php
@@@ -122,7 -122,7 +122,7 @@@ class DefaultPreferencesFactory impleme
  	 * @param AuthManager $authManager
  	 * @param LinkRenderer $linkRenderer
  	 * @param NamespaceInfo $nsInfo
- 	 * @param PermissionManager|null $permissionManager
+ 	 * @param PermissionManager $permissionManager
  	 */
  	public function __construct(
  		ServiceOptions $options,
@@@ -130,15 -130,10 +130,10 @@@
  		AuthManager $authManager,
  		LinkRenderer $linkRenderer,
  		NamespaceInfo $nsInfo,
- 		PermissionManager $permissionManager = null
+ 		PermissionManager $permissionManager
  	) {
  		$options->assertRequiredOptions( self::$constructorOptions );
  
- 		if ( !$permissionManager ) {
- 			// TODO: this is actually hard-deprecated, left for jenkins to pass
- 			// together with GlobalPreferences extension. Will be removed in a followup.
- 			$permissionManager = MediaWikiServices::getInstance()->getPermissionManager();
- 		}
  		$this->options = $options;
  		$this->contLang = $contLang;
  		$this->authManager = $authManager;
@@@ -1525,7 -1520,7 +1520,7 @@@
  		}
  
  		/**
 -		 * @var HTMLForm $htmlForm
 +		 * @var PreferencesFormOOUI $htmlForm
  		 */
  		$htmlForm = new $formClass( $formDescriptor, $context, 'prefs' );
  
@@@ -1538,10 -1533,6 +1533,10 @@@
  		] ) );
  
  		$htmlForm->setModifiedUser( $user );
 +		$htmlForm->setOptionsEditable( $this->permissionManager
 +			->userHasRight( $user, 'editmyoptions' ) );
 +		$htmlForm->setPrivateInfoEditable( $this->permissionManager
 +			->userHasRight( $user, 'editmyprivateinfo' ) );
  		$htmlForm->setId( 'mw-prefs-form' );
  		$htmlForm->setAutocomplete( 'off' );
  		$htmlForm->setSubmitText( $context->msg( 'saveprefs' )->text() );
@@@ -1549,7 -1540,7 +1544,7 @@@
  		$htmlForm->setSubmitTooltip( 'preferences-save' );
  		$htmlForm->setSubmitID( 'prefcontrol' );
  		$htmlForm->setSubmitCallback(
 -			function ( array $formData, HTMLForm $form ) use ( $formDescriptor ) {
 +			function ( array $formData, PreferencesFormOOUI $form ) use ( $formDescriptor ) {
  				return $this->submitForm( $formData, $form, $formDescriptor );
  			}
  		);