Zend\Server cleanup

- Renamed Zend\Server\ServerInterface to simply Zend\Server\Server
- Updated code and tests to reflect the above

src/AbstractServer.php

@@ -29,7 +29,7 @@
  * @uses       ReflectionClass
  * @uses       \Zend\Server\Definition
  * @uses       \Zend\Server\Exception
- * @uses       \Zend\Server\ServerInterface
+ * @uses       \Zend\Server\Server
  * @uses       \Zend\Server\Method\Callback
  * @uses       \Zend\Server\Method\Definition
  * @uses       \Zend\Server\Method\Parameter
@@ -40,7 +40,7 @@
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
-abstract class AbstractServer implements ServerInterface
+abstract class AbstractServer implements Server
 {
     /**
      * @deprecated

src/Cache.php

@@ -50,10 +50,10 @@ class Cache
      * on success.
      *
      * @param  string $filename
-     * @param  \Zend\Server\ServerInterface $server
+     * @param  \Zend\Server\Server $server
      * @return bool
      */
-    public static function save($filename, ServerInterface $server)
+    public static function save($filename, Server $server)
     {
         if (!is_string($filename)
             || (!file_exists($filename) && !is_writable(dirname($filename))))
@@ -109,10 +109,10 @@ public static function save($filename, ServerInterface $server)
      * </code>
      *
      * @param  string $filename
-     * @param  \Zend\Server\ServerInterface $server
+     * @param  \Zend\Server\Server $server
      * @return bool
      */
-    public static function get($filename, ServerInterface $server)
+    public static function get($filename, Server $server)
     {
         if (!is_string($filename)
             || !file_exists($filename)

src/ServerInterface.php → src/Server.php

@@ -32,7 +32,7 @@
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
-interface ServerInterface
+interface Server
 {
     /**
      * Attach a function as a server method