HMAC_SHA1 to HMACSHA1

Author: Adrian Slade

lib/OAuth/SignatureMethod/HMAC_SHA1.php lib/OAuth/SignatureMethod/HMACSHA1.php

@@ -8,7 +8,7 @@
  * character (ASCII code 38) even if empty.
  *   - Chapter 9.2 ("HMAC-SHA1")
  */
-class HMAC_SHA1 extends SignatureMethod {
+class HMACSHA1 extends SignatureMethod {
   function get_name() {
     return "HMAC-SHA1";
   }

tests/OAuthRequestTest.php

@@ -291,7 +291,7 @@ public function testBuildSignature() {
 		$cons = new Consumer('key', 'kd94hf93k423kf44');
 		$token = new Token('token', 'pfkkdhi9sl3r4s00');
 
-		$hmac = new OAuth\SignatureMethod\HMAC_SHA1();
+		$hmac = new OAuth\SignatureMethod\HMACSHA1();
 		$plaintext = new OAuth\SignatureMethod\PLAINTEXT();
 
 		$this->assertEquals('tR3+Ty81lMeYAr/Fid0kMTYa/WM=', $r->build_signature($hmac, $cons, $token));
@@ -308,7 +308,7 @@ public function testSign() {
 		$cons = new Consumer('key', 'kd94hf93k423kf44');
 		$token = new Token('token', 'pfkkdhi9sl3r4s00');
 
-		$hmac = new OAuth\SignatureMethod\HMAC_SHA1();
+		$hmac = new OAuth\SignatureMethod\HMACSHA1();
 		$plaintext = new OAuth\SignatureMethod\PLAINTEXT();
 
 		// We need to test both what the parameter is, and how the serialized request is..

tests/OAuthServerTest.php

@@ -26,7 +26,7 @@ public function setUp() {
 		$this->request_token  = new Token('requestkey', 'requestsecret');
 		$this->access_token   = new Token('accesskey', 'accesssecret');
 
-		$this->hmac_sha1      = new OAuth\SignatureMethod\HMAC_SHA1();
+		$this->hmac_sha1      = new OAuth\SignatureMethod\HMACSHA1();
 		$this->plaintext      = new OAuth\SignatureMethod\PLAINTEXT();
 
 		$this->server         = new \OAuth\Server( new Mock_OAuthDataStore() );

tests/OAuthSignatureMethodHmacSha1Test.php

@@ -1,5 +1,5 @@
 <?php
-use OAuth\SignatureMethod\HMAC_SHA1;
+use OAuth\SignatureMethod\HMACSHA1;
 use OAuth\Consumer;
 use OAuth\Token;
 
@@ -10,7 +10,7 @@ class SignatureMethodHmacSha1Test extends PHPUnit_Framework_TestCase {
 	private $method;
 
 	public function setUp() {
-		$this->method = new HMAC_SHA1();
+		$this->method = new HMACSHA1();
 	}
 
 	public function testIdentifyAsHmacSha1() {

tests/common.php

@@ -11,7 +11,7 @@
 require dirname(__FILE__).'/../lib/OAuth/Util.php';
 require dirname(__FILE__).'/../lib/OAuth/SignatureMethod/SignatureMethod.php';
 require dirname(__FILE__).'/../lib/OAuth/SignatureMethod/RSA_SHA1.php';
-require dirname(__FILE__).'/../lib/OAuth/SignatureMethod/HMAC_SHA1.php';
+require dirname(__FILE__).'/../lib/OAuth/SignatureMethod/HMACSHA1.php';
 require dirname(__FILE__).'/../lib/OAuth/SignatureMethod/PLAINTEXT.php';
 
 /**