[zen-49] Sort import statements

- Import statements should be sorted alphabetically
zendframework · Jul 9, 2012 · 62fffaa · 62fffaa
1 parent 9341c48
commit 62fffaa
Show file tree

Hide file tree

Showing 12 changed files with 17 additions and 21 deletions.
diff --git a/src/Decoder.php b/src/Decoder.php
@@ -10,8 +10,8 @@
 
 namespace Zend\Json;
 
-use Zend\Json\Exception\RuntimeException;
 use Zend\Json\Exception\InvalidArgumentException;
+use Zend\Json\Exception\RuntimeException;
 
 /**
  * Decode JSON encoded string to PHP variable constructs
@@ -550,4 +550,3 @@ protected static function _utf162utf8($utf16)
         return '';
     }
 }
-
diff --git a/src/Encoder.php b/src/Encoder.php
@@ -10,8 +10,8 @@
 
 namespace Zend\Json;
 
-use Zend\Json\Exception\RecursionException;
 use Zend\Json\Exception\InvalidArgumentException;
+use Zend\Json\Exception\RecursionException;
 
 /**
  * Encode PHP constructs to JSON
@@ -568,4 +568,3 @@ protected static function _utf82utf16($utf8)
         return '';
     }
 }
-
diff --git a/src/Exception/InvalidArgumentException.php b/src/Exception/InvalidArgumentException.php
@@ -14,7 +14,6 @@
  * @category   Zend
  * @package    Zend_Json
  */
-class InvalidArgumentException
-    extends \InvalidArgumentException
-    implements ExceptionInterface
+class InvalidArgumentException extends \InvalidArgumentException implements 
+    ExceptionInterface
 {}
diff --git a/src/Exception/RuntimeException.php b/src/Exception/RuntimeException.php
@@ -14,7 +14,5 @@
  * @category   Zend
  * @package    Zend_Json
  */
-class RuntimeException
-    extends \RuntimeException
-    implements ExceptionInterface
+class RuntimeException extends \RuntimeException implements ExceptionInterface
 {}
diff --git a/src/Json.php b/src/Json.php
@@ -10,8 +10,8 @@
 
 namespace Zend\Json;
 
-use Zend\Json\Exception\RuntimeException;
 use Zend\Json\Exception\RecursionException;
+use Zend\Json\Exception\RuntimeException;
 
 /**
  * Class for encoding to and decoding from JSON.

diff --git a/src/Server/Cache.php b/src/Server/Cache.php
@@ -10,14 +10,16 @@
 
 namespace Zend\Json\Server;
 
+use Zend\Server\Cache as ServerCache;
+
 /**
  * Zend_Json_Server_Cache: cache Zend_Json_Server server definition and SMD
  *
  * @category   Zend
  * @package    Zend_Json
  * @subpackage Server
  */
-class Cache extends \Zend\Server\Cache
+class Cache extends ServerCache
 {
     /**
      * Cache a service map description (SMD) to a file

diff --git a/src/Server/Error.php b/src/Server/Error.php
@@ -183,4 +183,3 @@ public function __toString()
         return $this->toJson();
     }
 }
-
diff --git a/src/Server/Exception/InvalidArgumentException.php b/src/Server/Exception/InvalidArgumentException.php
@@ -17,7 +17,6 @@
  * @package    Zend_Json
  * @subpackage Server
  */
-class InvalidArgumentException
-    extends Exception\InvalidArgumentException
-    implements ExceptionInterface
+class InvalidArgumentException extends Exception\InvalidArgumentException implements 
+    ExceptionInterface
 {}
diff --git a/src/Server/Exception/RuntimeException.php b/src/Server/Exception/RuntimeException.php
@@ -17,7 +17,6 @@
  * @package    Zend_Json
  * @subpackage Server
  */
-class RuntimeException
-    extends Exception\RuntimeException
-    implements ExceptionInterface
+class RuntimeException extends Exception\RuntimeException implements 
+    ExceptionInterface
 {}
diff --git a/src/Server/Request.php b/src/Server/Request.php
@@ -9,6 +9,7 @@
  */
 
 namespace Zend\Json\Server;
+
 use Zend\Json;
 
 /**

diff --git a/src/Server/Smd.php b/src/Server/Smd.php
@@ -9,6 +9,7 @@
  */
 
 namespace Zend\Json\Server;
+
 use Zend\Json\Server\Exception\InvalidArgumentException;
 use Zend\Json\Server\Exception\RuntimeException;
 
@@ -458,4 +459,3 @@ public function __toString()
         return $this->toJson();
     }
 }
-
diff --git a/src/Server/Smd/Service.php b/src/Server/Smd/Service.php
@@ -9,9 +9,10 @@
  */
 
 namespace Zend\Json\Server\Smd;
-use Zend\Json\Server\Smd;
+
 use Zend\Json\Server;
 use Zend\Json\Server\Exception\InvalidArgumentException;
+use Zend\Json\Server\Smd;
 
 /**
  * Create Service Mapping Description for a method