From 7e0b0798997b197d57d09ef5e690afdb1e6a2712 Mon Sep 17 00:00:00 2001 From: xue <> Date: Thu, 29 Dec 2005 01:16:29 +0000 Subject: Changed module init() method signature. --- framework/Web/Services/TPageService.php | 12 +++++------- framework/Web/THttpRequest.php | 3 +-- framework/Web/THttpResponse.php | 4 +--- framework/Web/THttpSession.php | 4 +--- framework/Web/UI/TAssetManager.php | 4 +--- framework/Web/UI/TPageStatePersister.php | 3 +-- framework/Web/UI/TTemplateManager.php | 4 +--- framework/Web/UI/TThemeManager.php | 3 +-- 8 files changed, 12 insertions(+), 25 deletions(-) (limited to 'framework/Web') diff --git a/framework/Web/Services/TPageService.php b/framework/Web/Services/TPageService.php index 6288da5c..5723269f 100644 --- a/framework/Web/Services/TPageService.php +++ b/framework/Web/Services/TPageService.php @@ -144,10 +144,8 @@ class TPageService extends TService * This method is required by IService interface and is invoked by application. * @param TXmlElement service configuration */ - public function init($config=null) + public function init($config) { - parent::init($config); - $application=$this->getApplication(); $application->setPageService($this); @@ -288,7 +286,7 @@ class TPageService extends TService if(!$this->_templateManager) { $this->_templateManager=new TTemplateManager; - $this->_templateManager->init(); + $this->_templateManager->init(null); } return $this->_templateManager; } @@ -309,7 +307,7 @@ class TPageService extends TService if(!$this->_assetManager) { $this->_assetManager=new TAssetManager; - $this->_assetManager->init(); + $this->_assetManager->init(null); } return $this->_assetManager; } @@ -330,7 +328,7 @@ class TPageService extends TService if(!$this->_themeManager) { $this->_themeManager=new TThemeManager; - $this->_themeManager->init(); + $this->_themeManager->init(null); } return $this->_themeManager; } @@ -351,7 +349,7 @@ class TPageService extends TService if(!$this->_pageStatePersister) { $this->_pageStatePersister=new TPageStatePersister; - $this->_pageStatePersister->init(); + $this->_pageStatePersister->init(null); } return $this->_pageStatePersister; } diff --git a/framework/Web/THttpRequest.php b/framework/Web/THttpRequest.php index df8c8c3d..c3c9e33d 100644 --- a/framework/Web/THttpRequest.php +++ b/framework/Web/THttpRequest.php @@ -72,9 +72,8 @@ class THttpRequest extends TModule * This method is required by IModule and is invoked by application. * @param TXmlElement module configuration */ - public function init($config=null) + public function init($config) { - parent::init($config); // Info about server variables: // PHP_SELF contains real URI (w/ path info, w/o query string) // SCRIPT_NAME is the real URI for the requested script (w/o path info and query string) diff --git a/framework/Web/THttpResponse.php b/framework/Web/THttpResponse.php index c947f9fb..ba2f607c 100644 --- a/framework/Web/THttpResponse.php +++ b/framework/Web/THttpResponse.php @@ -77,10 +77,8 @@ class THttpResponse extends TModule implements ITextWriter * It starts output buffer if it is enabled. * @param TXmlElement module configuration */ - public function init($config=null) + public function init($config) { - parent::init($config); - if($this->_bufferOutput) ob_start(); $this->_initialized=true; diff --git a/framework/Web/THttpSession.php b/framework/Web/THttpSession.php index d7b1acfa..7dfc708d 100644 --- a/framework/Web/THttpSession.php +++ b/framework/Web/THttpSession.php @@ -83,10 +83,8 @@ class THttpSession extends TModule * If AutoStart is true, the session will be started. * @param TXmlElement module configuration */ - public function init($config=null) + public function init($config) { - parent::init($config); - if($this->_autoStart) session_start(); $this->_initialized=true; diff --git a/framework/Web/UI/TAssetManager.php b/framework/Web/UI/TAssetManager.php index d15e4788..0cce2c27 100644 --- a/framework/Web/UI/TAssetManager.php +++ b/framework/Web/UI/TAssetManager.php @@ -73,10 +73,8 @@ class TAssetManager extends TModule * This method is required by IModule and is invoked by application. * @param TXmlElement module configuration */ - public function init($config=null) + public function init($config) { - parent::init($config); - $application=$this->getApplication(); if($this->_basePath===null) $this->_basePath=dirname($application->getRequest()->getPhysicalApplicationPath()).'/'.self::DEFAULT_BASEPATH; diff --git a/framework/Web/UI/TPageStatePersister.php b/framework/Web/UI/TPageStatePersister.php index 988a2938..9c9954de 100644 --- a/framework/Web/UI/TPageStatePersister.php +++ b/framework/Web/UI/TPageStatePersister.php @@ -9,9 +9,8 @@ class TPageStatePersister extends TModule implements IStatePersister * This method is required by IModule interface. * @param TXmlElement module configuration */ - public function init($config=null) + public function init($config) { - parent::init($config); $this->getService()->setPageStatePersister($this); } diff --git a/framework/Web/UI/TTemplateManager.php b/framework/Web/UI/TTemplateManager.php index 544c346f..0187dfd9 100644 --- a/framework/Web/UI/TTemplateManager.php +++ b/framework/Web/UI/TTemplateManager.php @@ -44,10 +44,8 @@ class TTemplateManager extends TModule * It starts output buffer if it is enabled. * @param TXmlElement module configuration */ - public function init($config=null) + public function init($config) { - parent::init($config); - $this->getService()->setTemplateManager($this); } diff --git a/framework/Web/UI/TThemeManager.php b/framework/Web/UI/TThemeManager.php index 8c7f40a7..bbcd35a6 100644 --- a/framework/Web/UI/TThemeManager.php +++ b/framework/Web/UI/TThemeManager.php @@ -60,9 +60,8 @@ class TThemeManager extends TModule * This method is required by IModule and is invoked by application. * @param TXmlElement module configuration */ - public function init($config=null) + public function init($config) { - parent::init($config); $this->_initialized=true; $this->getService()->setThemeManager($this); } -- cgit v1.2.3