From a57ead00a69cd5240dd7549fa3a7da8d4e717749 Mon Sep 17 00:00:00 2001 From: "ctrlaltca@gmail.com" <> Date: Mon, 20 Jun 2011 13:30:47 +0000 Subject: further polishing --- framework/Base/TBehavior.php | 12 ++++++------ framework/Base/TEvent.php | 4 ++-- framework/Base/TModel.php | 6 +++--- framework/Base/TModelBehavior.php | 18 +++++++++--------- framework/Base/TModelEvent.php | 10 +++++----- framework/Data/Common/TDbCommandBuilder.php | 4 +--- 6 files changed, 26 insertions(+), 28 deletions(-) (limited to 'framework') diff --git a/framework/Base/TBehavior.php b/framework/Base/TBehavior.php index b2833140..4e0b8454 100644 --- a/framework/Base/TBehavior.php +++ b/framework/Base/TBehavior.php @@ -1,6 +1,6 @@ * @link http://www.yiiframework.com/ @@ -9,7 +9,7 @@ */ /** - * CBehavior is a convenient base class for behavior classes. + * TBehavior is a convenient base class for behavior classes. * @author Qiang Xue * @version $Id: CBehavior.php 564 2009-01-21 22:07:10Z qiang.xue $ * @package system.base @@ -38,7 +38,7 @@ class TBehavior extends TComponent implements IBehavior * The default implementation will set the {@link owner} property * and attach event handlers as declared in {@link events}. * Make sure you call the parent implementation if you override this method. - * @param CComponent the component that this behavior is to be attached to. + * @param TComponent the component that this behavior is to be attached to. */ public function attach($owner) { @@ -52,7 +52,7 @@ class TBehavior extends TComponent implements IBehavior * The default implementation will unset the {@link owner} property * and detach event handlers declared in {@link events}. * Make sure you call the parent implementation if you override this method. - * @param CComponent the component that this behavior is to be detached from. + * @param TComponent the component that this behavior is to be detached from. */ public function detach($owner) { @@ -101,12 +101,12 @@ interface IBehavior { /** * Attaches the behavior object to the component. - * @param CComponent the component that this behavior is to be attached to. + * @param TComponent the component that this behavior is to be attached to. */ public function attach($component); /** * Detaches the behavior object from the component. - * @param CComponent the component that this behavior is to be detached from. + * @param TComponent the component that this behavior is to be detached from. */ public function detach($component); /** diff --git a/framework/Base/TEvent.php b/framework/Base/TEvent.php index 0f64e89d..c09816d1 100644 --- a/framework/Base/TEvent.php +++ b/framework/Base/TEvent.php @@ -1,6 +1,6 @@ - * @version $Id: CComponent.php 978 2009-05-06 03:36:09Z qiang.xue $ + * @version $Id: TEvent.php 978 2009-05-06 03:36:09Z qiang.xue $ * @package system.base * @since 1.0 */ diff --git a/framework/Base/TModel.php b/framework/Base/TModel.php index 14368b33..e05f26b6 100644 --- a/framework/Base/TModel.php +++ b/framework/Base/TModel.php @@ -11,12 +11,12 @@ Prado::using('System.Base.TModelEvent'); /** - * CModel is the base class providing the common features needed by data model objects. + * TModel is the base class providing the common features needed by data model objects. * - * CModel defines the basic framework for data models that need to be validated. + * TModel defines the basic framework for data models that need to be validated. * * @author Qiang Xue - * @version $Id: CModel.php 1093 2009-06-05 13:09:17Z qiang.xue $ + * @version $Id: TModel.php 1093 2009-06-05 13:09:17Z qiang.xue $ * @package system.base * @since 1.0 */ diff --git a/framework/Base/TModelBehavior.php b/framework/Base/TModelBehavior.php index a5182e8f..901c9948 100644 --- a/framework/Base/TModelBehavior.php +++ b/framework/Base/TModelBehavior.php @@ -1,6 +1,6 @@ * @link http://www.yiiframework.com/ @@ -9,10 +9,10 @@ */ /** - * CModelBehavior is a base class for behaviors that are attached to a model component. + * TModelBehavior is a base class for behaviors that are attached to a model component. * The model should extend from {@link CModel} or its child classes. * @author Qiang Xue - * @version $Id: CModelBehavior.php 1082 2009-06-01 12:03:00Z qiang.xue $ + * @version $Id: TModelBehavior.php 1082 2009-06-01 12:03:00Z qiang.xue $ * @package system.base * @since 1.0.2 */ @@ -26,7 +26,7 @@ class TModelBehavior extends TBehavior * The default implementation returns 'onBeforeValidate' and 'onAfterValidate' events and handlers. * If you override this method, make sure you merge the parent result to the return value. * @return array events (array keys) and the corresponding event handler methods (array values). - * @see CBehavior::events + * @see TBehavior::events */ public function events() { @@ -37,19 +37,19 @@ class TModelBehavior extends TBehavior } /** - * Responds to {@link CModel::onBeforeValidate} event. + * Responds to {@link TModel::onBeforeValidate} event. * Overrides this method if you want to handle the corresponding event of the {@link owner}. - * You may set {@link CModelEvent::isValid} to be false if you want to stop the current validation process. - * @param CModelEvent event parameter + * You may set {@link TModelEvent::isValid} to be false if you want to stop the current validation process. + * @param TModelEvent event parameter */ public function beforeValidate($event) { } /** - * Responds to {@link CModel::onAfterValidate} event. + * Responds to {@link TModel::onAfterValidate} event. * Overrides this method if you want to handle the corresponding event of the {@link owner}. - * @param CEvent event parameter + * @param TEvent event parameter */ public function afterValidate($event) { diff --git a/framework/Base/TModelEvent.php b/framework/Base/TModelEvent.php index 1bf42a2b..c785b997 100644 --- a/framework/Base/TModelEvent.php +++ b/framework/Base/TModelEvent.php @@ -1,6 +1,6 @@ * @link http://www.yiiframework.com/ @@ -11,12 +11,12 @@ Prado::using('System.Base.TEvent'); /** - * CModelEvent class. + * TModelEvent class. * - * CModelEvent represents the event parameters needed by events raised by a model. + * TModelEvent represents the event parameters needed by events raised by a model. * * @author Qiang Xue - * @version $Id: CModelEvent.php 1093 2009-06-05 13:09:17Z qiang.xue $ + * @version $Id: TModelEvent.php 1093 2009-06-05 13:09:17Z qiang.xue $ * @package system.base * @since 1.0 */ @@ -24,7 +24,7 @@ class TModelEvent extends TEvent { /** * @var boolean whether the model is valid. Defaults to true. - * If this is set false, {@link CModel::validate()} will return false and quit the current validation process. + * If this is set false, {@link TModel::validate()} will return false and quit the current validation process. */ public $isValid=true; } diff --git a/framework/Data/Common/TDbCommandBuilder.php b/framework/Data/Common/TDbCommandBuilder.php index 0dc13e7e..ee58d4b4 100644 --- a/framework/Data/Common/TDbCommandBuilder.php +++ b/framework/Data/Common/TDbCommandBuilder.php @@ -108,7 +108,7 @@ class TDbCommandBuilder extends TComponent foreach($ordering as $name => $direction) { $direction = strtolower($direction) == 'desc' ? 'DESC' : 'ASC'; - if(strpos($name, '(') && strpos($name, ')')) { + if(false !== strpos($name, '(') && false !== strpos($name, ')')) { // key is a function (bad practice, but we need to handle it) $key = $name; } else { @@ -505,5 +505,3 @@ class TDbCommandBuilder extends TComponent return false; } } - -?> \ No newline at end of file -- cgit v1.2.3