[MediaWiki-commits] [Gerrit] mediawiki...WikimediaIncubator[master]: Remove pre-authmanager code

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

Change subject: Remove pre-authmanager code
..


Remove pre-authmanager code

Bug: T178034
Change-Id: I2bb89e897951ffefc32eb09faee2243964a73284
---
D CreateAccountTestWiki.php
M WikimediaIncubator.class.php
M extension.json
3 files changed, 8 insertions(+), 66 deletions(-)

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



diff --git a/CreateAccountTestWiki.php b/CreateAccountTestWiki.php
deleted file mode 100644
index aa4b2d7..000
--- a/CreateAccountTestWiki.php
+++ /dev/null
@@ -1,52 +0,0 @@
-getVal( 
'testwikiproject', '' ) );
-   $codevalue = strtolower( $wgRequest->getVal( 'testwikicode', '' 
) );
-   if ( WikimediaIncubator::validateLanguageCode( $codevalue )
-   && isset( $wmincProjects[$projectvalue] )
-   ) {
-   $template->set( 'header',
-   Html::hidden( 'testwiki-project', $projectvalue 
) .
-   Html::hidden( 'testwiki-code', $codevalue )
-   );
-   }
-   return true;
-   }
-
-   /**
-* @param User $user
-* @return bool
-*/
-   public static function onAddNewAccount( $user ) {
-   global $wgRequest, $wmincProjects, $wmincPref;
-   $projectvalue = $wgRequest->getVal( 'testwiki-project' );
-   $codevalue = $wgRequest->getVal( 'testwiki-code' );
-   if ( WikimediaIncubator::validateLanguageCode( $codevalue )
-   && isset( $wmincProjects[$projectvalue] )
-   ) {
-   $user->setOption( $wmincPref . '-project', 
$projectvalue );
-   $user->setOption( $wmincPref . '-code', $codevalue );
-   $user->saveSettings();
-   }
-   return true;
-   }
-}
diff --git a/WikimediaIncubator.class.php b/WikimediaIncubator.class.php
index f785102..5db49b8 100644
--- a/WikimediaIncubator.class.php
+++ b/WikimediaIncubator.class.php
@@ -16,22 +16,9 @@
 */
public static function onRegistration() {
global $wmincExistingWikis, $wgLocalDatabases;
-   global $wgHooks, $wgDisableAuthManager, 
$wgAuthManagerAutoConfig;
 
if ( $wmincExistingWikis === null ) {
$wmincExistingWikis = $wgLocalDatabases;
-   }
-
-   if ( class_exists( MediaWiki\Auth\AuthManager::class ) && 
empty( $wgDisableAuthManager ) ) {
-   $wgAuthManagerAutoConfig['secondaryauth'] += [
-   
WikimediaIncubatorSecondaryAuthenticationProvider::class => [
-   'class' => 
WikimediaIncubatorSecondaryAuthenticationProvider::class,
-   'sort' => 0, // non-UI secondaries 
should run early
-   ]
-   ];
-   } else {
-   $wgHooks['UserCreateForm'][] = 
'AutoTestWiki::onUserCreateForm';
-   $wgHooks['AddNewAccount'][] = 
'AutoTestWiki::onAddNewAccount';
}
}
 
diff --git a/extension.json b/extension.json
index edc9eb0..eb213ba 100644
--- a/extension.json
+++ b/extension.json
@@ -121,7 +121,6 @@
"WikimediaIncubator": "WikimediaIncubator.class.php",
"SpecialMyMainPage": "SpecialMyMainPage.php",
"TestWikiRC": "TestWikiRC.php",
-   "AutoTestWiki": "CreateAccountTestWiki.php",
"SpecialRandomByTest": "SpecialRandomByTest.php",
"InfoPage": "InfoPage.php",
"ListUsersTestWiki": "ListUsersTestWiki.php",
@@ -140,6 +139,14 @@
"localBasePath": "",
"remoteExtPath": "WikimediaIncubator"
},
+   "AuthManagerAutoConfig": {
+   "primaryauth": {
+   "WikimediaIncubatorSecondaryAuthenticationProvider": {
+   "class": 
"WikimediaIncubatorSecondaryAuthenticationProvider",
+   "sort": 0
+   }
+   }
+   },
"callback": "WikimediaIncubator::onRegistration",
"Hooks": {
"ContributionsToolLinks": 
"WikimediaIncubator::efLoadViewUserLangLink",

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I2bb89e897951ffefc32eb09faee2243964a73284
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/WikimediaIncubator
Gerrit-Branch: master
Gerrit-Owner: Reedy 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mail

[MediaWiki-commits] [Gerrit] mediawiki...WikimediaIncubator[master]: Remove pre-authmanager code

2017-10-11 Thread Reedy (Code Review) 
Reedy has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/383741 )

Change subject: Remove pre-authmanager code
..

Remove pre-authmanager code

Bug: T178034
Change-Id: I2bb89e897951ffefc32eb09faee2243964a73284
---
D CreateAccountTestWiki.php
M WikimediaIncubator.class.php
M extension.json
3 files changed, 8 insertions(+), 65 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikimediaIncubator 
refs/changes/41/383741/1

diff --git a/CreateAccountTestWiki.php b/CreateAccountTestWiki.php
deleted file mode 100644
index aa4b2d7..000
--- a/CreateAccountTestWiki.php
+++ /dev/null
@@ -1,52 +0,0 @@
-getVal( 
'testwikiproject', '' ) );
-   $codevalue = strtolower( $wgRequest->getVal( 'testwikicode', '' 
) );
-   if ( WikimediaIncubator::validateLanguageCode( $codevalue )
-   && isset( $wmincProjects[$projectvalue] )
-   ) {
-   $template->set( 'header',
-   Html::hidden( 'testwiki-project', $projectvalue 
) .
-   Html::hidden( 'testwiki-code', $codevalue )
-   );
-   }
-   return true;
-   }
-
-   /**
-* @param User $user
-* @return bool
-*/
-   public static function onAddNewAccount( $user ) {
-   global $wgRequest, $wmincProjects, $wmincPref;
-   $projectvalue = $wgRequest->getVal( 'testwiki-project' );
-   $codevalue = $wgRequest->getVal( 'testwiki-code' );
-   if ( WikimediaIncubator::validateLanguageCode( $codevalue )
-   && isset( $wmincProjects[$projectvalue] )
-   ) {
-   $user->setOption( $wmincPref . '-project', 
$projectvalue );
-   $user->setOption( $wmincPref . '-code', $codevalue );
-   $user->saveSettings();
-   }
-   return true;
-   }
-}
diff --git a/WikimediaIncubator.class.php b/WikimediaIncubator.class.php
index f785102..5fe3e8f 100644
--- a/WikimediaIncubator.class.php
+++ b/WikimediaIncubator.class.php
@@ -21,18 +21,6 @@
if ( $wmincExistingWikis === null ) {
$wmincExistingWikis = $wgLocalDatabases;
}
-
-   if ( class_exists( MediaWiki\Auth\AuthManager::class ) && 
empty( $wgDisableAuthManager ) ) {
-   $wgAuthManagerAutoConfig['secondaryauth'] += [
-   
WikimediaIncubatorSecondaryAuthenticationProvider::class => [
-   'class' => 
WikimediaIncubatorSecondaryAuthenticationProvider::class,
-   'sort' => 0, // non-UI secondaries 
should run early
-   ]
-   ];
-   } else {
-   $wgHooks['UserCreateForm'][] = 
'AutoTestWiki::onUserCreateForm';
-   $wgHooks['AddNewAccount'][] = 
'AutoTestWiki::onAddNewAccount';
-   }
}
 
/**
diff --git a/extension.json b/extension.json
index edc9eb0..eb213ba 100644
--- a/extension.json
+++ b/extension.json
@@ -121,7 +121,6 @@
"WikimediaIncubator": "WikimediaIncubator.class.php",
"SpecialMyMainPage": "SpecialMyMainPage.php",
"TestWikiRC": "TestWikiRC.php",
-   "AutoTestWiki": "CreateAccountTestWiki.php",
"SpecialRandomByTest": "SpecialRandomByTest.php",
"InfoPage": "InfoPage.php",
"ListUsersTestWiki": "ListUsersTestWiki.php",
@@ -140,6 +139,14 @@
"localBasePath": "",
"remoteExtPath": "WikimediaIncubator"
},
+   "AuthManagerAutoConfig": {
+   "primaryauth": {
+   "WikimediaIncubatorSecondaryAuthenticationProvider": {
+   "class": 
"WikimediaIncubatorSecondaryAuthenticationProvider",
+   "sort": 0
+   }
+   }
+   },
"callback": "WikimediaIncubator::onRegistration",
"Hooks": {
"ContributionsToolLinks": 
"WikimediaIncubator::efLoadViewUserLangLink",

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2bb89e897951ffefc32eb09faee2243964a73284
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikimediaIncubator
Gerrit-Branch: master
Gerrit-Owner: Reedy 

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