Apply namespaces to class inheritances (pt1)

12 files changed, 53 insertions, 24 deletions

diff --git a/framework/Web/Services/TFeedService.php b/framework/Web/Services/TFeedService.php
index 9b0a937d..7b2ece8b 100644
--- a/framework/Web/Services/TFeedService.php
+++ b/framework/Web/Services/TFeedService.php
@@ -11,6 +11,9 @@
  */
 
 namespace Prado\Web\Services;
+use Prado\TApplication;
+use Prado\Exceptions\TConfigurationException;
+use Prado\Exceptions\THttpException;
 
 /**
  * TFeedService class
@@ -57,7 +60,7 @@ namespace Prado\Web\Services;
  * @package Prado\Web\Services
  * @since 3.1
  */
-class TFeedService extends TService
+class TFeedService extends \Prado\TService
 {
 	private $_feeds=array();
 
diff --git a/framework/Web/Services/TJsonResponse.php b/framework/Web/Services/TJsonResponse.php
index 3f7c1a44..401a7d79 100644
--- a/framework/Web/Services/TJsonResponse.php
+++ b/framework/Web/Services/TJsonResponse.php
@@ -24,7 +24,7 @@ namespace Prado\Web\Services;
  * @package Prado\Web\Services
  * @since 3.1
  */
-abstract class TJsonResponse extends TApplicationComponent
+abstract class TJsonResponse extends \Prado\TApplicationComponent
 {
 	private $_id='';
 
diff --git a/framework/Web/Services/TJsonRpcProtocol.php b/framework/Web/Services/TJsonRpcProtocol.php
index 78b7cdc4..e0b30445 100644
--- a/framework/Web/Services/TJsonRpcProtocol.php
+++ b/framework/Web/Services/TJsonRpcProtocol.php
@@ -9,6 +9,7 @@
  */
 
 namespace Prado\Web\Services;
+use Prado\Exceptions\THttpException;
 
 /**
  * TJsonRpcProtocol class
@@ -86,7 +87,7 @@ class TJsonRpcProtocol extends TRpcProtocol
 		{
 			throw $e;
 		}
-		catch(Exception $e)
+		catch(\Exception $e)
 		{
 			return $this->createErrorResponse(new TRpcException('An internal error occured', '-32603'));
 		}
@@ -160,7 +161,7 @@ class TJsonRpcProtocol extends TRpcProtocol
 	{
 		$errnum = json_last_error();
 		if($errnum != JSON_ERROR_NONE)
-			throw new Exception("JSON error: $msg", $err);
+			throw new \Exception("JSON error: $msg", $err);
 	}
 
 	/**
diff --git a/framework/Web/Services/TJsonService.php b/framework/Web/Services/TJsonService.php
index 0f800aff..e5481145 100644
--- a/framework/Web/Services/TJsonService.php
+++ b/framework/Web/Services/TJsonService.php
@@ -10,6 +10,11 @@
  */
 
 namespace Prado\Web\Services;
+use Prado\TApplication;
+use Prado\Prado;
+use Prado\Exceptions\TConfigurationException;
+use Prado\Exceptions\THttpException;
+use Prado\Web\Javascripts\TJavaScript;
 
 /**
  * TJsonService class provides to end-users javascript content response in
@@ -51,7 +56,7 @@ namespace Prado\Web\Services;
  * @package Prado\Web\Services
  * @since 3.1
  */
-class TJsonService extends TService
+class TJsonService extends \Prado\TService
 {
 	/**
 	 * @var array registered services
diff --git a/framework/Web/Services/TPageConfiguration.php b/framework/Web/Services/TPageConfiguration.php
index fe11d3ee..a442ab1c 100644
--- a/framework/Web/Services/TPageConfiguration.php
+++ b/framework/Web/Services/TPageConfiguration.php
@@ -10,6 +10,12 @@
  */
 
 namespace Prado\Web\Services;
+use Prado\Exceptions\TConfigurationException;
+use Prado\Prado;
+use Prado\Security\TAuthorizationRuleCollection;
+use Prado\TApplication;
+use Prado\Xml\TXmlElement;
+use Prado\Xml\TXmlDocument;
 
 /**
  * TPageConfiguration class
@@ -22,7 +28,7 @@ namespace Prado\Web\Services;
  * @package Prado\Web\Services
  * @since 3.0
  */
-class TPageConfiguration extends TComponent
+class TPageConfiguration extends \Prado\TComponent
 {
 	/**
 	 * @var array list of application configurations
diff --git a/framework/Web/Services/TPageService.php b/framework/Web/Services/TPageService.php
index 87640e5a..be865d89 100644
--- a/framework/Web/Services/TPageService.php
+++ b/framework/Web/Services/TPageService.php
@@ -10,13 +10,14 @@
  */
 
 namespace Prado\Web\Services;
-
-/**
- * Include classes to be used by page service
- */
-Prado::using('System.Web.UI.TPage');
-Prado::using('System.Web.UI.TTemplateManager');
-Prado::using('System.Web.UI.TThemeManager');
+use Prado\Prado;
+use Prado\Exceptions\TConfigurationException;
+use Prado\Exceptions\THttpException;
+use Prado\Exceptions\TInvalidOperationException;
+use Prado\TApplication;
+use Prado\TApplicationMode;
+use Prado\Web\UI\TTemplateManager;
+use Prado\Web\UI\TThemeManager;
 
 /**
  * TPageService class.
@@ -74,7 +75,7 @@ Prado::using('System.Web.UI.TThemeManager');
  * @package Prado\Web\Services
  * @since 3.0
  */
-class TPageService extends TService
+class TPageService extends \Prado\TService
 {
 	/**
 	 * Configuration file name
@@ -112,7 +113,7 @@ class TPageService extends TService
 	 * @var string clientscript manager class in namespace format
 	 * @since 3.1.7
 	 */
-	private $_clientScriptManagerClass='System.Web.UI.TClientScriptManager';
+	private $_clientScriptManagerClass='\Prado\Web\UI\TClientScriptManager';
 	/**
 	 * @var string default page
 	 */
@@ -149,7 +150,7 @@ class TPageService extends TService
 	 */
 	public function init($config)
 	{
-		Prado::trace("Initializing TPageService",'System.Web.Services.TPageService');
+		Prado::trace("Initializing TPageService",'\Prado\Web\Services\TPageService');
 
 		$pageConfig=$this->loadPageConfig($config);
 
diff --git a/framework/Web/Services/TRpcApiProvider.php b/framework/Web/Services/TRpcApiProvider.php
index c63ed44d..ce7b5838 100644
--- a/framework/Web/Services/TRpcApiProvider.php
+++ b/framework/Web/Services/TRpcApiProvider.php
@@ -43,7 +43,7 @@ namespace Prado\Web\Services;
  * @package Prado\Web\Services
  * @since 3.2
  */
-abstract class TRpcApiProvider extends TModule
+abstract class TRpcApiProvider extends \Prado\TModule
 {
 	/**
 	 * @var TRpcServer instance
diff --git a/framework/Web/Services/TRpcServer.php b/framework/Web/Services/TRpcServer.php
index 36130c9d..746246c7 100644
--- a/framework/Web/Services/TRpcServer.php
+++ b/framework/Web/Services/TRpcServer.php
@@ -25,7 +25,7 @@ namespace Prado\Web\Services;
  * @package Prado\Web\Services
  * @since 3.2
  **/
-class TRpcServer extends TModule
+class TRpcServer extends \Prado\TModule
 {
 	/**
 	 * @var TRpcProtocol instance
diff --git a/framework/Web/Services/TRpcService.php b/framework/Web/Services/TRpcService.php
index 77bfe254..b1a2bd1d 100644
--- a/framework/Web/Services/TRpcService.php
+++ b/framework/Web/Services/TRpcService.php
@@ -9,6 +9,10 @@
  */
 
 namespace Prado\Web\Services;
+use Prado\Exceptions\TConfigurationException;
+use Prado\Exceptions\THttpException;
+use Prado\Prado;
+use Prado\Xml\TXmlElement;
 
 /**
  * TRpcService class
@@ -53,7 +57,7 @@ namespace Prado\Web\Services;
  * @package Prado\Web\Services
  * @since 3.2
  **/
-class TRpcService extends TService
+class TRpcService extends \Prado\TService
 {
 	/**
 	 * const string base api provider class which every API must extend
diff --git a/framework/Web/Services/TSoapServer.php b/framework/Web/Services/TSoapServer.php
index d6a04a4a..7bfa7d86 100644
--- a/framework/Web/Services/TSoapServer.php
+++ b/framework/Web/Services/TSoapServer.php
@@ -11,6 +11,10 @@
  */
 
 namespace Prado\Web\Services;
+use Prado\Exceptions\TInvalidDataValueException;
+use Prado\TPropertyValue;
+use Prado\Prado;
+use Prado\TApplicationMode;
 
 /**
  * TSoapServer class.
@@ -23,7 +27,7 @@ namespace Prado\Web\Services;
  * @package Prado\Web\Services
  * @since 3.1
  */
-class TSoapServer extends TApplicationComponent
+class TSoapServer extends \Prado\TApplicationComponent
 {
 	const WSDL_CACHE_PREFIX='wsdl.';
 
@@ -82,7 +86,7 @@ class TSoapServer extends TApplicationComponent
 		{
 			$server->handle();
 		}
-		catch (Exception $e)
+		catch (\Exception $e)
 		{
 			if($this->getApplication()->getMode()===TApplicationMode::Debug)
 				$this->fault($e->getMessage(), $e->__toString());
@@ -143,7 +147,7 @@ class TSoapServer extends TApplicationComponent
 		{
 			if($this->getApplication()->getMode()===TApplicationMode::Debug)
 				ini_set("soap.wsdl_cache_enabled",0);
-			$this->_server = new SoapServer($this->getWsdlUri(),$this->getOptions());
+			$this->_server = new \SoapServer($this->getWsdlUri(),$this->getOptions());
 		}
 		return $this->_server;
 	}
diff --git a/framework/Web/Services/TSoapService.php b/framework/Web/Services/TSoapService.php
index f77737e2..5760f63c 100644
--- a/framework/Web/Services/TSoapService.php
+++ b/framework/Web/Services/TSoapService.php
@@ -11,6 +11,10 @@
  */
 
 namespace Prado\Web\Services;
+use Prado\Exceptions\THttpException;
+use Prado\Prado;
+use Prado\TApplication;
+use Prado\Xml\TXmlDocument;
 
 /**
  * TSoapService class
@@ -88,7 +92,7 @@ namespace Prado\Web\Services;
  * @package Prado\Web\Services
  * @since 3.1
  */
-class TSoapService extends TService
+class TSoapService extends \Prado\TService
 {
 	const DEFAULT_SOAP_SERVER='TSoapServer';
 	private $_servers=array();
diff --git a/framework/Web/Services/TXmlRpcProtocol.php b/framework/Web/Services/TXmlRpcProtocol.php
index b200fe2e..9b62d7ab 100644
--- a/framework/Web/Services/TXmlRpcProtocol.php
+++ b/framework/Web/Services/TXmlRpcProtocol.php
@@ -9,6 +9,7 @@
  */
 
 namespace Prado\Web\Services;
+use Prado\Exceptions\THttpException;
 
 /**
  * TXmlRpcProtocol class
@@ -80,7 +81,7 @@ class TXmlRpcProtocol extends TRpcProtocol
 		{
 			throw $e;
 		}
-		catch(Exception $e)
+		catch(\Exception $e)
 		{
 			return $this->createErrorResponse(new TRpcException('An internal error occured'));
 		}