From e2fa21dc4419915d36441dfbd27b3e440a5fb47d Mon Sep 17 00:00:00 2001
From: Eher <alexandre@eher.com.br>
Date: Wed, 8 Feb 2012 22:31:18 -0200
Subject: [PATCH 1/4] Namespace from signatures methods was changed

---
 .../HmacSha1.php}                                             | 4 ++--
 .../PlainText.php}                                            | 4 ++--
 .../RsaSha1.php}                                              | 4 ++--
 .../SignatureMethod.php}                                      | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)
 rename src/Eher/OAuth/{OAuthSignatureMethod_HMAC_SHA1.php => SignatureMethod/HmacSha1.php} (90%)
 rename src/Eher/OAuth/{OAuthSignatureMethod_PLAINTEXT.php => SignatureMethod/PlainText.php} (91%)
 rename src/Eher/OAuth/{OAuthSignatureMethod_RSA_SHA1.php => SignatureMethod/RsaSha1.php} (96%)
 rename src/Eher/OAuth/{OAuthSignatureMethod.php => SignatureMethod/SignatureMethod.php} (93%)

diff --git a/src/Eher/OAuth/OAuthSignatureMethod_HMAC_SHA1.php b/src/Eher/OAuth/SignatureMethod/HmacSha1.php
similarity index 90%
rename from src/Eher/OAuth/OAuthSignatureMethod_HMAC_SHA1.php
rename to src/Eher/OAuth/SignatureMethod/HmacSha1.php
index 2da7fc4..d7a2d7b 100644
--- a/src/Eher/OAuth/OAuthSignatureMethod_HMAC_SHA1.php
+++ b/src/Eher/OAuth/SignatureMethod/HmacSha1.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Eher\OAuth;
+namespace Eher\OAuth\SignatureMethod;
 
 /**
  * The HMAC-SHA1 signature method uses the HMAC-SHA1 signature algorithm as defined in [RFC2104]
@@ -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";
   }
diff --git a/src/Eher/OAuth/OAuthSignatureMethod_PLAINTEXT.php b/src/Eher/OAuth/SignatureMethod/PlainText.php
similarity index 91%
rename from src/Eher/OAuth/OAuthSignatureMethod_PLAINTEXT.php
rename to src/Eher/OAuth/SignatureMethod/PlainText.php
index 05e3670..8a74833 100644
--- a/src/Eher/OAuth/OAuthSignatureMethod_PLAINTEXT.php
+++ b/src/Eher/OAuth/SignatureMethod/PlainText.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace Eher\OAuth;
+namespace Eher\OAuth\SignatureMethod;
 
 /**
  * The PLAINTEXT method does not provide any security protection and SHOULD only be used
  * 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";
   }
diff --git a/src/Eher/OAuth/OAuthSignatureMethod_RSA_SHA1.php b/src/Eher/OAuth/SignatureMethod/RsaSha1.php
similarity index 96%
rename from src/Eher/OAuth/OAuthSignatureMethod_RSA_SHA1.php
rename to src/Eher/OAuth/SignatureMethod/RsaSha1.php
index 39e0196..a749ce3 100644
--- a/src/Eher/OAuth/OAuthSignatureMethod_RSA_SHA1.php
+++ b/src/Eher/OAuth/SignatureMethod/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";
   }
diff --git a/src/Eher/OAuth/OAuthSignatureMethod.php b/src/Eher/OAuth/SignatureMethod/SignatureMethod.php
similarity index 93%
rename from src/Eher/OAuth/OAuthSignatureMethod.php
rename to src/Eher/OAuth/SignatureMethod/SignatureMethod.php
index fd43470..825eb7a 100644
--- a/src/Eher/OAuth/OAuthSignatureMethod.php
+++ b/src/Eher/OAuth/SignatureMethod/SignatureMethod.php
@@ -1,12 +1,12 @@
 <?php
 
-namespace Eher\OAuth;
+namespace Eher\OAuth\SignatureMethod;
 
 /**
  * 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

From 2187cd8b441ab555336410e45c95d9906ae03b1a Mon Sep 17 00:00:00 2001
From: Eher <alexandre@eher.com.br>
Date: Wed, 8 Feb 2012 22:42:21 -0200
Subject: [PATCH 2/4] Ignore files

---
 .gitignore | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 .gitignore

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..4b59381
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,3 @@
+*.swp
+composer.lock
+composer.phar

From 67680e1564f772e47af128dcae2a9cc828562e5c Mon Sep 17 00:00:00 2001
From: Eher <alexandre@eher.com.br>
Date: Wed, 8 Feb 2012 22:44:20 -0200
Subject: [PATCH 3/4] Composer project data fixed

---
 composer.json | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/composer.json b/composer.json
index b4af2ed..edd9218 100644
--- a/composer.json
+++ b/composer.json
@@ -7,11 +7,12 @@
     "psr-0": {
         "OAuth": "src/"
     },
-    "authors": 
-    {
-        "name": "Andy Smith",
-        "homepage": "http://term.ie/"
-    },
+    "authors":[
+        {
+            "name": "Andy Smith",
+            "homepage": "http://term.ie/"
+        }
+    ],
     "require": {
         "php": ">=5.3.0"
     }

From 9cc377d653afc464b898665e073afc760be935d0 Mon Sep 17 00:00:00 2001
From: Eher <alexandre@eher.com.br>
Date: Wed, 8 Feb 2012 23:35:31 -0200
Subject: [PATCH 4/4] SignatureMethod removed from namespace

---
 src/Eher/OAuth/{SignatureMethod => }/HmacSha1.php        | 2 +-
 src/Eher/OAuth/{SignatureMethod => }/PlainText.php       | 2 +-
 src/Eher/OAuth/{SignatureMethod => }/RsaSha1.php         | 0
 src/Eher/OAuth/{SignatureMethod => }/SignatureMethod.php | 2 +-
 4 files changed, 3 insertions(+), 3 deletions(-)
 rename src/Eher/OAuth/{SignatureMethod => }/HmacSha1.php (96%)
 rename src/Eher/OAuth/{SignatureMethod => }/PlainText.php (96%)
 rename src/Eher/OAuth/{SignatureMethod => }/RsaSha1.php (100%)
 rename src/Eher/OAuth/{SignatureMethod => }/SignatureMethod.php (96%)

diff --git a/src/Eher/OAuth/SignatureMethod/HmacSha1.php b/src/Eher/OAuth/HmacSha1.php
similarity index 96%
rename from src/Eher/OAuth/SignatureMethod/HmacSha1.php
rename to src/Eher/OAuth/HmacSha1.php
index d7a2d7b..b02b45b 100644
--- a/src/Eher/OAuth/SignatureMethod/HmacSha1.php
+++ b/src/Eher/OAuth/HmacSha1.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Eher\OAuth\SignatureMethod;
+namespace Eher\OAuth;
 
 /**
  * The HMAC-SHA1 signature method uses the HMAC-SHA1 signature algorithm as defined in [RFC2104]
diff --git a/src/Eher/OAuth/SignatureMethod/PlainText.php b/src/Eher/OAuth/PlainText.php
similarity index 96%
rename from src/Eher/OAuth/SignatureMethod/PlainText.php
rename to src/Eher/OAuth/PlainText.php
index 8a74833..6f3ade7 100644
--- a/src/Eher/OAuth/SignatureMethod/PlainText.php
+++ b/src/Eher/OAuth/PlainText.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Eher\OAuth\SignatureMethod;
+namespace Eher\OAuth;
 
 /**
  * The PLAINTEXT method does not provide any security protection and SHOULD only be used
diff --git a/src/Eher/OAuth/SignatureMethod/RsaSha1.php b/src/Eher/OAuth/RsaSha1.php
similarity index 100%
rename from src/Eher/OAuth/SignatureMethod/RsaSha1.php
rename to src/Eher/OAuth/RsaSha1.php
diff --git a/src/Eher/OAuth/SignatureMethod/SignatureMethod.php b/src/Eher/OAuth/SignatureMethod.php
similarity index 96%
rename from src/Eher/OAuth/SignatureMethod/SignatureMethod.php
rename to src/Eher/OAuth/SignatureMethod.php
index 825eb7a..bad2b9f 100644
--- a/src/Eher/OAuth/SignatureMethod/SignatureMethod.php
+++ b/src/Eher/OAuth/SignatureMethod.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Eher\OAuth\SignatureMethod;
+namespace Eher\OAuth;
 
 /**
  * A class for implementing a Signature Method