Merge branch 'namespace_cleanup'

Conflicts: library/Zend/Feed/Reader/Reader.php
zendframework · Jul 6, 2010 · 6cfcb06 · 6cfcb06
2 parents 1bd47d3 + 573f8ae
commit 6cfcb06
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 15 deletions.
diff --git a/src/AbstractServer.php b/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

diff --git a/src/Cache.php b/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)

diff --git a/src/Reflection/Reflection.php → src/Reflection.php b/src/Reflection/Reflection.php → src/Reflection.php
@@ -23,7 +23,7 @@
 /**
  * @namespace
  */
-namespace Zend\Server\Reflection;
+namespace Zend\Server;
 
 /**
  * Reflection for determining method signatures to use with server classes
@@ -65,14 +65,14 @@ public static function reflectClass($class, $argv = false, $namespace = '')
         } elseif (class_exists($class)) {
             $reflection = new \ReflectionClass($class);
         } else {
-            throw new Exception('Invalid class or object passed to attachClass()');
+            throw new Reflection\Exception('Invalid class or object passed to attachClass()');
         }
 
         if ($argv && !is_array($argv)) {
-            throw new Exception('Invalid argv argument passed to reflectClass');
+            throw new Reflection\Exception('Invalid argv argument passed to reflectClass');
         }
 
-        return new ReflectionClass($reflection, $namespace, $argv);
+        return new Reflection\ReflectionClass($reflection, $namespace, $argv);
     }
 
     /**
@@ -95,14 +95,14 @@ public static function reflectClass($class, $argv = false, $namespace = '')
     public static function reflectFunction($function, $argv = false, $namespace = '')
     {
         if (!is_string($function) || !function_exists($function)) {
-            throw new Exception('Invalid function "' . $function . '" passed to reflectFunction');
+            throw new Reflection\Exception('Invalid function "' . $function . '" passed to reflectFunction');
         }
 
 
         if ($argv && !is_array($argv)) {
-            throw new Exception('Invalid argv argument passed to reflectClass');
+            throw new Reflection\Exception('Invalid argv argument passed to reflectClass');
         }
 
-        return new ReflectionFunction(new \ReflectionFunction($function), $namespace, $argv);
+        return new Reflection\ReflectionFunction(new \ReflectionFunction($function), $namespace, $argv);
     }
 }
diff --git a/src/ServerInterface.php → src/Server.php b/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
@@ -94,7 +94,7 @@ public function handle($request = false);
      * Return a server definition array
      *
      * Returns a server definition array as created using
-     * {@link * \Zend\Server\Reflection\Reflection}. Can be used for server introspection,
+     * {@link * \Zend\Server\Reflection}. Can be used for server introspection,
      * documentation, or persistence.
      *
      * @access public