Merge pull request #1 from Cyrille37/master

Add root namespace on Exception class

Author: weberhofer

org/jsonrpcphp/JsonRPCClient.class.php

@@ -101,15 +101,15 @@ public function __call($method,$params) {
 
 			// check
 			if (!is_scalar($method)) {
-				throw new Exception('Method name has no scalar value');
+				throw new \Exception('Method name has no scalar value');
 			}
 
 			// check
 			if (is_array($params)) {
 				// no keys
 				$params = array_values($params);
 			} else {
-				throw new Exception('Params must be given as array');
+				throw new \Exception('Params must be given as array');
 			}
 
 			// sets notification or request task
@@ -146,7 +146,7 @@ public function __call($method,$params) {
 				curl_setopt($ch, CURLOPT_POSTFIELDS, $request);
 				$response = curl_exec($ch);
 				if ( $response === false ) {
-					throw new Exception('Unable to connect to '.$this->url);
+					throw new \Exception('Unable to connect to '.$this->url);
 				}
 			} else {
 				if ($fp = fopen($this->url, 'r', false, $context)) {
@@ -155,7 +155,7 @@ public function __call($method,$params) {
 						$response.= trim($row)."\n";
 					}
 				} else {
-					throw new Exception('Unable to connect to '.$this->url);
+					throw new \Exception('Unable to connect to '.$this->url);
 				}
 			}
 			$this->debug && $this->debug.='***** Response *****'."\n".$response."\n".'***** End of Response *****'."\n\n";
@@ -184,4 +184,4 @@ public function __call($method,$params) {
 		}
 	}
 }
-?>
+?>

org/jsonrpcphp/JsonRPCServer.class.php

@@ -58,7 +58,7 @@ public static function handle( $object ) {
 				$response = array ( 'id' => $request['id'], 'result' => NULL, 'error' => NULL ); 
 				try {
 					$response['result'] = call_user_func_array( array( $object, $request['method']), $request['params']);
-				} catch (Exception $e) {
+				} catch (\Exception $e) {
 					$response['result'] = null;
 					$response['error'] = $e->getMessage();
 				}
@@ -74,4 +74,4 @@ public static function handle( $object ) {
 		}
 	}
 }
-?>
+?>