Update arc, remove CustomLoginHandler, fix syntax errors

Signed-off-by: MacFan4000 <paulfkeffer@gmail.com>

Author: MacFan4000

.phutil_module_cache

@@ -1 +1 @@
-{"__symbol_cache_version__":11,"ea004d72ccc372b58275f477bc1c92c0":{"have":{"class":{"PhutilMediaWikiAuthAdapter":75}},"need":{"function":{"idx":730,"pht":3195},"class":{"PhutilOAuth1AuthAdapter":114,"PhutilURI":2594,"Filesystem":2785}},"xmap":{"PhutilMediaWikiAuthAdapter":["PhutilOAuth1AuthAdapter"]}},"6d03a22cacd2bde099f20aef454748d6":{"have":{"class":{"PhabricatorMediaWikiAuthProvider":19}},"need":{"function":{"pht":1645,"id":3881,"idx":6204},"class":{"PhabricatorOAuth1AuthProvider":62,"PhutilURI":1821,"PhutilMediaWikiAuthAdapter":3888,"AphrontFormTextControl":7071,"PhabricatorEnv":2316},"class\/interface":{"AphrontRequest":1029,"AphrontFormView":5957}},"xmap":{"PhabricatorMediaWikiAuthProvider":["PhabricatorOAuth1AuthProvider"]}},"3ec4c7d3d41adb09d18265a86f2803e4":{"have":{"class":{"CustomLoginHandler":77}},"need":{"function":{"phutil_safe_html":196},"class":{"PhabricatorAuthLoginHandler":106}},"xmap":{"CustomLoginHandler":["PhabricatorAuthLoginHandler"]}},"42a6ee8e7480ee5a9d0e3842f69779ac":{"have":{"class":{"MediaWikiUserpageCustomField":19}},"need":{"function":{"pht":303,"id":936,"phutil_tag":1768},"class":{"PhabricatorUserCustomField":56,"PhabricatorExternalAccount":943,"AphrontFormTextControl":3163,"PhabricatorUserCustomFieldStringIndex":3367},"class\/interface":{"PhabricatorApplicationSearchEngine":2536,"AphrontRequest":2584,"PhabricatorCursorPagedPolicyAwareQuery":2779,"AphrontFormView":3088}},"xmap":{"MediaWikiUserpageCustomField":["PhabricatorUserCustomField"]}},"f01ff384180791bb869b4fa80f05ded8":{"have":{"class":{"GitHubAccountCustomField":18}},"need":{"function":{"pht":292,"id":922,"phutil_tag":1749},"class":{"PhabricatorUserCustomField":51,"PhabricatorExternalAccount":929,"AphrontFormTextControl":3131,"PhabricatorUserCustomFieldStringIndex":3334},"class\/interface":{"PhabricatorApplicationSearchEngine":2509,"AphrontRequest":2557,"PhabricatorCursorPagedPolicyAwareQuery":2750,"AphrontFormView":3057}},"xmap":{"GitHubAccountCustomField":["PhabricatorUserCustomField"]}},"c9b9ae1bd5a195b462da470dbf82dcc4":{"have":{"class":{"WMFExtensionsApplication":19}},"need":{"function":{"pht":119},"class":{"PhabricatorApplication":52,"WMFEscalateTaskEventListener":389}},"xmap":{"WMFExtensionsApplication":["PhabricatorApplication"]}},"0968459ba49866ef22927be130d811a4":{"have":{"class":{"WMFEscalateTaskEventListener":19}},"need":{"function":{"id":973,"pht":1113},"class":{"PhabricatorEventListener":56,"PhabricatorActionView":980,"PhabricatorEventType":133,"WMFSecurityPolicy":744},"class\/interface":{"PhutilEvent":217,"ManiphestTask":561}},"xmap":{"WMFEscalateTaskEventListener":["PhabricatorEventListener"]}},"6e1e2da38c93a354bcdcffabd394472b":{"have":{"class":{"SecurityPolicyEnforcerAction":105}},"need":{"function":{"pht":730,"id":3041,"array_fuse":4022},"class":{"HeraldAction":142,"HeraldEmptyFieldValue":1029,"HeraldApplyTranscript":1600,"ManiphestTransaction":3048,"HeraldApplicationActionGroup":287,"HeraldRuleTypeConfig":503,"WMFSecurityPolicy":1671,"PhabricatorPolicies":2110,"PhabricatorTransactions":3101,"PhabricatorProjectObjectHasProjectEdgeType":3926},"class\/interface":{"HeraldEffect":1099,"ManiphestTask":412}},"xmap":{"SecurityPolicyEnforcerAction":["HeraldAction"]}},"86c47db6d08f2eea0c5c309220d52ff5":{"have":{"class":{"WMFEscalateTaskController":19}},"need":{"function":{"phutil_safe_html":138,"id":205,"celerity_generate_unique_node_id":498,"javelin_tag":670,"pht":963,"phutil_tag_div":1385,"phlog":3661,"array_fuse":4800},"class":{"PhabricatorController":53,"PhabricatorMarkupOneOff":212,"ManiphestTaskQuery":2105,"Aphront404Response":2240,"ManiphestTransaction":3995,"ManiphestTransactionEditor":5087,"AphrontRedirectResponse":5504,"AphrontFormView":7075,"AphrontFormTextAreaControl":7319,"PhabricatorMarkupEngine":155,"Javelin":377,"WMFSecurityPolicy":2379,"PhabricatorTransactions":4048,"PhabricatorProjectObjectHasProjectEdgeType":4708,"PhabricatorUser":5025,"AphrontDialogView":7518},"class\/interface":{"AphrontRequest":1986}},"xmap":{"WMFEscalateTaskController":["PhabricatorController"]}},"93106ce6dc62745a843dd782b3d05c8f":{"have":{"class":{"WMFSubscribersPolicyRule":19}},"need":{"function":{"pht":183,"array_mergev":361,"id":889,"mpull":2635},"class":{"PhabricatorPolicyRule":54,"PhabricatorSubscribersQuery":896,"PhabricatorTypeaheadMonogramDatasource":2076,"AphrontTokenizerTemplateView":2159,"PhabricatorHandleQuery":2525,"PhutilTypeSpec":2798},"class\/interface":{"PhabricatorUser":254,"PhabricatorPolicyInterface":1192}},"xmap":{"WMFSubscribersPolicyRule":["PhabricatorPolicyRule"]}},"3cd3ef8963be12e15afd4827837aa565":{"have":{"class":{"WMFSecurityPolicy":269}},"need":{"function":{"id":6424,"array_fuse":7332},"class":{"PhabricatorProjectQuery":579,"PhabricatorPolicy":3160,"PhabricatorPeopleQuery":6431,"ManiphestTransaction":7133,"PhabricatorEdgeEditor":7450,"PhabricatorUser":517,"PhabricatorPolicies":1658,"PhabricatorTransactions":1840,"PhabricatorCustomField":4326,"ManiphestTaskDependsOnTaskEdgeType":6097,"PhabricatorEdgeQuery":6224,"ManiphestTask":6681,"PhabricatorProjectObjectHasProjectEdgeType":7047},"class\/interface":{"PhabricatorUser":5091,"ManiphestTask":5114,"PhabricatorPolicy":3098,"PhabricatorProject":5470}},"xmap":[]}}
+{"__symbol_cache_version__":11,"42a6ee8e7480ee5a9d0e3842f69779ac":{"have":{"class":{"MediaWikiUserpageCustomField":19}},"need":{"function":{"pht":303,"id":936,"phutil_tag":1768},"class":{"PhabricatorUserCustomField":56,"PhabricatorExternalAccount":943,"AphrontFormTextControl":3163,"PhabricatorUserCustomFieldStringIndex":3367},"class\/interface":{"PhabricatorApplicationSearchEngine":2536,"AphrontRequest":2584,"PhabricatorCursorPagedPolicyAwareQuery":2779,"AphrontFormView":3088}},"xmap":{"MediaWikiUserpageCustomField":["PhabricatorUserCustomField"]}},"f01ff384180791bb869b4fa80f05ded8":{"have":{"class":{"GitHubAccountCustomField":18}},"need":{"function":{"pht":292,"id":922,"phutil_tag":1749},"class":{"PhabricatorUserCustomField":51,"PhabricatorExternalAccount":929,"AphrontFormTextControl":3131,"PhabricatorUserCustomFieldStringIndex":3334},"class\/interface":{"PhabricatorApplicationSearchEngine":2509,"AphrontRequest":2557,"PhabricatorCursorPagedPolicyAwareQuery":2750,"AphrontFormView":3057}},"xmap":{"GitHubAccountCustomField":["PhabricatorUserCustomField"]}},"93106ce6dc62745a843dd782b3d05c8f":{"have":{"class":{"WMFSubscribersPolicyRule":19}},"need":{"function":{"pht":183,"array_mergev":361,"id":889,"mpull":2635},"class":{"PhabricatorPolicyRule":54,"PhabricatorSubscribersQuery":896,"PhabricatorTypeaheadMonogramDatasource":2076,"AphrontTokenizerTemplateView":2159,"PhabricatorHandleQuery":2525,"PhutilTypeSpec":2798},"class\/interface":{"PhabricatorUser":254,"PhabricatorPolicyInterface":1192}},"xmap":{"WMFSubscribersPolicyRule":["PhabricatorPolicyRule"]}},"c9b9ae1bd5a195b462da470dbf82dcc4":{"have":{"class":{"WMFExtensionsApplication":19}},"need":{"function":{"pht":119},"class":{"PhabricatorApplication":52,"WMFEscalateTaskEventListener":389}},"xmap":{"WMFExtensionsApplication":["PhabricatorApplication"]}},"fadf1c6f834f8936a5b5d513dcb3eb92":{"have":{"class":{"PhutilMediaWikiAuthAdapter":75}},"need":{"function":{"idx":1138,"id":2287,"phutil_json_decode":2589,"pht":2717},"class":{"PhutilOAuthAuthAdapter":114,"PhutilURI":2294,"HTTPSFuture":2384},"class\/interface":{"PhutilJSONParserException":2649}},"xmap":{"PhutilMediaWikiAuthAdapter":["PhutilOAuthAuthAdapter"]}},"fa11f663471020577b22d9f9dd1d18c3":{"have":{"class":{"WMFEscalateTaskEventListener":18}},"need":{"function":{"id":933,"pht":1073},"class":{"PhabricatorEventListener":55,"PhabricatorActionView":940,"PhabricatorEventType":131,"WMFSecurityPolicy":830},"class\/interface":{"PhutilEvent":214,"ManiphestTask":556}},"xmap":{"WMFEscalateTaskEventListener":["PhabricatorEventListener"]}},"fcdf61d60bde38533928f3b401490292":{"have":{"class":{"SecurityPolicyEnforcerAction":104}},"need":{"function":{"pht":724,"id":3020,"array_fuse":4000},"class":{"HeraldAction":141,"HeraldEmptyFieldValue":1020,"HeraldApplyTranscript":1587,"ManiphestTransaction":3027,"HeraldApplicationActionGroup":285,"HeraldRuleTypeConfig":499,"WMFSecurityPolicy":1658,"PhabricatorPolicies":2095,"PhabricatorTransactions":3080,"PhabricatorProjectObjectHasProjectEdgeType":3904},"class\/interface":{"HeraldEffect":1089,"ManiphestTask":409}},"xmap":{"SecurityPolicyEnforcerAction":["HeraldAction"]}},"5e48b098879651afdfe89b83120c0b1d":{"have":{"class":{"WMFEscalateTaskController":18}},"need":{"function":{"phutil_safe_html":136,"id":203,"celerity_generate_unique_node_id":495,"javelin_tag":666,"pht":959,"phutil_tag_div":1380,"phlog":3306,"array_fuse":4441},"class":{"PhabricatorController":52,"PhabricatorMarkupOneOff":210,"ManiphestTaskQuery":2096,"Aphront404Response":2230,"ManiphestTransaction":3638,"ManiphestTransactionEditor":4725,"AphrontRedirectResponse":5140,"AphrontFormView":6701,"AphrontFormTextAreaControl":6945,"PhabricatorMarkupEngine":153,"Javelin":374,"WMFSecurityPolicy":2367,"PhabricatorTransactions":3691,"PhabricatorProjectObjectHasProjectEdgeType":4349,"PhabricatorUser":4664,"AphrontDialogView":7143},"class\/interface":{"AphrontRequest":1978}},"xmap":{"WMFEscalateTaskController":["PhabricatorController"]}},"75348fc277fb69375ba36940b39cb731":{"have":{"class":{"PhabricatorMediaWikiAuthProvider":19}},"need":{"function":{"pht":1135,"id":3596,"idx":5642},"class":{"PhabricatorOAuth2AuthProvider":62,"PhutilURI":1311,"PhutilMediaWikiAuthAdapter":3603,"AphrontFormTextControl":5937,"AphrontFormStaticControl":6292,"PhabricatorEnv":2276},"class\/interface":{"AphrontRequest":591,"AphrontFormView":5394}},"xmap":{"PhabricatorMediaWikiAuthProvider":["PhabricatorOAuth2AuthProvider"]}},"a061e4db3a7a14f0dca3b7f252fcf1ab":{"have":{"class":{"WMFSecurityPolicy":269}},"need":{"function":{"id":6049,"array_fuse":6953},"class":{"PhabricatorProjectQuery":578,"PhabricatorPolicy":3348,"PhabricatorPeopleQuery":6056,"ManiphestTransaction":6754,"PhabricatorEdgeEditor":7070,"PhabricatorUser":517,"PhabricatorPolicies":1850,"PhabricatorTransactions":2031,"PhabricatorCustomField":4510,"ManiphestTaskDependsOnTaskEdgeType":5724,"PhabricatorEdgeQuery":5850,"ManiphestTask":6303,"PhabricatorProjectObjectHasProjectEdgeType":6668},"class\/interface":{"PhabricatorPolicy":3286}},"xmap":[]}}

__phutil_library_map__.php

@@ -9,7 +9,6 @@
 phutil_register_library_map(array(
   '__library_version__' => 2,
   'class' => array(
-    'CustomLoginHandler' => 'src/other/CustomLoginHandler.php',
     'GitHubAccountCustomField' => 'src/customfields/GitHubAccountCustomField.php',
     'MediaWikiUserpageCustomField' => 'src/customfields/MediaWikiUserpageCustomField.php',
     'PhabricatorMediaWikiAuthProvider' => 'src/oauth/PhabricatorMediaWikiAuthProvider.php',
@@ -23,11 +22,10 @@
   ),
   'function' => array(),
   'xmap' => array(
-    'CustomLoginHandler' => 'PhabricatorAuthLoginHandler',
     'GitHubAccountCustomField' => 'PhabricatorUserCustomField',
     'MediaWikiUserpageCustomField' => 'PhabricatorUserCustomField',
-    'PhabricatorMediaWikiAuthProvider' => 'PhabricatorOAuth1AuthProvider',
-    'PhutilMediaWikiAuthAdapter' => 'PhutilOAuth1AuthAdapter',
+    'PhabricatorMediaWikiAuthProvider' => 'PhabricatorOAuth2AuthProvider',
+    'PhutilMediaWikiAuthAdapter' => 'PhutilOAuthAuthAdapter',
     'SecurityPolicyEnforcerAction' => 'HeraldAction',
     'WMFEscalateTaskController' => 'PhabricatorController',
     'WMFEscalateTaskEventListener' => 'PhabricatorEventListener',

src/oauth/PhabricatorMediaWikiAuthProvider.php

@@ -187,7 +187,7 @@ public function extendEditForm(
             ->setName(self::PROPERTY_MEDIAWIKI_NAME)
             ->setError($e_name)
             ->setCaption(pht(
-            'Use lowercase letters, digits, and periods.',)));
+            'Use lowercase letters, digits, and periods.')));
     } else {
       $form
         ->appendChild(
@@ -203,7 +203,7 @@ public function extendEditForm(
           ->setValue($v_uri)
           ->setName(self::PROPERTY_MEDIAWIKI_URI)
           ->setCaption(
-            pht('URL to your MediaWiki install upto but not including index.php',))
+            pht('URL to your MediaWiki install upto but not including index.php'))
           ->setError($e_uri));
 
     if (!$is_setup) {