Merge branch 'master' of github.com:EHER/OAuth

Conflicts:
	.gitignore
	composer.json

.gitignore

@@ -1,4 +1,3 @@
 *.swp
 composer.phar
 composer.lock
-

composer.json

@@ -4,11 +4,12 @@
     "description": "OAuth 1 PHP Library",
     "keywords": ["oauth"],
     "homepage": "https://github.com/EHER/OAuth",
-    "authors": 
+    "authors":[
-    {
+        {
-        "name": "Andy Smith",
+            "name": "Andy Smith",
-        "homepage": "http://term.ie/"
+            "homepage": "http://term.ie/"
-    },
+        }
+    ],
     "require": {
         "php": ">=5.3.0"
     }

src/Eher/OAuth/HmacSha1.php

@@ -9,7 +9,7 @@ namespace Eher\OAuth;
  * character (ASCII code 38) even if empty.
  *   - Chapter 9.2 ("HMAC-SHA1")
  */
-class OAuthSignatureMethod_HMAC_SHA1 extends OAuthSignatureMethod {
+class HmacSha1 extends SignatureMethod {
   function get_name() {
     return "HMAC-SHA1";
   }

src/Eher/OAuth/PlainText.php

@@ -7,7 +7,7 @@ namespace Eher\OAuth;
  * over a secure channel such as HTTPS. It does not use the Signature Base String.
  *   - Chapter 9.4 ("PLAINTEXT")
  */
-class OAuthSignatureMethod_PLAINTEXT extends OAuthSignatureMethod {
+class PlainText extends SignatureMethod {
   public function get_name() {
     return "PLAINTEXT";
   }

src/Eher/OAuth/RsaSha1.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Eher\OAuth;
+namespace Eher\OAuth\SignatureMethod;
 
 /**
  * The RSA-SHA1 signature method uses the RSASSA-PKCS1-v1_5 signature algorithm as defined in
@@ -10,7 +10,7 @@ namespace Eher\OAuth;
  * specification.
  *   - Chapter 9.3 ("RSA-SHA1")
  */
-abstract class OAuthSignatureMethod_RSA_SHA1 extends OAuthSignatureMethod {
+abstract class RsaSha1 extends SignatureMethod {
   public function get_name() {
     return "RSA-SHA1";
   }

src/Eher/OAuth/SignatureMethod.php

@@ -6,7 +6,7 @@ namespace Eher\OAuth;
  * A class for implementing a Signature Method
  * See section 9 ("Signing Requests") in the spec
  */
-abstract class OAuthSignatureMethod {
+abstract class SignatureMethod {
   /**
    * Needs to return the name of the Signature Method (ie HMAC-SHA1)
    * @return string