From 339369dc3654c2d6838dc0c484968968b6481268 Mon Sep 17 00:00:00 2001
From: vrana <jakubv@fb.com>
Date: Thu, 2 Feb 2012 17:25:31 -0800
Subject: [PATCH] Github is actually GitHub

Test Plan: none

Reviewers: epriestley

Reviewed By: epriestley

CC: aran, epriestley

Differential Revision: https://secure.phabricator.com/D1557
---
 conf/default.conf.php                                | 12 ++++++------
 src/__phutil_library_map__.php                       |  4 ++--
 .../oauth/provider/base/PhabricatorOAuthProvider.php |  4 ++--
 ...Github.php => PhabricatorOAuthProviderGitHub.php} |  6 +++---
 .../auth/oauth/provider/github/__init__.php          |  2 +-
 5 files changed, 14 insertions(+), 14 deletions(-)
 rename src/applications/auth/oauth/provider/github/{PhabricatorOAuthProviderGithub.php => PhabricatorOAuthProviderGitHub.php} (95%)

diff --git a/conf/default.conf.php b/conf/default.conf.php
index 5a42df8a0f..fd1a03d23c 100644
--- a/conf/default.conf.php
+++ b/conf/default.conf.php
@@ -359,22 +359,22 @@ return array(
   'facebook.application-secret' => null,
 
 
-// -- Github ---------------------------------------------------------------- //
+// -- GitHub ---------------------------------------------------------------- //
 
-  // Can users use Github credentials to login to Phabricator?
+  // Can users use GitHub credentials to login to Phabricator?
   'github.auth-enabled'         => false,
 
-  // Can users use Github credentials to create new Phabricator accounts?
+  // Can users use GitHub credentials to create new Phabricator accounts?
   'github.registration-enabled' => true,
 
-  // Are Github accounts permanently linked to Phabricator accounts, or can
+  // Are GitHub accounts permanently linked to Phabricator accounts, or can
   // the user unlink them?
   'github.auth-permanent'       => false,
 
-  // The Github "Client ID" to use for Github API access.
+  // The GitHub "Client ID" to use for GitHub API access.
   'github.application-id'       => null,
 
-  // The Github "Secret" to use for Github API access.
+  // The GitHub "Secret" to use for GitHub API access.
   'github.application-secret'   => null,
 
 
diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index 45b255a9f1..66d5311ab0 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -579,7 +579,7 @@ phutil_register_library_map(array(
     'PhabricatorOAuthLoginController' => 'applications/auth/controller/oauth',
     'PhabricatorOAuthProvider' => 'applications/auth/oauth/provider/base',
     'PhabricatorOAuthProviderFacebook' => 'applications/auth/oauth/provider/facebook',
-    'PhabricatorOAuthProviderGithub' => 'applications/auth/oauth/provider/github',
+    'PhabricatorOAuthProviderGitHub' => 'applications/auth/oauth/provider/github',
     'PhabricatorOAuthProviderGoogle' => 'applications/auth/oauth/provider/google',
     'PhabricatorOAuthRegistrationController' => 'applications/auth/controller/oauthregistration/base',
     'PhabricatorOAuthUnlinkController' => 'applications/auth/controller/unlink',
@@ -1285,7 +1285,7 @@ phutil_register_library_map(array(
     'PhabricatorOAuthFailureView' => 'AphrontView',
     'PhabricatorOAuthLoginController' => 'PhabricatorAuthController',
     'PhabricatorOAuthProviderFacebook' => 'PhabricatorOAuthProvider',
-    'PhabricatorOAuthProviderGithub' => 'PhabricatorOAuthProvider',
+    'PhabricatorOAuthProviderGitHub' => 'PhabricatorOAuthProvider',
     'PhabricatorOAuthProviderGoogle' => 'PhabricatorOAuthProvider',
     'PhabricatorOAuthRegistrationController' => 'PhabricatorAuthController',
     'PhabricatorOAuthUnlinkController' => 'PhabricatorAuthController',
diff --git a/src/applications/auth/oauth/provider/base/PhabricatorOAuthProvider.php b/src/applications/auth/oauth/provider/base/PhabricatorOAuthProvider.php
index a2065959eb..f886b0aff4 100644
--- a/src/applications/auth/oauth/provider/base/PhabricatorOAuthProvider.php
+++ b/src/applications/auth/oauth/provider/base/PhabricatorOAuthProvider.php
@@ -1,7 +1,7 @@
 <?php
 
 /*
- * Copyright 2011 Facebook, Inc.
+ * Copyright 2012 Facebook, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -93,7 +93,7 @@ abstract class PhabricatorOAuthProvider {
         $class = 'PhabricatorOAuthProviderFacebook';
         break;
       case self::PROVIDER_GITHUB:
-        $class = 'PhabricatorOAuthProviderGithub';
+        $class = 'PhabricatorOAuthProviderGitHub';
         break;
       case self::PROVIDER_GOOGLE:
         $class = 'PhabricatorOAuthProviderGoogle';
diff --git a/src/applications/auth/oauth/provider/github/PhabricatorOAuthProviderGithub.php b/src/applications/auth/oauth/provider/github/PhabricatorOAuthProviderGitHub.php
similarity index 95%
rename from src/applications/auth/oauth/provider/github/PhabricatorOAuthProviderGithub.php
rename to src/applications/auth/oauth/provider/github/PhabricatorOAuthProviderGitHub.php
index e41d7a76f3..868988687c 100644
--- a/src/applications/auth/oauth/provider/github/PhabricatorOAuthProviderGithub.php
+++ b/src/applications/auth/oauth/provider/github/PhabricatorOAuthProviderGitHub.php
@@ -1,7 +1,7 @@
 <?php
 
 /*
- * Copyright 2011 Facebook, Inc.
+ * Copyright 2012 Facebook, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-class PhabricatorOAuthProviderGithub extends PhabricatorOAuthProvider {
+class PhabricatorOAuthProviderGitHub extends PhabricatorOAuthProvider {
 
   private $userData;
 
@@ -25,7 +25,7 @@ class PhabricatorOAuthProviderGithub extends PhabricatorOAuthProvider {
   }
 
   public function getProviderName() {
-    return 'Github';
+    return 'GitHub';
   }
 
   public function isProviderEnabled() {
diff --git a/src/applications/auth/oauth/provider/github/__init__.php b/src/applications/auth/oauth/provider/github/__init__.php
index 6c17b44365..ee873350e0 100644
--- a/src/applications/auth/oauth/provider/github/__init__.php
+++ b/src/applications/auth/oauth/provider/github/__init__.php
@@ -12,4 +12,4 @@ phutil_require_module('phabricator', 'infrastructure/env');
 phutil_require_module('phutil', 'utils');
 
 
-phutil_require_source('PhabricatorOAuthProviderGithub.php');
+phutil_require_source('PhabricatorOAuthProviderGitHub.php');