Merge branch 'master' of git://github.com/zendframework/zf2

zendframework · Jul 5, 2012 · 226aada · 226aada
commit 226aada
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 84 deletions.
diff --git a/.travis/run-tests.sh b/.travis/run-tests.sh
diff --git a/.travis/skipped-components b/.travis/skipped-components
diff --git a/.travis/tested-components b/.travis/tested-components
diff --git a/src/Client.php b/src/Client.php
@@ -395,7 +395,7 @@ public function getClassmap()
     public function setEncoding($encoding)
     {
         if (!is_string($encoding)) {
-            throw new ClientException('Invalid encoding specified');
+            throw new Exception\InvalidArgumentException('Invalid encoding specified');
         }
 
         $this->_encoding = $encoding;

diff --git a/src/Server.php b/src/Server.php
@@ -796,7 +796,7 @@ public function handle($request = null)
         $setRequestException = null;
         try {
             $this->_setRequest($request);
-        } catch (Exception $e) {
+        } catch (\Exception $e) {
             $setRequestException = $e;
         }