From e2149e3d8b87b382563a9def6f376a5f289754d3 Mon Sep 17 00:00:00 2001 From: xue <> Date: Fri, 12 May 2006 12:38:32 +0000 Subject: Merge from 3.0 branch till 1054. --- framework/Web/Javascripts/TJSON.php | 1 - framework/Web/TAssetManager.php | 5 +++-- framework/Web/THttpResponse.php | 2 +- framework/Web/THttpSession.php | 10 ++++++---- framework/Web/UI/TThemeManager.php | 2 +- framework/Web/UI/WebControls/TBaseValidator.php | 3 ++- framework/Web/UI/WebControls/TMultiView.php | 2 +- 7 files changed, 14 insertions(+), 11 deletions(-) (limited to 'framework/Web') diff --git a/framework/Web/Javascripts/TJSON.php b/framework/Web/Javascripts/TJSON.php index e653264b..63f77b40 100644 --- a/framework/Web/Javascripts/TJSON.php +++ b/framework/Web/Javascripts/TJSON.php @@ -45,7 +45,6 @@ * USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH * DAMAGE. * -* @category * @package System.Web.Javascripts * @author Michal Migurski * @author Matt Knapp diff --git a/framework/Web/TAssetManager.php b/framework/Web/TAssetManager.php index f3ebe7c3..f9fe156f 100644 --- a/framework/Web/TAssetManager.php +++ b/framework/Web/TAssetManager.php @@ -111,7 +111,7 @@ class TAssetManager extends TModule throw new TInvalidOperationException('assetmanager_basepath_unchangeable'); else { - $this->_basePath=Prado::getPathOfAlias($value); + $this->_basePath=Prado::getPathOfNamespace($value); if($this->_basePath===null || !is_dir($this->_basePath) || !is_writable($this->_basePath)) throw new TInvalidDataValueException('assetmanage_basepath_invalid',$value); } @@ -148,7 +148,8 @@ class TAssetManager extends TModule * @param boolean If true, file modification time will be checked even if the application * is in performance mode. * @return string an absolute URL to the published directory - * @throw TInvalidDataValueException if the file path to be published is invalid + * @throws TInvalidDataValueException if the file path to be published is + * invalid */ public function publishFilePath($path,$checkTimestamp=false) { diff --git a/framework/Web/THttpResponse.php b/framework/Web/THttpResponse.php index ce4bf4b1..582a3db3 100644 --- a/framework/Web/THttpResponse.php +++ b/framework/Web/THttpResponse.php @@ -129,7 +129,7 @@ class THttpResponse extends TModule implements ITextWriter } /** - * @string content type, default is text/html + * @return string content type, default is text/html */ public function setContentType($type) { diff --git a/framework/Web/THttpSession.php b/framework/Web/THttpSession.php index fa53022d..13526dd1 100644 --- a/framework/Web/THttpSession.php +++ b/framework/Web/THttpSession.php @@ -45,14 +45,16 @@ * request module. It can be accessed via {@link TApplication::getSession()}. * * THttpSession may be configured in application configuration file as follows, + * * + * * where {@link getSessionName SessionName}, {@link getSavePath SavePath}, - * {@link getCookieMode CookieMode}, {@link getUseCustomStorage UseCustomStorage}, - * {@link getAutoStart AutoStart}, {@link getGCProbability GCProbability}, - * {@link getUseTransparentSessionID UseTransparentSessionID} and - * {@link getTimeOut TimeOut} are configurable properties of THttpSession. + * {@link getCookieMode CookieMode}, {@link getUseCustomStorage + * UseCustomStorage}, {@link getAutoStart AutoStart}, {@link getGCProbability + * GCProbability}, {@link getUseTransparentSessionID UseTransparentSessionID} + * and {@link getTimeOut TimeOut} are configurable properties of THttpSession. * * @author Qiang Xue * @version $Revision: $ $Date: $ diff --git a/framework/Web/UI/TThemeManager.php b/framework/Web/UI/TThemeManager.php index 83032684..7ae36556 100644 --- a/framework/Web/UI/TThemeManager.php +++ b/framework/Web/UI/TThemeManager.php @@ -104,7 +104,7 @@ class TThemeManager extends TModule throw new TInvalidOperationException('thememanager_basepath_unchangeable'); else { - $this->_basePath=Prado::getPathOfAlias($value); + $this->_basePath=Prado::getPathOfNamespace($value); if($this->_basePath===null || !is_dir($this->_basePath)) throw new TInvalidDataValueException('thememanager_basepath_invalid',$value); } diff --git a/framework/Web/UI/WebControls/TBaseValidator.php b/framework/Web/UI/WebControls/TBaseValidator.php index c39db85a..ffdfd057 100644 --- a/framework/Web/UI/WebControls/TBaseValidator.php +++ b/framework/Web/UI/WebControls/TBaseValidator.php @@ -414,7 +414,8 @@ abstract class TBaseValidator extends TLabel implements IValidator /** * @return TControl control to be validated. Null if no control is found. - * @throw TConfigurationException if {@link getControlToValidate ControlToValidate} is empty or does not point to a valid control + * @throws TConfigurationException if {@link getControlToValidate + * ControlToValidate} is empty or does not point to a valid control */ protected function getValidationTarget() { diff --git a/framework/Web/UI/WebControls/TMultiView.php b/framework/Web/UI/WebControls/TMultiView.php index 6dd0d8f1..59b9f53d 100644 --- a/framework/Web/UI/WebControls/TMultiView.php +++ b/framework/Web/UI/WebControls/TMultiView.php @@ -369,7 +369,7 @@ class TView extends TControl /** * @param boolean - * @throw TInvalidOperationException whenever this method is invoked. + * @throws TInvalidOperationException whenever this method is invoked. */ public function setVisible($value) { -- cgit v1.2.3