Error202
/
yii2-bootstrap
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

cleaned up @since

tags/2.0.0-beta
Alexander Makarov 13 years ago
parent
4a8259ff8c
commit
f8ea58826e
15 changed files with 16 additions and 134 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 5
      framework/base/Application.php
  2. 1
      framework/base/Module.php
  3. 7
      framework/db/Migration.php
  4. 68
      framework/db/ar/ActiveRecord.php
  5. 3
      framework/db/ar/ActiveRecordBehavior.php
  6. 33
      framework/db/dao/Command.php
  7. 7
      framework/db/dao/Query.php
  8. 6
      framework/db/dao/QueryBuilder.php
  9. 2
      framework/db/dao/mysql/QueryBuilder.php
  10. 3
      framework/logging/ProfileTarget.php
  11. 2
      framework/logging/WebTarget.php
  12. 2
      framework/validators/DateValidator.php
  13. 3
      framework/validators/ExistValidator.php
  14. 2
      framework/validators/FileValidator.php
  15. 4
      framework/validators/UniqueValidator.php

5
framework/base/Application.php
Unescape View File

@ -321,7 +321,6 @@ abstract class Application extends Module
* This is a simple wrapper of PHP function date_default_timezone_get(). * This is a simple wrapper of PHP function date_default_timezone_get().
* @return string the time zone used by this application. * @return string the time zone used by this application.
* @see http://php.net/manual/en/function.date-default-timezone-get.php * @see http://php.net/manual/en/function.date-default-timezone-get.php
* @since 1.0.9
*/ */
public function getTimeZone() public function getTimeZone()
{ {
@ -333,7 +332,6 @@ abstract class Application extends Module
* This is a simple wrapper of PHP function date_default_timezone_set(). * This is a simple wrapper of PHP function date_default_timezone_set().
* @param string $value the time zone used by this application. * @param string $value the time zone used by this application.
* @see http://php.net/manual/en/function.date-default-timezone-set.php * @see http://php.net/manual/en/function.date-default-timezone-set.php
* @since 1.0.9
*/ */
public function setTimeZone($value) public function setTimeZone($value)
{ {
@ -384,7 +382,6 @@ abstract class Application extends Module
/** /**
* Returns the directory that contains the locale data. * Returns the directory that contains the locale data.
* @return string the directory that contains the locale data. It defaults to 'framework/i18n/data'. * @return string the directory that contains the locale data. It defaults to 'framework/i18n/data'.
* @since 1.1.0
*/ */
public function getLocaleDataPath() public function getLocaleDataPath()
{ {
@ -394,7 +391,6 @@ abstract class Application extends Module
/** /**
* Sets the directory that contains the locale data. * Sets the directory that contains the locale data.
* @param string $value the directory that contains the locale data. * @param string $value the directory that contains the locale data.
* @since 1.1.0
*/ */
public function setLocaleDataPath($value) public function setLocaleDataPath($value)
{ {
@ -503,7 +499,6 @@ abstract class Application extends Module
/** /**
* @return CController the currently active controller. Null is returned in this base class. * @return CController the currently active controller. Null is returned in this base class.
* @since 1.1.8
*/ */
public function getController() public function getController()
{ {

1
framework/base/Module.php
Unescape View File

@ -273,7 +273,6 @@ abstract class Module extends Component
* Returns a value indicating whether the specified module is installed. * Returns a value indicating whether the specified module is installed.
* @param string $id the module ID * @param string $id the module ID
* @return boolean whether the specified module is installed. * @return boolean whether the specified module is installed.
* @since 1.1.2
*/ */
public function hasModule($id) public function hasModule($id)
{ {

7
framework/db/Migration.php
Unescape View File

@ -30,9 +30,9 @@
* @author Qiang Xue <qiang.xue@gmail.com> * @author Qiang Xue <qiang.xue@gmail.com>
* @version $Id: CDbMigration.php 3218 2011-05-13 00:06:44Z alexander.makarow $ * @version $Id: CDbMigration.php 3218 2011-05-13 00:06:44Z alexander.makarow $
* @package system.db * @package system.db
* @since 1.1.6 * @since 2.0
*/ */
abstract class CDbMigration extends CComponent abstract class CDbMigration extends yii\base\Component
{ {
private $_db; private $_db;
@ -94,7 +94,6 @@ abstract class CDbMigration extends CComponent
* Child classes may implement this method instead of {@link up} if the DB logic * Child classes may implement this method instead of {@link up} if the DB logic
* needs to be within a transaction. * needs to be within a transaction.
* @return boolean * @return boolean
* @since 1.1.7
*/ */
public function safeUp() public function safeUp()
{ {
@ -107,7 +106,6 @@ abstract class CDbMigration extends CComponent
* Child classes may implement this method instead of {@link up} if the DB logic * Child classes may implement this method instead of {@link up} if the DB logic
* needs to be within a transaction. * needs to be within a transaction.
* @return boolean * @return boolean
* @since 1.1.7
*/ */
public function safeDown() public function safeDown()
{ {
@ -146,7 +144,6 @@ abstract class CDbMigration extends CComponent
* This method executes the specified SQL statement using {@link dbConnection}. * This method executes the specified SQL statement using {@link dbConnection}.
* @param string $sql the SQL statement to be executed * @param string $sql the SQL statement to be executed
* @param array $params input parameters (name=>value) for the SQL execution. See {@link CDbCommand::execute} for more details. * @param array $params input parameters (name=>value) for the SQL execution. See {@link CDbCommand::execute} for more details.
* @since 1.1.7
*/ */
public function execute($sql, $params = array()) public function execute($sql, $params = array())
{ {

68
framework/db/ar/ActiveRecord.php
Unescape View File

@ -53,7 +53,7 @@ $post->save();
* @author Qiang Xue <qiang.xue@gmail.com> * @author Qiang Xue <qiang.xue@gmail.com>
* @version $Id: ActiveRecord.php 3344 2011-07-06 22:04:50Z alexander.makarow $ * @version $Id: ActiveRecord.php 3344 2011-07-06 22:04:50Z alexander.makarow $
* @package system.db.ar * @package system.db.ar
* @since 1.0 * @since 2.0
* *
* @property array $attributes * @property array $attributes
*/ */
@ -111,7 +111,6 @@ abstract class ActiveRecord extends \yii\base\Model
* @param integer $queryCount number of SQL queries that need to be cached after calling this method. Defaults to 1, * @param integer $queryCount number of SQL queries that need to be cached after calling this method. Defaults to 1,
* meaning that the next SQL query will be cached. * meaning that the next SQL query will be cached.
* @return ActiveRecord the active record instance itself. * @return ActiveRecord the active record instance itself.
* @since 1.1.7
*/ */
public function cache($duration, $dependency = null, $queryCount = 1) public function cache($duration, $dependency = null, $queryCount = 1)
{ {
@ -174,7 +173,6 @@ abstract class ActiveRecord extends \yii\base\Model
* if the named attribute is null or not. * if the named attribute is null or not.
* @param string $name the property name or the event name * @param string $name the property name or the event name
* @return boolean whether the property value is null * @return boolean whether the property value is null
* @since 1.0.1
*/ */
public function __isset($name) public function __isset($name)
{ {
@ -195,7 +193,6 @@ abstract class ActiveRecord extends \yii\base\Model
* This method overrides the parent implementation by clearing * This method overrides the parent implementation by clearing
* the specified attribute value. * the specified attribute value.
* @param string $name the property name or the event name * @param string $name the property name or the event name
* @since 1.0.1
*/ */
public function __unset($name) public function __unset($name)
{ {
@ -214,7 +211,6 @@ abstract class ActiveRecord extends \yii\base\Model
* @param string $name the method name * @param string $name the method name
* @param array $parameters method parameters * @param array $parameters method parameters
* @return mixed the method return value * @return mixed the method return value
* @since 1.0.5
*/ */
public function __call($name, $parameters) public function __call($name, $parameters)
{ {
@ -249,7 +245,6 @@ abstract class ActiveRecord extends \yii\base\Model
* This parameter has been available since version 1.0.5. * This parameter has been available since version 1.0.5.
* @return mixed the related object(s). * @return mixed the related object(s).
* @throws CDbException if the relation is not specified in {@link relations}. * @throws CDbException if the relation is not specified in {@link relations}.
* @since 1.0.2
*/ */
public function getRelated($name, $refresh = false, $params = array()) public function getRelated($name, $refresh = false, $params = array())
{ {
@ -307,7 +302,6 @@ abstract class ActiveRecord extends \yii\base\Model
* Returns a value indicating whether the named related object(s) has been loaded. * Returns a value indicating whether the named related object(s) has been loaded.
* @param string $name the relation name * @param string $name the relation name
* @return boolean a value indicating whether the named related object(s) has been loaded. * @return boolean a value indicating whether the named related object(s) has been loaded.
* @since 1.0.3
*/ */
public function hasRelated($name) public function hasRelated($name)
{ {
@ -320,7 +314,6 @@ abstract class ActiveRecord extends \yii\base\Model
* @return CDbCriteria the query criteria that is associated with this model. * @return CDbCriteria the query criteria that is associated with this model.
* This criteria is mainly used by {@link scopes named scope} feature to accumulate * This criteria is mainly used by {@link scopes named scope} feature to accumulate
* different criteria specifications. * different criteria specifications.
* @since 1.0.5
*/ */
public function getDbCriteria($createIfNull = true) public function getDbCriteria($createIfNull = true)
{ {
@ -335,7 +328,6 @@ abstract class ActiveRecord extends \yii\base\Model
/** /**
* Sets the query criteria for the current model. * Sets the query criteria for the current model.
* @param CDbCriteria $criteria the query criteria * @param CDbCriteria $criteria the query criteria
* @since 1.1.3
*/ */
public function setDbCriteria($criteria) public function setDbCriteria($criteria)
{ {
@ -349,7 +341,6 @@ abstract class ActiveRecord extends \yii\base\Model
* if the model needs to be queried with some default criteria (e.g. only active records should be returned). * if the model needs to be queried with some default criteria (e.g. only active records should be returned).
* @return array the query criteria. This will be used as the parameter to the constructor * @return array the query criteria. This will be used as the parameter to the constructor
* of {@link CDbCriteria}. * of {@link CDbCriteria}.
* @since 1.0.5
*/ */
public function defaultScope() public function defaultScope()
{ {
@ -360,7 +351,6 @@ abstract class ActiveRecord extends \yii\base\Model
* Resets all scopes and criterias applied including default scope. * Resets all scopes and criterias applied including default scope.
* *
* @return ActiveRecord * @return ActiveRecord
* @since 1.1.2
*/ */
public function resetScope() public function resetScope()
{ {
@ -415,7 +405,6 @@ abstract class ActiveRecord extends \yii\base\Model
* This is useful if the table schema has been changed and you want to use the latest * This is useful if the table schema has been changed and you want to use the latest
* available table schema. Make sure you have called {@link CDbSchema::refresh} * available table schema. Make sure you have called {@link CDbSchema::refresh}
* before you call this method. Otherwise, old table schema data will still be used. * before you call this method. Otherwise, old table schema data will still be used.
* @since 1.0.8
*/ */
public function refreshMetaData() public function refreshMetaData()
{ {
@ -446,7 +435,6 @@ abstract class ActiveRecord extends \yii\base\Model
* If the key is a single column, it should return the column name; * If the key is a single column, it should return the column name;
* If the key is a composite one consisting of several columns, it should * If the key is a composite one consisting of several columns, it should
* return the array of the key column names. * return the array of the key column names.
* @since 1.0.4
*/ */
public function primaryKey() public function primaryKey()
{ {
@ -566,7 +554,6 @@ abstract class ActiveRecord extends \yii\base\Model
* @return array the scope definition. The array keys are scope names; the array * @return array the scope definition. The array keys are scope names; the array
* values are the corresponding scope definitions. Each scope definition is represented * values are the corresponding scope definitions. Each scope definition is represented
* as an array whose keys must be properties of {@link CDbCriteria}. * as an array whose keys must be properties of {@link CDbCriteria}.
* @since 1.0.5
*/ */
public function scopes() public function scopes()
{ {
@ -577,7 +564,6 @@ abstract class ActiveRecord extends \yii\base\Model
* Returns the list of all attribute names of the model. * Returns the list of all attribute names of the model.
* This would return all column names of the table associated with this AR class. * This would return all column names of the table associated with this AR class.
* @return array list of attribute names. * @return array list of attribute names.
* @since 1.0.1
*/ */
public function attributeNames() public function attributeNames()
{ {
@ -593,7 +579,6 @@ abstract class ActiveRecord extends \yii\base\Model
* @param string $attribute the attribute name * @param string $attribute the attribute name
* @return string the attribute label * @return string the attribute label
* @see generateAttributeLabel * @see generateAttributeLabel
* @since 1.1.4
*/ */
public function getAttributeLabel($attribute) public function getAttributeLabel($attribute)
{ {
@ -834,7 +819,6 @@ abstract class ActiveRecord extends \yii\base\Model
* This event is raised before the record is saved. * This event is raised before the record is saved.
* By setting {@link CModelEvent::isValid} to be false, the normal {@link save()} process will be stopped. * By setting {@link CModelEvent::isValid} to be false, the normal {@link save()} process will be stopped.
* @param CModelEvent $event the event parameter * @param CModelEvent $event the event parameter
* @since 1.0.2
*/ */
public function onBeforeSave($event) public function onBeforeSave($event)
{ {
@ -844,7 +828,6 @@ abstract class ActiveRecord extends \yii\base\Model
/** /**
* This event is raised after the record is saved. * This event is raised after the record is saved.
* @param CEvent $event the event parameter * @param CEvent $event the event parameter
* @since 1.0.2
*/ */
public function onAfterSave($event) public function onAfterSave($event)
{ {
@ -855,7 +838,6 @@ abstract class ActiveRecord extends \yii\base\Model
* This event is raised before the record is deleted. * This event is raised before the record is deleted.
* By setting {@link CModelEvent::isValid} to be false, the normal {@link delete()} process will be stopped. * By setting {@link CModelEvent::isValid} to be false, the normal {@link delete()} process will be stopped.
* @param CModelEvent $event the event parameter * @param CModelEvent $event the event parameter
* @since 1.0.2
*/ */
public function onBeforeDelete($event) public function onBeforeDelete($event)
{ {
@ -865,7 +847,6 @@ abstract class ActiveRecord extends \yii\base\Model
/** /**
* This event is raised after the record is deleted. * This event is raised after the record is deleted.
* @param CEvent $event the event parameter * @param CEvent $event the event parameter
* @since 1.0.2
*/ */
public function onAfterDelete($event) public function onAfterDelete($event)
{ {
@ -880,7 +861,6 @@ abstract class ActiveRecord extends \yii\base\Model
* You can modify either criteria to customize them based on needs. * You can modify either criteria to customize them based on needs.
* @param CModelEvent $event the event parameter * @param CModelEvent $event the event parameter
* @see beforeFind * @see beforeFind
* @since 1.0.9
*/ */
public function onBeforeFind($event) public function onBeforeFind($event)
{ {
@ -890,7 +870,6 @@ abstract class ActiveRecord extends \yii\base\Model
/** /**
* This event is raised after the record is instantiated by a find method. * This event is raised after the record is instantiated by a find method.
* @param CEvent $event the event parameter * @param CEvent $event the event parameter
* @since 1.0.2
*/ */
public function onAfterFind($event) public function onAfterFind($event)
{ {
@ -971,8 +950,6 @@ abstract class ActiveRecord extends \yii\base\Model
* *
* Starting from version 1.1.5, this method may be called with a hidden {@link CDbCriteria} * Starting from version 1.1.5, this method may be called with a hidden {@link CDbCriteria}
* parameter which represents the current query criteria as passed to a find method of AR. * parameter which represents the current query criteria as passed to a find method of AR.
*
* @since 1.0.9
*/ */
protected function beforeFind() protected function beforeFind()
{ {
@ -1000,7 +977,6 @@ abstract class ActiveRecord extends \yii\base\Model
/** /**
* Calls {@link beforeFind}. * Calls {@link beforeFind}.
* This method is internally used. * This method is internally used.
* @since 1.0.11
*/ */
public function beforeFindInternal() public function beforeFindInternal()
{ {
@ -1010,7 +986,6 @@ abstract class ActiveRecord extends \yii\base\Model
/** /**
* Calls {@link afterFind}. * Calls {@link afterFind}.
* This method is internally used. * This method is internally used.
* @since 1.0.3
*/ */
public function afterFindInternal() public function afterFindInternal()
{ {
@ -1153,7 +1128,6 @@ abstract class ActiveRecord extends \yii\base\Model
* @param array $counters the counters to be updated (column name=>increment value) * @param array $counters the counters to be updated (column name=>increment value)
* @return boolean whether the saving is successful * @return boolean whether the saving is successful
* @see updateCounters * @see updateCounters
* @since 1.1.8
*/ */
public function saveCounters($counters) public function saveCounters($counters)
{ {
@ -1256,7 +1230,6 @@ abstract class ActiveRecord extends \yii\base\Model
* After calling this method, the old primary key value can be obtained from {@link oldPrimaryKey}. * After calling this method, the old primary key value can be obtained from {@link oldPrimaryKey}.
* @param mixed $value the new primary key value. If the primary key is composite, the new value * @param mixed $value the new primary key value. If the primary key is composite, the new value
* should be provided as an array (column name=>column value). * should be provided as an array (column name=>column value).
* @since 1.1.0
*/ */
public function setPrimaryKey($value) public function setPrimaryKey($value)
{ {
@ -1278,7 +1251,6 @@ abstract class ActiveRecord extends \yii\base\Model
* The value remains unchanged even if the primary key attribute is manually assigned with a different value. * The value remains unchanged even if the primary key attribute is manually assigned with a different value.
* @return mixed the old primary key value. An array (column name=>column value) is returned if the primary key is composite. * @return mixed the old primary key value. An array (column name=>column value) is returned if the primary key is composite.
* If primary key is not defined, null will be returned. * If primary key is not defined, null will be returned.
* @since 1.1.0
*/ */
public function getOldPrimaryKey() public function getOldPrimaryKey()
{ {
@ -1288,7 +1260,6 @@ abstract class ActiveRecord extends \yii\base\Model
/** /**
* Sets the old primary key value. * Sets the old primary key value.
* @param mixed $value the old primary key value. * @param mixed $value the old primary key value.
* @since 1.1.3
*/ */
public function setOldPrimaryKey($value) public function setOldPrimaryKey($value)
{ {
@ -1301,7 +1272,6 @@ abstract class ActiveRecord extends \yii\base\Model
* @param CDbCriteria $criteria the query criteria * @param CDbCriteria $criteria the query criteria
* @param boolean $all whether to return all data * @param boolean $all whether to return all data
* @return mixed the AR objects populated with the query result * @return mixed the AR objects populated with the query result
* @since 1.1.7
*/ */
protected function query($criteria, $all = false) protected function query($criteria, $all = false)
{ {
@ -1326,7 +1296,6 @@ abstract class ActiveRecord extends \yii\base\Model
* This method merges {@link dbCriteria} with the given criteria parameter. * This method merges {@link dbCriteria} with the given criteria parameter.
* It then resets {@link dbCriteria} to be null. * It then resets {@link dbCriteria} to be null.
* @param CDbCriteria $criteria the query criteria. This parameter may be modified by merging {@link dbCriteria}. * @param CDbCriteria $criteria the query criteria. This parameter may be modified by merging {@link dbCriteria}.
* @since 1.0.12
*/ */
public function applyScopes(&$criteria) public function applyScopes(&$criteria)
{ {
@ -1382,7 +1351,6 @@ abstract class ActiveRecord extends \yii\base\Model
* This parameter must be set false when calling this method in {@link defaultScope}. * This parameter must be set false when calling this method in {@link defaultScope}.
* An infinite loop would be formed otherwise. * An infinite loop would be formed otherwise.
* @return string the default table alias * @return string the default table alias
* @since 1.1.1
*/ */
public function getTableAlias($quote = false, $checkScopes = true) public function getTableAlias($quote = false, $checkScopes = true)
{ {
@ -1396,7 +1364,6 @@ abstract class ActiveRecord extends \yii\base\Model
/** /**
* Sets the table alias to be used in queries. * Sets the table alias to be used in queries.
* @param string $alias the table alias to be used in queries. The alias should NOT be quoted. * @param string $alias the table alias to be used in queries. The alias should NOT be quoted.
* @since 1.1.3
*/ */
public function setTableAlias($alias) public function setTableAlias($alias)
{ {
@ -1578,7 +1545,6 @@ abstract class ActiveRecord extends \yii\base\Model
* @param mixed $condition query condition or criteria. * @param mixed $condition query condition or criteria.
* @param array $params parameters to be bound to an SQL statement. * @param array $params parameters to be bound to an SQL statement.
* @return string the number of rows satisfying the specified query condition. Note: type is string to keep max. precision. * @return string the number of rows satisfying the specified query condition. Note: type is string to keep max. precision.
* @since 1.1.4
*/ */
public function countByAttributes($attributes, $condition = '', $params = array()) public function countByAttributes($attributes, $condition = '', $params = array())
{ {
@ -1686,7 +1652,6 @@ abstract class ActiveRecord extends \yii\base\Model
* This is only used in relational AR query. Please refer to {@link CDbCriteria::together} * This is only used in relational AR query. Please refer to {@link CDbCriteria::together}
* for more details. * for more details.
* @return ActiveRecord the AR object itself * @return ActiveRecord the AR object itself
* @since 1.1.4
*/ */
public function together() public function together()
{ {
@ -1792,7 +1757,6 @@ abstract class ActiveRecord extends \yii\base\Model
* @param mixed $condition query condition or criteria. * @param mixed $condition query condition or criteria.
* @param array $params parameters to be bound to an SQL statement. * @param array $params parameters to be bound to an SQL statement.
* @return integer number of rows affected by the execution. * @return integer number of rows affected by the execution.
* @since 1.0.9
*/ */
public function deleteAllByAttributes($attributes, $condition = '', $params = array()) public function deleteAllByAttributes($attributes, $condition = '', $params = array())
{ {
@ -1873,7 +1837,6 @@ abstract class ActiveRecord extends \yii\base\Model
* you may implement the so-called single-table inheritance mapping. * you may implement the so-called single-table inheritance mapping.
* @param array $attributes list of attribute values for the active records. * @param array $attributes list of attribute values for the active records.
* @return ActiveRecord the active record * @return ActiveRecord the active record
* @since 1.0.2
*/ */
protected function instantiate($attributes) protected function instantiate($attributes)
{ {
@ -1887,7 +1850,6 @@ abstract class ActiveRecord extends \yii\base\Model
* This method is required by the interface ArrayAccess. * This method is required by the interface ArrayAccess.
* @param mixed $offset the offset to check on * @param mixed $offset the offset to check on
* @return boolean * @return boolean
* @since 1.0.2
*/ */
public function offsetExists($offset) public function offsetExists($offset)
{ {
@ -1901,7 +1863,6 @@ abstract class ActiveRecord extends \yii\base\Model
* @author Qiang Xue <qiang.xue@gmail.com> * @author Qiang Xue <qiang.xue@gmail.com>
* @version $Id: ActiveRecord.php 3344 2011-07-06 22:04:50Z alexander.makarow $ * @version $Id: ActiveRecord.php 3344 2011-07-06 22:04:50Z alexander.makarow $
* @package system.db.ar * @package system.db.ar
* @since 1.0.4
*/ */
class CBaseActiveRelation extends CComponent class CBaseActiveRelation extends CComponent
{ {
@ -1941,7 +1902,6 @@ class CBaseActiveRelation extends CComponent
/** /**
* @var string how to join with other tables. This refers to the JOIN clause in an SQL statement. * @var string how to join with other tables. This refers to the JOIN clause in an SQL statement.
* For example, <code>'LEFT JOIN users ON users.id=authorID'</code>. * For example, <code>'LEFT JOIN users ON users.id=authorID'</code>.
* @since 1.1.3
*/ */
public $join = ''; public $join = '';
/** /**
@ -1975,7 +1935,6 @@ class CBaseActiveRelation extends CComponent
* Merges this relation with a criteria specified dynamically. * Merges this relation with a criteria specified dynamically.
* @param array $criteria the dynamically specified criteria * @param array $criteria the dynamically specified criteria
* @param boolean $fromScope whether the criteria to be merged is from scopes * @param boolean $fromScope whether the criteria to be merged is from scopes
* @since 1.0.5
*/ */
public function mergeWith($criteria, $fromScope = false) public function mergeWith($criteria, $fromScope = false)
{ {
@ -2044,7 +2003,6 @@ class CBaseActiveRelation extends CComponent
* @author Qiang Xue <qiang.xue@gmail.com> * @author Qiang Xue <qiang.xue@gmail.com>
* @version $Id: ActiveRecord.php 3344 2011-07-06 22:04:50Z alexander.makarow $ * @version $Id: ActiveRecord.php 3344 2011-07-06 22:04:50Z alexander.makarow $
* @package system.db.ar * @package system.db.ar
* @since 1.0.4
*/ */
class CStatRelation extends CBaseActiveRelation class CStatRelation extends CBaseActiveRelation
{ {
@ -2063,7 +2021,6 @@ class CStatRelation extends CBaseActiveRelation
* Merges this relation with a criteria specified dynamically. * Merges this relation with a criteria specified dynamically.
* @param array $criteria the dynamically specified criteria * @param array $criteria the dynamically specified criteria
* @param boolean $fromScope whether the criteria to be merged is from scopes * @param boolean $fromScope whether the criteria to be merged is from scopes
* @since 1.0.5
*/ */
public function mergeWith($criteria, $fromScope = false) public function mergeWith($criteria, $fromScope = false)
{ {
@ -2082,7 +2039,7 @@ class CStatRelation extends CBaseActiveRelation
* @author Qiang Xue <qiang.xue@gmail.com> * @author Qiang Xue <qiang.xue@gmail.com>
* @version $Id: ActiveRecord.php 3344 2011-07-06 22:04:50Z alexander.makarow $ * @version $Id: ActiveRecord.php 3344 2011-07-06 22:04:50Z alexander.makarow $
* @package system.db.ar * @package system.db.ar
* @since 1.0 * @since 2.0
*/ */
class CActiveRelation extends CBaseActiveRelation class CActiveRelation extends CBaseActiveRelation
{ {
@ -2092,13 +2049,11 @@ class CActiveRelation extends CBaseActiveRelation
public $joinType = 'LEFT OUTER JOIN'; public $joinType = 'LEFT OUTER JOIN';
/** /**
* @var string ON clause. The condition specified here will be appended to the joining condition using AND operator. * @var string ON clause. The condition specified here will be appended to the joining condition using AND operator.
* @since 1.0.2
*/ */
public $on = ''; public $on = '';
/** /**
* @var string the alias for the table that this relation refers to. Defaults to null, meaning * @var string the alias for the table that this relation refers to. Defaults to null, meaning
* the alias will be the same as the relation name. * the alias will be the same as the relation name.
* @since 1.0.1
*/ */
public $alias; public $alias;
/** /**
@ -2123,7 +2078,6 @@ class CActiveRelation extends CBaseActiveRelation
* <li>Single scope: 'scopes'=>'scopeName'.</li> * <li>Single scope: 'scopes'=>'scopeName'.</li>
* <li>Multiple scopes: 'scopes'=>array('scopeName1','scopeName2').</li> * <li>Multiple scopes: 'scopes'=>array('scopeName1','scopeName2').</li>
* </ul> * </ul>
* @since 1.1.9
*/ */
public $scopes; public $scopes;
@ -2131,7 +2085,6 @@ class CActiveRelation extends CBaseActiveRelation
* Merges this relation with a criteria specified dynamically. * Merges this relation with a criteria specified dynamically.
* @param array $criteria the dynamically specified criteria * @param array $criteria the dynamically specified criteria
* @param boolean $fromScope whether the criteria to be merged is from scopes * @param boolean $fromScope whether the criteria to be merged is from scopes
* @since 1.0.5
*/ */
public function mergeWith($criteria, $fromScope = false) public function mergeWith($criteria, $fromScope = false)
{ {
@ -2179,7 +2132,7 @@ class CActiveRelation extends CBaseActiveRelation
* @author Qiang Xue <qiang.xue@gmail.com> * @author Qiang Xue <qiang.xue@gmail.com>
* @version $Id: ActiveRecord.php 3344 2011-07-06 22:04:50Z alexander.makarow $ * @version $Id: ActiveRecord.php 3344 2011-07-06 22:04:50Z alexander.makarow $
* @package system.db.ar * @package system.db.ar
* @since 1.0 * @since 2.0
*/ */
class CBelongsToRelation extends CActiveRelation class CBelongsToRelation extends CActiveRelation
{ {
@ -2191,14 +2144,13 @@ class CBelongsToRelation extends CActiveRelation
* @author Qiang Xue <qiang.xue@gmail.com> * @author Qiang Xue <qiang.xue@gmail.com>
* @version $Id: ActiveRecord.php 3344 2011-07-06 22:04:50Z alexander.makarow $ * @version $Id: ActiveRecord.php 3344 2011-07-06 22:04:50Z alexander.makarow $
* @package system.db.ar * @package system.db.ar
* @since 1.0 * @since 2.0
*/ */
class CHasOneRelation extends CActiveRelation class CHasOneRelation extends CActiveRelation
{ {
/** /**
* @var string the name of the relation that should be used as the bridge to this relation. * @var string the name of the relation that should be used as the bridge to this relation.
* Defaults to null, meaning don't use any bridge. * Defaults to null, meaning don't use any bridge.
* @since 1.1.7
*/ */
public $through; public $through;
} }
@ -2209,7 +2161,7 @@ class CHasOneRelation extends CActiveRelation
* @author Qiang Xue <qiang.xue@gmail.com> * @author Qiang Xue <qiang.xue@gmail.com>
* @version $Id: ActiveRecord.php 3344 2011-07-06 22:04:50Z alexander.makarow $ * @version $Id: ActiveRecord.php 3344 2011-07-06 22:04:50Z alexander.makarow $
* @package system.db.ar * @package system.db.ar
* @since 1.0 * @since 2.0
*/ */
class CHasManyRelation extends CActiveRelation class CHasManyRelation extends CActiveRelation
{ {
@ -2224,13 +2176,11 @@ class CHasManyRelation extends CActiveRelation
/** /**
* @var string the name of the column that should be used as the key for storing related objects. * @var string the name of the column that should be used as the key for storing related objects.
* Defaults to null, meaning using zero-based integer IDs. * Defaults to null, meaning using zero-based integer IDs.
* @since 1.0.7
*/ */
public $index; public $index;
/** /**
* @var string the name of the relation that should be used as the bridge to this relation. * @var string the name of the relation that should be used as the bridge to this relation.
* Defaults to null, meaning don't use any bridge. * Defaults to null, meaning don't use any bridge.
* @since 1.1.7
*/ */
public $through; public $through;
@ -2238,7 +2188,6 @@ class CHasManyRelation extends CActiveRelation
* Merges this relation with a criteria specified dynamically. * Merges this relation with a criteria specified dynamically.
* @param array $criteria the dynamically specified criteria * @param array $criteria the dynamically specified criteria
* @param boolean $fromScope whether the criteria to be merged is from scopes * @param boolean $fromScope whether the criteria to be merged is from scopes
* @since 1.0.5
*/ */
public function mergeWith($criteria, $fromScope = false) public function mergeWith($criteria, $fromScope = false)
{ {
@ -2262,7 +2211,7 @@ class CHasManyRelation extends CActiveRelation
* @author Qiang Xue <qiang.xue@gmail.com> * @author Qiang Xue <qiang.xue@gmail.com>
* @version $Id: ActiveRecord.php 3344 2011-07-06 22:04:50Z alexander.makarow $ * @version $Id: ActiveRecord.php 3344 2011-07-06 22:04:50Z alexander.makarow $
* @package system.db.ar * @package system.db.ar
* @since 1.0 * @since 2.0
*/ */
class CManyManyRelation extends CHasManyRelation class CManyManyRelation extends CHasManyRelation
{ {
@ -2275,7 +2224,7 @@ class CManyManyRelation extends CHasManyRelation
* @author Qiang Xue <qiang.xue@gmail.com> * @author Qiang Xue <qiang.xue@gmail.com>
* @version $Id: ActiveRecord.php 3344 2011-07-06 22:04:50Z alexander.makarow $ * @version $Id: ActiveRecord.php 3344 2011-07-06 22:04:50Z alexander.makarow $
* @package system.db.ar * @package system.db.ar
* @since 1.0 * @since 2.0
*/ */
class ActiveRecordMetaData class ActiveRecordMetaData
{ {
@ -2349,7 +2298,6 @@ class ActiveRecordMetaData
* @param string $name $name Name of the relation. * @param string $name $name Name of the relation.
* @param array $config $config Relation parameters. * @param array $config $config Relation parameters.
* @return void * @return void
* @since 1.1.2
*/ */
public function addRelation($name, $config) public function addRelation($name, $config)
{ {
@ -2364,7 +2312,6 @@ class ActiveRecordMetaData
* *
* @param string $name $name Name of the relation. * @param string $name $name Name of the relation.
* @return boolean * @return boolean
* @since 1.1.2
*/ */
public function hasRelation($name) public function hasRelation($name)
{ {
@ -2376,7 +2323,6 @@ class ActiveRecordMetaData
* *
* @param string $name $name * @param string $name $name
* @return void * @return void
* @since 1.1.2
*/ */
public function removeRelation($name) public function removeRelation($name)
{ {

3
framework/db/ar/ActiveRecordBehavior.php
Unescape View File

@ -16,7 +16,7 @@
* @author Qiang Xue <qiang.xue@gmail.com> * @author Qiang Xue <qiang.xue@gmail.com>
* @version $Id: CActiveRecordBehavior.php 2799 2011-01-01 19:31:13Z qiang.xue $ * @version $Id: CActiveRecordBehavior.php 2799 2011-01-01 19:31:13Z qiang.xue $
* @package system.db.ar * @package system.db.ar
* @since 1.0.2 * @since 2.0
*/ */
class CActiveRecordBehavior extends CModelBehavior class CActiveRecordBehavior extends CModelBehavior
{ {
@ -80,7 +80,6 @@ class CActiveRecordBehavior extends CModelBehavior
* Responds to {@link CActiveRecord::onBeforeFind} event. * Responds to {@link CActiveRecord::onBeforeFind} event.
* Overrides this method if you want to handle the corresponding event of the {@link CBehavior::owner owner}. * Overrides this method if you want to handle the corresponding event of the {@link CBehavior::owner owner}.
* @param CEvent $event event parameter * @param CEvent $event event parameter
* @since 1.0.9
*/ */
public function beforeFind($event) public function beforeFind($event)
{ {

33
framework/db/dao/Command.php
Unescape View File

@ -253,7 +253,6 @@ class Command extends \yii\base\Component
* array with array keys being the parameter names, and array values the corresponding parameter values. * array with array keys being the parameter names, and array values the corresponding parameter values.
* For example, <code>array(':name'=>'John', ':age'=>25)</code>. * For example, <code>array(':name'=>'John', ':age'=>25)</code>.
* @return Command the current command being executed * @return Command the current command being executed
* @since 1.1.5
*/ */
public function bindValues($values) public function bindValues($values)
{ {
@ -516,7 +515,6 @@ class Command extends \yii\base\Component
* @param string $option additional option that should be appended to the 'SELECT' keyword. For example, * @param string $option additional option that should be appended to the 'SELECT' keyword. For example,
* in MySQL, the option 'SQL_CALC_FOUND_ROWS' can be used. This parameter is supported since version 1.1.8. * in MySQL, the option 'SQL_CALC_FOUND_ROWS' can be used. This parameter is supported since version 1.1.8.
* @return Command the command object itself * @return Command the command object itself
* @since 1.1.6
*/ */
public function select($columns = '*', $option = '') public function select($columns = '*', $option = '')
{ {
@ -530,7 +528,6 @@ class Command extends \yii\base\Component
* This is the same as {@link select} except that the DISTINCT flag is turned on. * This is the same as {@link select} except that the DISTINCT flag is turned on.
* @param mixed $columns the columns to be selected. See {@link select} for more details. * @param mixed $columns the columns to be selected. See {@link select} for more details.
* @return Command the command object itself * @return Command the command object itself
* @since 1.1.6
*/ */
public function selectDistinct($columns = '*', $option = '') public function selectDistinct($columns = '*', $option = '')
{ {
@ -546,7 +543,6 @@ class Command extends \yii\base\Component
* The method will automatically quote the table names unless it contains some parenthesis * The method will automatically quote the table names unless it contains some parenthesis
* (which means the table is given as a sub-query or DB expression). * (which means the table is given as a sub-query or DB expression).
* @return Command the command object itself * @return Command the command object itself
* @since 1.1.6
*/ */
public function from($tables) public function from($tables)
{ {
@ -590,7 +586,6 @@ class Command extends \yii\base\Component
* @param mixed $conditions the conditions that should be put in the WHERE part. * @param mixed $conditions the conditions that should be put in the WHERE part.
* @param array $params the parameters (name=>value) to be bound to the query * @param array $params the parameters (name=>value) to be bound to the query
* @return Command the command object itself * @return Command the command object itself
* @since 1.1.6
*/ */
public function where($conditions, $params = array()) public function where($conditions, $params = array())
{ {
@ -609,7 +604,6 @@ class Command extends \yii\base\Component
* Please refer to {@link where} on how to specify conditions. * Please refer to {@link where} on how to specify conditions.
* @param array $params the parameters (name=>value) to be bound to the query * @param array $params the parameters (name=>value) to be bound to the query
* @return Command the command object itself * @return Command the command object itself
* @since 1.1.6
*/ */
public function join($table, $conditions, $params = array()) public function join($table, $conditions, $params = array())
{ {
@ -626,7 +620,6 @@ class Command extends \yii\base\Component
* Please refer to {@link where} on how to specify conditions. * Please refer to {@link where} on how to specify conditions.
* @param array $params the parameters (name=>value) to be bound to the query * @param array $params the parameters (name=>value) to be bound to the query
* @return Command the command object itself * @return Command the command object itself
* @since 1.1.6
*/ */
public function leftJoin($table, $conditions, $params = array()) public function leftJoin($table, $conditions, $params = array())
{ {
@ -643,7 +636,6 @@ class Command extends \yii\base\Component
* Please refer to {@link where} on how to specify conditions. * Please refer to {@link where} on how to specify conditions.
* @param array $params the parameters (name=>value) to be bound to the query * @param array $params the parameters (name=>value) to be bound to the query
* @return Command the command object itself * @return Command the command object itself
* @since 1.1.6
*/ */
public function rightJoin($table, $conditions, $params = array()) public function rightJoin($table, $conditions, $params = array())
{ {
@ -658,7 +650,6 @@ class Command extends \yii\base\Component
* The method will automatically quote the table name unless it contains some parenthesis * The method will automatically quote the table name unless it contains some parenthesis
* (which means the table is given as a sub-query or DB expression). * (which means the table is given as a sub-query or DB expression).
* @return Command the command object itself * @return Command the command object itself
* @since 1.1.6
*/ */
public function crossJoin($table) public function crossJoin($table)
{ {
@ -673,7 +664,6 @@ class Command extends \yii\base\Component
* The method will automatically quote the table name unless it contains some parenthesis * The method will automatically quote the table name unless it contains some parenthesis
* (which means the table is given as a sub-query or DB expression). * (which means the table is given as a sub-query or DB expression).
* @return Command the command object itself * @return Command the command object itself
* @since 1.1.6
*/ */
public function naturalJoin($table) public function naturalJoin($table)
{ {
@ -687,7 +677,6 @@ class Command extends \yii\base\Component
* The method will automatically quote the column names unless a column contains some parenthesis * The method will automatically quote the column names unless a column contains some parenthesis
* (which means the column contains a DB expression). * (which means the column contains a DB expression).
* @return Command the command object itself * @return Command the command object itself
* @since 1.1.6
*/ */
public function groupBy($columns) public function groupBy($columns)
{ {
@ -701,7 +690,6 @@ class Command extends \yii\base\Component
* Please refer to {@link where} on how to specify conditions. * Please refer to {@link where} on how to specify conditions.
* @param array $params the parameters (name=>value) to be bound to the query * @param array $params the parameters (name=>value) to be bound to the query
* @return Command the command object itself * @return Command the command object itself
* @since 1.1.6
*/ */
public function having($conditions, $params = array()) public function having($conditions, $params = array())
{ {
@ -717,7 +705,6 @@ class Command extends \yii\base\Component
* The method will automatically quote the column names unless a column contains some parenthesis * The method will automatically quote the column names unless a column contains some parenthesis
* (which means the column contains a DB expression). * (which means the column contains a DB expression).
* @return Command the command object itself * @return Command the command object itself
* @since 1.1.6
*/ */
public function orderBy($columns) public function orderBy($columns)
{ {
@ -728,9 +715,7 @@ class Command extends \yii\base\Component
/** /**
* Sets the LIMIT part of the query. * Sets the LIMIT part of the query.
* @param integer $limit the limit * @param integer $limit the limit
* @param integer $offset the offset
* @return Command the command object itself * @return Command the command object itself
* @since 1.1.6
*/ */
public function limit($limit) public function limit($limit)
{ {
@ -742,7 +727,6 @@ class Command extends \yii\base\Component
* Sets the OFFSET part of the query. * Sets the OFFSET part of the query.
* @param integer $offset the offset * @param integer $offset the offset
* @return Command the command object itself * @return Command the command object itself
* @since 1.1.6
*/ */
public function offset($offset) public function offset($offset)
{ {
@ -754,7 +738,6 @@ class Command extends \yii\base\Component
* Appends a SQL statement using UNION operator. * Appends a SQL statement using UNION operator.
* @param string $sql the SQL statement to be appended using UNION * @param string $sql the SQL statement to be appended using UNION
* @return Command the command object itself * @return Command the command object itself
* @since 1.1.6
*/ */
public function union($sql) public function union($sql)
{ {
@ -768,7 +751,6 @@ class Command extends \yii\base\Component
* @param string $table the table that new rows will be inserted into. * @param string $table the table that new rows will be inserted into.
* @param array $columns the column data (name=>value) to be inserted into the table. * @param array $columns the column data (name=>value) to be inserted into the table.
* @return integer number of rows affected by the execution. * @return integer number of rows affected by the execution.
* @since 1.1.6
*/ */
public function insert($table, $columns) public function insert($table, $columns)
{ {
@ -785,7 +767,6 @@ class Command extends \yii\base\Component
* refer to {@link where} on how to specify conditions. * refer to {@link where} on how to specify conditions.
* @param array $params the parameters to be bound to the query. * @param array $params the parameters to be bound to the query.
* @return integer number of rows affected by the execution. * @return integer number of rows affected by the execution.
* @since 1.1.6
*/ */
public function update($table, $columns, $conditions = '', $params = array()) public function update($table, $columns, $conditions = '', $params = array())
{ {
@ -800,7 +781,6 @@ class Command extends \yii\base\Component
* refer to {@link where} on how to specify conditions. * refer to {@link where} on how to specify conditions.
* @param array $params the parameters to be bound to the query. * @param array $params the parameters to be bound to the query.
* @return integer number of rows affected by the execution. * @return integer number of rows affected by the execution.
* @since 1.1.6
*/ */
public function delete($table, $conditions = '', $params = array()) public function delete($table, $conditions = '', $params = array())
{ {
@ -823,7 +803,6 @@ class Command extends \yii\base\Component
* @param array $columns the columns (name=>definition) in the new table. * @param array $columns the columns (name=>definition) in the new table.
* @param string $options additional SQL fragment that will be appended to the generated SQL. * @param string $options additional SQL fragment that will be appended to the generated SQL.
* @return integer number of rows affected by the execution. * @return integer number of rows affected by the execution.
* @since 1.1.6
*/ */
public function createTable($table, $columns, $options = null) public function createTable($table, $columns, $options = null)
{ {
@ -836,7 +815,6 @@ class Command extends \yii\base\Component
* @param string $table the table to be renamed. The name will be properly quoted by the method. * @param string $table the table to be renamed. The name will be properly quoted by the method.
* @param string $newName the new table name. The name will be properly quoted by the method. * @param string $newName the new table name. The name will be properly quoted by the method.
* @return integer number of rows affected by the execution. * @return integer number of rows affected by the execution.
* @since 1.1.6
*/ */
public function renameTable($table, $newName) public function renameTable($table, $newName)
{ {
@ -848,7 +826,6 @@ class Command extends \yii\base\Component
* Builds and executes a SQL statement for dropping a DB table. * Builds and executes a SQL statement for dropping a DB table.
* @param string $table the table to be dropped. The name will be properly quoted by the method. * @param string $table the table to be dropped. The name will be properly quoted by the method.
* @return integer number of rows affected by the execution. * @return integer number of rows affected by the execution.
* @since 1.1.6
*/ */
public function dropTable($table) public function dropTable($table)
{ {
@ -860,7 +837,6 @@ class Command extends \yii\base\Component
* Builds and executes a SQL statement for truncating a DB table. * Builds and executes a SQL statement for truncating a DB table.
* @param string $table the table to be truncated. The name will be properly quoted by the method. * @param string $table the table to be truncated. The name will be properly quoted by the method.
* @return integer number of rows affected by the execution. * @return integer number of rows affected by the execution.
* @since 1.1.6
*/ */
public function truncateTable($table) public function truncateTable($table)
{ {
@ -876,7 +852,6 @@ class Command extends \yii\base\Component
* into the physical one. Anything that is not recognized as abstract type will be kept in the generated SQL. * into the physical one. Anything that is not recognized as abstract type will be kept in the generated SQL.
* For example, 'string' will be turned into 'varchar(255)', while 'string not null' will become 'varchar(255) not null'. * For example, 'string' will be turned into 'varchar(255)', while 'string not null' will become 'varchar(255) not null'.
* @return integer number of rows affected by the execution. * @return integer number of rows affected by the execution.
* @since 1.1.6
*/ */
public function addColumn($table, $column, $type) public function addColumn($table, $column, $type)
{ {
@ -889,7 +864,6 @@ class Command extends \yii\base\Component
* @param string $table the table whose column is to be dropped. The name will be properly quoted by the method. * @param string $table the table whose column is to be dropped. The name will be properly quoted by the method.
* @param string $column the name of the column to be dropped. The name will be properly quoted by the method. * @param string $column the name of the column to be dropped. The name will be properly quoted by the method.
* @return integer number of rows affected by the execution. * @return integer number of rows affected by the execution.
* @since 1.1.6
*/ */
public function dropColumn($table, $column) public function dropColumn($table, $column)
{ {
@ -903,7 +877,6 @@ class Command extends \yii\base\Component
* @param string $name the old name of the column. The name will be properly quoted by the method. * @param string $name the old name of the column. The name will be properly quoted by the method.
* @param string $newName the new name of the column. The name will be properly quoted by the method. * @param string $newName the new name of the column. The name will be properly quoted by the method.
* @return integer number of rows affected by the execution. * @return integer number of rows affected by the execution.
* @since 1.1.6
*/ */
public function renameColumn($table, $name, $newName) public function renameColumn($table, $name, $newName)
{ {
@ -919,7 +892,6 @@ class Command extends \yii\base\Component
* into the physical one. Anything that is not recognized as abstract type will be kept in the generated SQL. * into the physical one. Anything that is not recognized as abstract type will be kept in the generated SQL.
* For example, 'string' will be turned into 'varchar(255)', while 'string not null' will become 'varchar(255) not null'. * For example, 'string' will be turned into 'varchar(255)', while 'string not null' will become 'varchar(255) not null'.
* @return integer number of rows affected by the execution. * @return integer number of rows affected by the execution.
* @since 1.1.6
*/ */
public function alterColumn($table, $column, $type) public function alterColumn($table, $column, $type)
{ {
@ -938,7 +910,6 @@ class Command extends \yii\base\Component
* @param string $delete the ON DELETE option. Most DBMS support these options: RESTRICT, CASCADE, NO ACTION, SET DEFAULT, SET NULL * @param string $delete the ON DELETE option. Most DBMS support these options: RESTRICT, CASCADE, NO ACTION, SET DEFAULT, SET NULL
* @param string $update the ON UPDATE option. Most DBMS support these options: RESTRICT, CASCADE, NO ACTION, SET DEFAULT, SET NULL * @param string $update the ON UPDATE option. Most DBMS support these options: RESTRICT, CASCADE, NO ACTION, SET DEFAULT, SET NULL
* @return integer number of rows affected by the execution. * @return integer number of rows affected by the execution.
* @since 1.1.6
*/ */
public function addForeignKey($name, $table, $columns, $refTable, $refColumns, $delete = null, $update = null) public function addForeignKey($name, $table, $columns, $refTable, $refColumns, $delete = null, $update = null)
{ {
@ -951,7 +922,6 @@ class Command extends \yii\base\Component
* @param string $name the name of the foreign key constraint to be dropped. The name will be properly quoted by the method. * @param string $name the name of the foreign key constraint to be dropped. The name will be properly quoted by the method.
* @param string $table the table whose foreign is to be dropped. The name will be properly quoted by the method. * @param string $table the table whose foreign is to be dropped. The name will be properly quoted by the method.
* @return integer number of rows affected by the execution. * @return integer number of rows affected by the execution.
* @since 1.1.6
*/ */
public function dropForeignKey($name, $table) public function dropForeignKey($name, $table)
{ {
@ -967,7 +937,6 @@ class Command extends \yii\base\Component
* by commas. The column names will be properly quoted by the method. * by commas. The column names will be properly quoted by the method.
* @param boolean $unique whether to add UNIQUE constraint on the created index. * @param boolean $unique whether to add UNIQUE constraint on the created index.
* @return integer number of rows affected by the execution. * @return integer number of rows affected by the execution.
* @since 1.1.6
*/ */
public function createIndex($name, $table, $column, $unique = false) public function createIndex($name, $table, $column, $unique = false)
{ {
@ -980,7 +949,6 @@ class Command extends \yii\base\Component
* @param string $name the name of the index to be dropped. The name will be properly quoted by the method. * @param string $name the name of the index to be dropped. The name will be properly quoted by the method.
* @param string $table the table whose index is to be dropped. The name will be properly quoted by the method. * @param string $table the table whose index is to be dropped. The name will be properly quoted by the method.
* @return integer number of rows affected by the execution. * @return integer number of rows affected by the execution.
* @since 1.1.6
*/ */
public function dropIndex($name, $table) public function dropIndex($name, $table)
{ {
@ -999,7 +967,6 @@ class Command extends \yii\base\Component
* Please refer to {@link where} on how to specify conditions. * Please refer to {@link where} on how to specify conditions.
* @param array $params the parameters (name=>value) to be bound to the query * @param array $params the parameters (name=>value) to be bound to the query
* @return Command the command object itself * @return Command the command object itself
* @since 1.1.6
*/ */
private function joinInternal($type, $table, $conditions = '', $params = array()) private function joinInternal($type, $table, $conditions = '', $params = array())
{ {

7
framework/db/dao/Query.php
Unescape View File

@ -235,7 +235,6 @@ class Query extends \yii\base\Object
* @param mixed $condition the new condition. It can be either a string or an array of strings. * @param mixed $condition the new condition. It can be either a string or an array of strings.
* @param string $operator the operator to join different conditions. Defaults to 'AND'. * @param string $operator the operator to join different conditions. Defaults to 'AND'.
* @return Query the criteria object itself * @return Query the criteria object itself
* @since 1.0.9
*/ */
public function addCondition($condition, $operator = 'AND') public function addCondition($condition, $operator = 'AND')
{ {
@ -269,7 +268,6 @@ class Query extends \yii\base\Object
* Defaults to 'AND'. * Defaults to 'AND'.
* @param string $like the LIKE operator. Defaults to 'LIKE'. You may also set this to be 'NOT LIKE'. * @param string $like the LIKE operator. Defaults to 'LIKE'. You may also set this to be 'NOT LIKE'.
* @return Query the criteria object itself * @return Query the criteria object itself
* @since 1.0.10
*/ */
public function addSearchCondition($column, $keyword, $escape = true, $operator = 'AND', $like = 'LIKE') public function addSearchCondition($column, $keyword, $escape = true, $operator = 'AND', $like = 'LIKE')
{ {
@ -293,7 +291,6 @@ class Query extends \yii\base\Object
* @param string $operator the operator used to concatenate the new condition with the existing one. * @param string $operator the operator used to concatenate the new condition with the existing one.
* Defaults to 'AND'. * Defaults to 'AND'.
* @return Query the criteria object itself * @return Query the criteria object itself
* @since 1.0.10
*/ */
public function addInCondition($column, $values, $operator = 'AND') public function addInCondition($column, $values, $operator = 'AND')
{ {
@ -331,7 +328,6 @@ class Query extends \yii\base\Object
* @param string $operator the operator used to concatenate the new condition with the existing one. * @param string $operator the operator used to concatenate the new condition with the existing one.
* Defaults to 'AND'. * Defaults to 'AND'.
* @return Query the criteria object itself * @return Query the criteria object itself
* @since 1.1.1
*/ */
public function addNotInCondition($column, $values, $operator = 'AND') public function addNotInCondition($column, $values, $operator = 'AND')
{ {
@ -368,7 +364,6 @@ class Query extends \yii\base\Object
* @param string $operator the operator used to concatenate the new condition with the existing one. * @param string $operator the operator used to concatenate the new condition with the existing one.
* Defaults to 'AND'. * Defaults to 'AND'.
* @return Query the criteria object itself * @return Query the criteria object itself
* @since 1.0.10
*/ */
public function addColumnCondition($columns, $columnOperator = 'AND', $operator = 'AND') public function addColumnCondition($columns, $columnOperator = 'AND', $operator = 'AND')
{ {
@ -428,7 +423,6 @@ class Query extends \yii\base\Object
* character on both ends. When this parameter is false, the value will be directly used for * character on both ends. When this parameter is false, the value will be directly used for
* matching without any change. * matching without any change.
* @return Query the criteria object itself * @return Query the criteria object itself
* @since 1.1.1
*/ */
public function compare($column, $value, $partialMatch = false, $operator = 'AND', $escape = true) public function compare($column, $value, $partialMatch = false, $operator = 'AND', $escape = true)
{ {
@ -482,7 +476,6 @@ class Query extends \yii\base\Object
* @param string $operator the operator used to concatenate the new condition with the existing one. * @param string $operator the operator used to concatenate the new condition with the existing one.
* Defaults to 'AND'. * Defaults to 'AND'.
* @return Query the criteria object itself * @return Query the criteria object itself
* @since 1.1.2
*/ */
public function addBetweenCondition($column, $valueStart, $valueEnd, $operator = 'AND') public function addBetweenCondition($column, $valueStart, $valueEnd, $operator = 'AND')
{ {

6
framework/db/dao/QueryBuilder.php
Unescape View File

@ -74,7 +74,6 @@ class QueryBuilder extends \yii\base\Object
* @param string $table the table that new rows will be inserted into. * @param string $table the table that new rows will be inserted into.
* @param array $columns the column data (name=>value) to be inserted into the table. * @param array $columns the column data (name=>value) to be inserted into the table.
* @return integer number of rows affected by the execution. * @return integer number of rows affected by the execution.
* @since 1.1.6
*/ */
public function insert($table, $columns, &$params = array()) public function insert($table, $columns, &$params = array())
{ {
@ -110,7 +109,6 @@ class QueryBuilder extends \yii\base\Object
* refer to {@link where} on how to specify conditions. * refer to {@link where} on how to specify conditions.
* @param array $params the parameters to be bound to the query. * @param array $params the parameters to be bound to the query.
* @return integer number of rows affected by the execution. * @return integer number of rows affected by the execution.
* @since 1.1.6
*/ */
public function update($table, $columns, $conditions = '', &$params = array()) public function update($table, $columns, $conditions = '', &$params = array())
{ {
@ -144,7 +142,6 @@ class QueryBuilder extends \yii\base\Object
* refer to {@link where} on how to specify conditions. * refer to {@link where} on how to specify conditions.
* @param array $params the parameters to be bound to the query. * @param array $params the parameters to be bound to the query.
* @return integer number of rows affected by the execution. * @return integer number of rows affected by the execution.
* @since 1.1.6
*/ */
public function delete($table, $conditions = '') public function delete($table, $conditions = '')
{ {
@ -224,7 +221,6 @@ class QueryBuilder extends \yii\base\Object
* into the physical one. Anything that is not recognized as abstract type will be kept in the generated SQL. * into the physical one. Anything that is not recognized as abstract type will be kept in the generated SQL.
* For example, 'string' will be turned into 'varchar(255)', while 'string not null' will become 'varchar(255) not null'. * For example, 'string' will be turned into 'varchar(255)', while 'string not null' will become 'varchar(255) not null'.
* @return string the SQL statement for adding a new column. * @return string the SQL statement for adding a new column.
* @since 1.1.6
*/ */
public function addColumn($table, $column, $type) public function addColumn($table, $column, $type)
{ {
@ -238,7 +234,6 @@ class QueryBuilder extends \yii\base\Object
* @param string $table the table whose column is to be dropped. The name will be properly quoted by the method. * @param string $table the table whose column is to be dropped. The name will be properly quoted by the method.
* @param string $column the name of the column to be dropped. The name will be properly quoted by the method. * @param string $column the name of the column to be dropped. The name will be properly quoted by the method.
* @return string the SQL statement for dropping a DB column. * @return string the SQL statement for dropping a DB column.
* @since 1.1.6
*/ */
public function dropColumn($table, $column) public function dropColumn($table, $column)
{ {
@ -252,7 +247,6 @@ class QueryBuilder extends \yii\base\Object
* @param string $name the old name of the column. The name will be properly quoted by the method. * @param string $name the old name of the column. The name will be properly quoted by the method.
* @param string $newName the new name of the column. The name will be properly quoted by the method. * @param string $newName the new name of the column. The name will be properly quoted by the method.
* @return string the SQL statement for renaming a DB column. * @return string the SQL statement for renaming a DB column.
* @since 1.1.6
*/ */
public function renameColumn($table, $name, $newName) public function renameColumn($table, $name, $newName)
{ {

2
framework/db/dao/mysql/QueryBuilder.php
Unescape View File

@ -45,7 +45,6 @@ class QueryBuilder extends \yii\db\dao\QueryBuilder
* @param string $name the old name of the column. The name will be properly quoted by the method. * @param string $name the old name of the column. The name will be properly quoted by the method.
* @param string $newName the new name of the column. The name will be properly quoted by the method. * @param string $newName the new name of the column. The name will be properly quoted by the method.
* @return string the SQL statement for renaming a DB column. * @return string the SQL statement for renaming a DB column.
* @since 1.1.6
*/ */
public function renameColumn($table, $name, $newName) public function renameColumn($table, $name, $newName)
{ {
@ -77,7 +76,6 @@ class QueryBuilder extends \yii\db\dao\QueryBuilder
* @param string $name the name of the foreign key constraint to be dropped. The name will be properly quoted by the method. * @param string $name the name of the foreign key constraint to be dropped. The name will be properly quoted by the method.
* @param string $table the table whose foreign is to be dropped. The name will be properly quoted by the method. * @param string $table the table whose foreign is to be dropped. The name will be properly quoted by the method.
* @return string the SQL statement for dropping a foreign key constraint. * @return string the SQL statement for dropping a foreign key constraint.
* @since 1.1.6
*/ */
public function dropForeignKey($name, $table) public function dropForeignKey($name, $table)
{ {

3
framework/logging/ProfileTarget.php
Unescape View File

@ -23,7 +23,7 @@
* @author Qiang Xue <qiang.xue@gmail.com> * @author Qiang Xue <qiang.xue@gmail.com>
* @version $Id: CProfileLogRoute.php 3204 2011-05-05 21:36:32Z alexander.makarow $ * @version $Id: CProfileLogRoute.php 3204 2011-05-05 21:36:32Z alexander.makarow $
* @package system.logging * @package system.logging
* @since 1.0 * @since 2.0
*/ */
class CProfileLogRoute extends CWebLogRoute class CProfileLogRoute extends CWebLogRoute
{ {
@ -32,7 +32,6 @@ class CProfileLogRoute extends CWebLogRoute
* If false, the results will be aggregated by categories. * If false, the results will be aggregated by categories.
* Defaults to true. Note that this property only affects the summary report * Defaults to true. Note that this property only affects the summary report
* that is enabled when {@link report} is 'summary'. * that is enabled when {@link report} is 'summary'.
* @since 1.0.6
*/ */
public $groupByToken = true; public $groupByToken = true;
/** /**

2
framework/logging/WebTarget.php
Unescape View File

@ -17,7 +17,7 @@
* @author Qiang Xue <qiang.xue@gmail.com> * @author Qiang Xue <qiang.xue@gmail.com>
* @version $Id: CWebLogRoute.php 3001 2011-02-24 16:42:44Z alexander.makarow $ * @version $Id: CWebLogRoute.php 3001 2011-02-24 16:42:44Z alexander.makarow $
* @package system.logging * @package system.logging
* @since 1.0 * @since 2.0
*/ */
class CWebLogRoute extends CLogRoute class CWebLogRoute extends CLogRoute
{ {

2
framework/validators/DateValidator.php
Unescape View File

@ -18,7 +18,7 @@ namespace yii\validators;
* @author Qiang Xue <qiang.xue@gmail.com> * @author Qiang Xue <qiang.xue@gmail.com>
* @version $Id: CDateValidator.php 2799 2011-01-01 19:31:13Z qiang.xue $ * @version $Id: CDateValidator.php 2799 2011-01-01 19:31:13Z qiang.xue $
* @package system.validators * @package system.validators
* @since 1.1.7 * @since 2.0
*/ */
class CDateValidator extends Validator class CDateValidator extends Validator
{ {

3
framework/validators/ExistValidator.php
Unescape View File

@ -18,7 +18,7 @@ namespace yii\validators;
* @author Qiang Xue <qiang.xue@gmail.com> * @author Qiang Xue <qiang.xue@gmail.com>
* @version $Id: CExistValidator.php 2799 2011-01-01 19:31:13Z qiang.xue $ * @version $Id: CExistValidator.php 2799 2011-01-01 19:31:13Z qiang.xue $
* @package system.validators * @package system.validators
* @since 1.0.4 * @since 2.0
*/ */
class CExistValidator extends Validator class CExistValidator extends Validator
{ {
@ -41,7 +41,6 @@ class CExistValidator extends Validator
* @var array additional query criteria. This will be combined with the condition * @var array additional query criteria. This will be combined with the condition
* that checks if the attribute value exists in the corresponding table column. * that checks if the attribute value exists in the corresponding table column.
* This array will be used to instantiate a {@link CDbCriteria} object. * This array will be used to instantiate a {@link CDbCriteria} object.
* @since 1.0.8
*/ */
public $criteria = array(); public $criteria = array();
/** /**

2
framework/validators/FileValidator.php
Unescape View File

@ -42,7 +42,7 @@ namespace yii\validators;
* @author Qiang Xue <qiang.xue@gmail.com> * @author Qiang Xue <qiang.xue@gmail.com>
* @version $Id: CFileValidator.php 2799 2011-01-01 19:31:13Z qiang.xue $ * @version $Id: CFileValidator.php 2799 2011-01-01 19:31:13Z qiang.xue $
* @package system.validators * @package system.validators
* @since 1.0 * @since 2.0
*/ */
class CFileValidator extends Validator class CFileValidator extends Validator
{ {

4
framework/validators/UniqueValidator.php
Unescape View File

@ -35,7 +35,6 @@ class CUniqueValidator extends Validator
* the class of the object currently being validated. * the class of the object currently being validated.
* You may use path alias to reference a class name here. * You may use path alias to reference a class name here.
* @see attributeName * @see attributeName
* @since 1.0.8
*/ */
public $className; public $className;
/** /**
@ -43,14 +42,12 @@ class CUniqueValidator extends Validator
* used to look for the attribute value being validated. Defaults to null, * used to look for the attribute value being validated. Defaults to null,
* meaning using the name of the attribute being validated. * meaning using the name of the attribute being validated.
* @see className * @see className
* @since 1.0.8
*/ */
public $attributeName; public $attributeName;
/** /**
* @var array additional query criteria. This will be combined with the condition * @var array additional query criteria. This will be combined with the condition
* that checks if the attribute value exists in the corresponding table column. * that checks if the attribute value exists in the corresponding table column.
* This array will be used to instantiate a {@link CDbCriteria} object. * This array will be used to instantiate a {@link CDbCriteria} object.
* @since 1.0.8
*/ */
public $criteria = array(); public $criteria = array();
/** /**
@ -61,7 +58,6 @@ class CUniqueValidator extends Validator
/** /**
* @var boolean whether this validation rule should be skipped if when there is already a validation * @var boolean whether this validation rule should be skipped if when there is already a validation
* error for the current attribute. Defaults to true. * error for the current attribute. Defaults to true.
* @since 1.1.1
*/ */
public $skipOnError = true; public $skipOnError = true;

Write Preview
Loading…
Cancel
Save