Horde_Oauth_SignatureMethod_Base -> Horde_Oauth_SignatureMethod

diff --git a/framework/Oauth/lib/Horde/Oauth/SignatureMethod.php b/framework/Oauth/lib/Horde/Oauth/SignatureMethod.php
new file mode 100644 (file)
index 0000000..990491b
--- /dev/null
+++ b/framework/Oauth/lib/Horde/Oauth/SignatureMethod.php
@@ -0,0 +1,29 @@
+<?php
+/**
+ * Copyright 2008-2010 The Horde Project (http://www.horde.org/)
+ *
+ * @author   Chuck Hagenbuch <chuck@horde.org>
+ * @license  http://opensource.org/licenses/bsd-license.php BSD
+ * @category Horde
+ * @package  Horde_Oauth
+ */
+
+/**
+ * OAuth abstract signature method base class
+ *
+ * @author   Chuck Hagenbuch <chuck@horde.org>
+ * @license  http://opensource.org/licenses/bsd-license.php BSD
+ * @category Horde
+ * @package  Horde_Oauth
+ */
+abstract class Horde_Oauth_SignatureMethod
+{
+    abstract public function getName();
+
+    abstract public function sign($request, $consumer, $token);
+
+    public function verify($signature, $request, $consumer, $token)
+    {
+        return $signature == $this->sign($request, $consumer, $token);
+    }
+}

diff --git a/framework/Oauth/lib/Horde/Oauth/SignatureMethod/Base.php b/framework/Oauth/lib/Horde/Oauth/SignatureMethod/Base.php
deleted file mode 100644 (file)
index 4cd16cd..0000000
--- a/framework/Oauth/lib/Horde/Oauth/SignatureMethod/Base.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-/**
- * Copyright 2008-2010 The Horde Project (http://www.horde.org/)
- *
- * @author   Chuck Hagenbuch <chuck@horde.org>
- * @license  http://opensource.org/licenses/bsd-license.php BSD
- * @category Horde
- * @package  Horde_Oauth
- */
-
-/**
- * OAuth abstract signature method base class
- *
- * @author   Chuck Hagenbuch <chuck@horde.org>
- * @license  http://opensource.org/licenses/bsd-license.php BSD
- * @category Horde
- * @package  Horde_Oauth
- */
-abstract class Horde_Oauth_SignatureMethod_Base
-{
-    abstract public function getName();
-
-    abstract public function sign($request, $consumer, $token);
-
-    public function verify($signature, $request, $consumer, $token)
-    {
-        return $signature == $this->sign($request, $consumer, $token);
-    }
-}

diff --git a/framework/Oauth/lib/Horde/Oauth/SignatureMethod/HmacSha1.php b/framework/Oauth/lib/Horde/Oauth/SignatureMethod/HmacSha1.php
index d3fb9a7..1e7f69d 100644 (file)
--- a/framework/Oauth/lib/Horde/Oauth/SignatureMethod/HmacSha1.php
+++ b/framework/Oauth/lib/Horde/Oauth/SignatureMethod/HmacSha1.php
@@ -16,7 +16,7 @@
  * @category Horde
  * @package  Horde_Oauth
  */
-class Horde_Oauth_SignatureMethod_HmacSha1 extends Horde_Oauth_SignatureMethod_Base
+class Horde_Oauth_SignatureMethod_HmacSha1 extends Horde_Oauth_SignatureMethod
 {
     public function getName()
     {

diff --git a/framework/Oauth/lib/Horde/Oauth/SignatureMethod/Plaintext.php b/framework/Oauth/lib/Horde/Oauth/SignatureMethod/Plaintext.php
index 4e9fd8a..b12a078 100644 (file)
--- a/framework/Oauth/lib/Horde/Oauth/SignatureMethod/Plaintext.php
+++ b/framework/Oauth/lib/Horde/Oauth/SignatureMethod/Plaintext.php
@@ -16,7 +16,7 @@
  * @category Horde
  * @package  Horde_Oauth
  */
-class Horde_Oauth_SignatureMethod_Plaintext extends Horde_Oauth_SignatureMethod_Base
+class Horde_Oauth_SignatureMethod_Plaintext extends Horde_Oauth_SignatureMethod
 {
     public function getName()
     {

diff --git a/framework/Oauth/lib/Horde/Oauth/SignatureMethod/RsaSha1.php b/framework/Oauth/lib/Horde/Oauth/SignatureMethod/RsaSha1.php
index c118de7..2072db3 100644 (file)
--- a/framework/Oauth/lib/Horde/Oauth/SignatureMethod/RsaSha1.php
+++ b/framework/Oauth/lib/Horde/Oauth/SignatureMethod/RsaSha1.php
@@ -16,7 +16,7 @@
  * @category Horde
  * @package  Horde_Oauth
  */
-class Horde_Oauth_SignatureMethod_RsaSha1 extends Horde_Oauth_SignatureMethod_Base
+class Horde_Oauth_SignatureMethod_RsaSha1 extends Horde_Oauth_SignatureMethod
 {
     public function __construct($publicKey = null, $privateKey = null)
     {

diff --git a/framework/Oauth/package.xml b/framework/Oauth/package.xml
index 9c03736..91893ae 100644 (file)
--- a/framework/Oauth/package.xml
+++ b/framework/Oauth/package.xml
@@ -33,7 +33,6 @@ http://pear.php.net/dtd/package-2.0.xsd">
     <dir name="Horde">
      <dir name="Oauth">
       <dir name="SignatureMethod">
-       <file name="Base.php" role="php" />
        <file name="HmacSha1.php" role="php" />
        <file name="Plaintext.php" role="php" />
        <file name="RsaSha1.php" role="php" />
@@ -41,6 +40,7 @@ http://pear.php.net/dtd/package-2.0.xsd">
       <file name="Consumer.php" role="php" />
       <file name="Exception.php" role="php" />
       <file name="Request.php" role="php" />
+      <file name="SignatureMethod.php" role="php" />
       <file name="Token.php" role="php" />
       <file name="Utils.php" role="php" />
      </dir> <!-- /lib/Horde/Oauth -->