refactoring cache and db references.

framework/caching/DbCache.php

@@ -7,6 +7,7 @@
 
 namespace yii\caching;
 
+use Yii;
 use yii\base\InvalidConfigException;
 use yii\db\Connection;
 use yii\db\Query;
@@ -14,30 +15,20 @@ use yii\db\Query;
 /**
  * DbCache implements a cache application component by storing cached data in a database.
  *
- * DbCache stores cache data in a DB table whose name is specified via [[cacheTableName]].
- * For MySQL database, the table should be created beforehand as follows :
- *
- * ~~~
- * CREATE TABLE tbl_cache (
- *     id char(128) NOT NULL,
- *     expire int(11) DEFAULT NULL,
- *     data LONGBLOB,
- *     PRIMARY KEY (id),
- *     KEY expire (expire)
- * );
- * ~~~
- *
- * You should replace `LONGBLOB` as follows if you are using a different DBMS:
- *
- * - PostgreSQL: `BYTEA`
- * - SQLite, SQL server, Oracle: `BLOB`
- *
- * DbCache connects to the database via the DB connection specified in [[connectionID]]
- * which must refer to a valid DB application component.
+ * By default, DbCache stores session data in a DB table named 'tbl_cache'. This table
+ * must be pre-created. The table name can be changed by setting [[cacheTable]].
  *
  * Please refer to [[Cache]] for common cache operations that are supported by DbCache.
  *
- * @property Connection $db The DB connection instance.
+ * The following example shows how you can configure the application to use DbCache:
+ *
+ * ~~~
+ * 'cache' => array(
+ *     'class' => 'yii\caching\DbCache',
+ *     // 'db' => 'mydb',
+ *     // 'cacheTable' => 'my_cache',
+ * )
+ * ~~~
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
  * @since 2.0
@@ -45,50 +36,56 @@ use yii\db\Query;
 class DbCache extends Cache
 {
 	/**
-	 * @var string the ID of the [[Connection|DB connection]] application component. Defaults to 'db'.
+	 * @var Connection|string the DB connection object or the application component ID of the DB connection.
+	 * After the DbCache object is created, if you want to change this property, you should only assign it
+	 * with a DB connection object.
 	 */
-	public $connectionID = 'db';
+	public $db = 'db';
 	/**
-	 * @var string name of the DB table to store cache content. Defaults to 'tbl_cache'.
-	 * The table must be created before using this cache component.
+	 * @var string name of the DB table to store cache content.
+	 * The table should be pre-created as follows:
+	 *
+	 * ~~~
+	 * CREATE TABLE tbl_cache (
+	 *     id char(128) NOT NULL PRIMARY KEY,
+	 *     expire int(11),
+	 *     data BLOB
+	 * );
+	 * ~~~
+	 *
+	 * where 'BLOB' refers to the BLOB-type of your preferred DBMS. Below are the BLOB type
+	 * that can be used for some popular DBMS:
+	 *
+	 * - MySQL: LONGBLOB
+	 * - PostgreSQL: BYTEA
+	 * - MSSQL: BLOB
+	 *
+	 * When using DbCache in a production server, we recommend you create a DB index for the 'expire'
+	 * column in the cache table to improve the performance.
 	 */
-	public $cacheTableName = 'tbl_cache';
+	public $cacheTable = 'tbl_cache';
 	/**
 	 * @var integer the probability (parts per million) that garbage collection (GC) should be performed
-	 * when storing a piece of data in the cache. Defaults to 10, meaning 0.001% chance.
+	 * when storing a piece of data in the cache. Defaults to 100, meaning 0.01% chance.
 	 * This number should be between 0 and 1000000. A value 0 meaning no GC will be performed at all.
 	 **/
 	public $gcProbability = 100;
-	/**
-	 * @var Connection the DB connection instance
-	 */
-	private $_db;
 
-	/**
-	 * Returns the DB connection instance used for caching purpose.
-	 * @return Connection the DB connection instance
-	 * @throws InvalidConfigException if [[connectionID]] does not point to a valid application component.
-	 */
-	public function getDb()
-	{
-		if ($this->_db === null) {
-			$db = \Yii::$app->getComponent($this->connectionID);
-			if ($db instanceof Connection) {
-				$this->_db = $db;
-			} else {
-				throw new InvalidConfigException("DbCache::connectionID must refer to the ID of a DB application component.");
-			}
-		}
-		return $this->_db;
-	}
 
 	/**
-	 * Sets the DB connection used by the cache component.
-	 * @param Connection $value the DB connection instance
+	 * Initializes the DbCache component.
+	 * This method will initialize the [[db]] property to make sure it refers to a valid DB connection.
+	 * @throws InvalidConfigException if [[db]] is invalid.
 	 */
-	public function setDb($value)
+	public function init()
 	{
-		$this->_db = $value;
+		parent::init();
+		if (is_string($this->db)) {
+			$this->db = Yii::$app->getComponent($this->db);
+		}
+		if (!$this->db instanceof Connection) {
+			throw new InvalidConfigException("DbCache::db must be either a DB connection instance or the application component ID of a DB connection.");
+		}
 	}
 
 	/**
@@ -101,17 +98,16 @@ class DbCache extends Cache
 	{
 		$query = new Query;
 		$query->select(array('data'))
-			->from($this->cacheTableName)
+			->from($this->cacheTable)
 			->where('id = :id AND (expire = 0 OR expire >' . time() . ')', array(':id' => $key));
-		$db = $this->getDb();
-		if ($db->enableQueryCache) {
+		if ($this->db->enableQueryCache) {
 			// temporarily disable and re-enable query caching
-			$db->enableQueryCache = false;
-			$result = $query->createCommand($db)->queryScalar();
-			$db->enableQueryCache = true;
+			$this->db->enableQueryCache = false;
+			$result = $query->createCommand($this->db)->queryScalar();
+			$this->db->enableQueryCache = true;
 			return $result;
 		} else {
-			return $query->createCommand($db)->queryScalar();
+			return $query->createCommand($this->db)->queryScalar();
 		}
 	}
 
@@ -127,17 +123,16 @@ class DbCache extends Cache
 		}
 		$query = new Query;
 		$query->select(array('id', 'data'))
-			->from($this->cacheTableName)
+			->from($this->cacheTable)
 			->where(array('id' => $keys))
 			->andWhere('(expire = 0 OR expire > ' . time() . ')');
 
-		$db = $this->getDb();
-		if ($db->enableQueryCache) {
-			$db->enableQueryCache = false;
-			$rows = $query->createCommand($db)->queryAll();
-			$db->enableQueryCache = true;
+		if ($this->db->enableQueryCache) {
+			$this->db->enableQueryCache = false;
+			$rows = $query->createCommand($this->db)->queryAll();
+			$this->db->enableQueryCache = true;
 		} else {
-			$rows = $query->createCommand($db)->queryAll();
+			$rows = $query->createCommand($this->db)->queryAll();
 		}
 
 		$results = array();
@@ -161,13 +156,13 @@ class DbCache extends Cache
 	 */
 	protected function setValue($key, $value, $expire)
 	{
-		$command = $this->getDb()->createCommand();
-		$command->update($this->cacheTableName, array(
-			'expire' => $expire > 0 ? $expire + time() : 0,
-			'data' => array($value, \PDO::PARAM_LOB),
-		), array(
-			'id' => $key,
-		));;
+		$command = $this->db->createCommand()
+			->update($this->cacheTable, array(
+				'expire' => $expire > 0 ? $expire + time() : 0,
+				'data' => array($value, \PDO::PARAM_LOB),
+			), array(
+				'id' => $key,
+			));
 
 		if ($command->execute()) {
 			$this->gc();
@@ -196,14 +191,13 @@ class DbCache extends Cache
 			$expire = 0;
 		}
 
-		$command = $this->getDb()->createCommand();
-		$command->insert($this->cacheTableName, array(
-			'id' => $key,
-			'expire' => $expire,
-			'data' => array($value, \PDO::PARAM_LOB),
-		));
 		try {
-			$command->execute();
+			$this->db->createCommand()
+				->insert($this->cacheTable, array(
+					'id' => $key,
+					'expire' => $expire,
+					'data' => array($value, \PDO::PARAM_LOB),
+				))->execute();
 			return true;
 		} catch (\Exception $e) {
 			return false;
@@ -218,8 +212,9 @@ class DbCache extends Cache
 	 */
 	protected function deleteValue($key)
 	{
-		$command = $this->getDb()->createCommand();
-		$command->delete($this->cacheTableName, array('id' => $key))->execute();
+		$this->db->createCommand()
+			->delete($this->cacheTable, array('id' => $key))
+			->execute();
 		return true;
 	}
 
@@ -231,8 +226,9 @@ class DbCache extends Cache
 	public function gc($force = false)
 	{
 		if ($force || mt_rand(0, 1000000) < $this->gcProbability) {
-			$command = $this->getDb()->createCommand();
-			$command->delete($this->cacheTableName, 'expire > 0 AND expire < ' . time())->execute();
+			$this->db->createCommand()
+				->delete($this->cacheTable, 'expire > 0 AND expire < ' . time())
+				->execute();
 		}
 	}
 
@@ -243,8 +239,9 @@ class DbCache extends Cache
 	 */
 	protected function flushValues()
 	{
-		$command = $this->getDb()->createCommand();
-		$command->delete($this->cacheTableName)->execute();
+		$this->db->createCommand()
+			->delete($this->cacheTable)
+			->execute();
 		return true;
 	}
 }

framework/caching/DbDependency.php

@@ -23,9 +23,9 @@ use yii\db\Connection;
 class DbDependency extends Dependency
 {
 	/**
-	 * @var string the ID of the [[Connection|DB connection]] application component. Defaults to 'db'.
+	 * @var string the application component ID of the DB connection.
 	 */
-	public $connectionID = 'db';
+	public $db = 'db';
 	/**
 	 * @var string the SQL query whose result is used to determine if the dependency has been changed.
 	 * Only the first row of the query result will be used.
@@ -50,24 +50,17 @@ class DbDependency extends Dependency
 	}
 
 	/**
-	 * PHP sleep magic method.
-	 * This method ensures that the database instance is set null because it contains resource handles.
-	 * @return array
-	 */
-	public function __sleep()
-	{
-		$this->_db = null;
-		return array_keys((array)$this);
-	}
-
-	/**
 	 * Generates the data needed to determine if dependency has been changed.
 	 * This method returns the value of the global state.
 	 * @return mixed the data needed to determine if dependency has been changed.
 	 */
 	protected function generateDependencyData()
 	{
-		$db = $this->getDb();
+		$db = Yii::$app->getComponent($this->db);
+		if (!$db instanceof Connection) {
+			throw new InvalidConfigException("DbDependency::db must be the application component ID of a DB connection.");
+		}
+
 		if ($db->enableQueryCache) {
 			// temporarily disable and re-enable query caching
 			$db->enableQueryCache = false;
@@ -78,36 +71,4 @@ class DbDependency extends Dependency
 		}
 		return $result;
 	}
-
-	/**
-	 * @var Connection the DB connection instance
-	 */
-	private $_db;
-
-	/**
-	 * Returns the DB connection instance used for caching purpose.
-	 * @return Connection the DB connection instance
-	 * @throws InvalidConfigException if [[connectionID]] does not point to a valid application component.
-	 */
-	public function getDb()
-	{
-		if ($this->_db === null) {
-			$db = Yii::$app->getComponent($this->connectionID);
-			if ($db instanceof Connection) {
-				$this->_db = $db;
-			} else {
-				throw new InvalidConfigException("DbCacheDependency::connectionID must refer to the ID of a DB application component.");
-			}
-		}
-		return $this->_db;
-	}
-
-	/**
-	 * Sets the DB connection used by the cache component.
-	 * @param Connection $value the DB connection instance
-	 */
-	public function setDb($value)
-	{
-		$this->_db = $value;
-	}
 }

framework/console/Controller.php

@@ -135,9 +135,13 @@ class Controller extends \yii\base\Controller
 
 	/**
 	 * Returns the names of the global options for this command.
-	 * A global option requires the existence of a global member variable whose
+	 * A global option requires the existence of a public member variable whose
 	 * name is the option name.
 	 * Child classes may override this method to specify possible global options.
+	 *
+	 * Note that the values setting via global options are not available
+	 * until [[beforeAction()]] is being called.
+	 *
 	 * @return array the names of the global options for this command.
 	 */
 	public function globalOptions()

framework/db/Command.php

@@ -7,7 +7,9 @@
 
 namespace yii\db;
 
+use Yii;
 use yii\base\NotSupportedException;
+use yii\caching\Cache;
 
 /**
  * Command represents a SQL statement to be executed against a database.
@@ -132,7 +134,7 @@ class Command extends \yii\base\Component
 			try {
 				$this->pdoStatement = $this->db->pdo->prepare($sql);
 			} catch (\Exception $e) {
-				\Yii::error($e->getMessage() . "\nFailed to prepare SQL: $sql", __CLASS__);
+				Yii::error($e->getMessage() . "\nFailed to prepare SQL: $sql", __CLASS__);
 				$errorInfo = $e instanceof \PDOException ? $e->errorInfo : null;
 				throw new Exception($e->getMessage(), $errorInfo, (int)$e->getCode());
 			}
@@ -264,7 +266,7 @@ class Command extends \yii\base\Component
 			$paramLog = "\nParameters: " . var_export($this->_params, true);
 		}
 
-		\Yii::trace("Executing SQL: {$sql}{$paramLog}", __CLASS__);
+		Yii::trace("Executing SQL: {$sql}{$paramLog}", __CLASS__);
 
 		if ($sql == '') {
 			return 0;
@@ -272,7 +274,7 @@ class Command extends \yii\base\Component
 
 		try {
 			if ($this->db->enableProfiling) {
-				\Yii::beginProfile(__METHOD__ . "($sql)", __CLASS__);
+				Yii::beginProfile(__METHOD__ . "($sql)", __CLASS__);
 			}
 
 			$this->prepare();
@@ -280,16 +282,16 @@ class Command extends \yii\base\Component
 			$n = $this->pdoStatement->rowCount();
 
 			if ($this->db->enableProfiling) {
-				\Yii::endProfile(__METHOD__ . "($sql)", __CLASS__);
+				Yii::endProfile(__METHOD__ . "($sql)", __CLASS__);
 			}
 			return $n;
 		} catch (\Exception $e) {
 			if ($this->db->enableProfiling) {
-				\Yii::endProfile(__METHOD__ . "($sql)", __CLASS__);
+				Yii::endProfile(__METHOD__ . "($sql)", __CLASS__);
 			}
 			$message = $e->getMessage();
 
-			\Yii::error("$message\nFailed to execute SQL: {$sql}{$paramLog}", __CLASS__);
+			Yii::error("$message\nFailed to execute SQL: {$sql}{$paramLog}", __CLASS__);
 
 			$errorInfo = $e instanceof \PDOException ? $e->errorInfo : null;
 			throw new Exception($message, $errorInfo, (int)$e->getCode());
@@ -381,14 +383,14 @@ class Command extends \yii\base\Component
 			$paramLog = "\nParameters: " . var_export($this->_params, true);
 		}
 
-		\Yii::trace("Querying SQL: {$sql}{$paramLog}", __CLASS__);
+		Yii::trace("Querying SQL: {$sql}{$paramLog}", __CLASS__);
 
 		/** @var $cache \yii\caching\Cache */
 		if ($db->enableQueryCache && $method !== '') {
-			$cache = \Yii::$app->getComponent($db->queryCacheID);
+			$cache = is_string($db->queryCache) ? Yii::$app->getComponent($db->queryCache) : $db->queryCache;
 		}
 
-		if (isset($cache)) {
+		if (isset($cache) && $cache instanceof Cache) {
 			$cacheKey = $cache->buildKey(array(
 				__CLASS__,
 				$db->dsn,
@@ -397,14 +399,14 @@ class Command extends \yii\base\Component
 				$paramLog,
 			));
 			if (($result = $cache->get($cacheKey)) !== false) {
-				\Yii::trace('Query result found in cache', __CLASS__);
+				Yii::trace('Query result served from cache', __CLASS__);
 				return $result;
 			}
 		}
 
 		try {
 			if ($db->enableProfiling) {
-				\Yii::beginProfile(__METHOD__ . "($sql)", __CLASS__);
+				Yii::beginProfile(__METHOD__ . "($sql)", __CLASS__);
 			}
 
 			$this->prepare();
@@ -421,21 +423,21 @@ class Command extends \yii\base\Component
 			}
 
 			if ($db->enableProfiling) {
-				\Yii::endProfile(__METHOD__ . "($sql)", __CLASS__);
+				Yii::endProfile(__METHOD__ . "($sql)", __CLASS__);
 			}
 
-			if (isset($cache, $cacheKey)) {
+			if (isset($cache, $cacheKey) && $cache instanceof Cache) {
 				$cache->set($cacheKey, $result, $db->queryCacheDuration, $db->queryCacheDependency);
-				\Yii::trace('Saved query result in cache', __CLASS__);
+				Yii::trace('Saved query result in cache', __CLASS__);
 			}
 
 			return $result;
 		} catch (\Exception $e) {
 			if ($db->enableProfiling) {
-				\Yii::endProfile(__METHOD__ . "($sql)", __CLASS__);
+				Yii::endProfile(__METHOD__ . "($sql)", __CLASS__);
 			}
 			$message = $e->getMessage();
-			\Yii::error("$message\nCommand::$method() failed: {$sql}{$paramLog}", __CLASS__);
+			Yii::error("$message\nCommand::$method() failed: {$sql}{$paramLog}", __CLASS__);
 			$errorInfo = $e instanceof \PDOException ? $e->errorInfo : null;
 			throw new Exception($message, $errorInfo, (int)$e->getCode());
 		}

framework/db/Connection.php

@@ -10,6 +10,7 @@ namespace yii\db;
 use yii\base\Component;
 use yii\base\InvalidConfigException;
 use yii\base\NotSupportedException;
+use yii\caching\Cache;
 
 /**
  * Connection represents a connection to a database via [PDO](http://www.php.net/manual/en/ref.pdo.php).
@@ -136,10 +137,10 @@ class Connection extends Component
 	/**
 	 * @var boolean whether to enable schema caching.
 	 * Note that in order to enable truly schema caching, a valid cache component as specified
-	 * by [[schemaCacheID]] must be enabled and [[enableSchemaCache]] must be set true.
+	 * by [[schemaCache]] must be enabled and [[enableSchemaCache]] must be set true.
 	 * @see schemaCacheDuration
 	 * @see schemaCacheExclude
-	 * @see schemaCacheID
+	 * @see schemaCache
 	 */
 	public $enableSchemaCache = false;
 	/**
@@ -155,20 +156,20 @@ class Connection extends Component
 	 */
 	public $schemaCacheExclude = array();
 	/**
-	 * @var string the ID of the cache application component that is used to cache the table metadata.
-	 * Defaults to 'cache'.
+	 * @var Cache|string the cache object or the ID of the cache application component that
+	 * is used to cache the table metadata.
 	 * @see enableSchemaCache
 	 */
-	public $schemaCacheID = 'cache';
+	public $schemaCache = 'cache';
 	/**
 	 * @var boolean whether to enable query caching.
 	 * Note that in order to enable query caching, a valid cache component as specified
-	 * by [[queryCacheID]] must be enabled and [[enableQueryCache]] must be set true.
+	 * by [[queryCache]] must be enabled and [[enableQueryCache]] must be set true.
 	 *
 	 * Methods [[beginCache()]] and [[endCache()]] can be used as shortcuts to turn on
 	 * and off query caching on the fly.
 	 * @see queryCacheDuration
-	 * @see queryCacheID
+	 * @see queryCache
 	 * @see queryCacheDependency
 	 * @see beginCache()
 	 * @see endCache()
@@ -176,7 +177,7 @@ class Connection extends Component
 	public $enableQueryCache = false;
 	/**
 	 * @var integer number of seconds that query results can remain valid in cache.
-	 * Defaults to 3600, meaning one hour.
+	 * Defaults to 3600, meaning 3600 seconds, or one hour.
 	 * Use 0 to indicate that the cached data will never expire.
 	 * @see enableQueryCache
 	 */
@@ -188,11 +189,11 @@ class Connection extends Component
 	 */
 	public $queryCacheDependency;
 	/**
-	 * @var string the ID of the cache application component that is used for query caching.
-	 * Defaults to 'cache'.
+	 * @var Cache|string the cache object or the ID of the cache application component
+	 * that is used for query caching.
 	 * @see enableQueryCache
 	 */
-	public $queryCacheID = 'cache';
+	public $queryCache = 'cache';
 	/**
 	 * @var string the charset used for database connection. The property is only used
 	 * for MySQL and PostgreSQL databases. Defaults to null, meaning using default charset
@@ -290,7 +291,7 @@ class Connection extends Component
 	 * This method is provided as a shortcut to setting two properties that are related
 	 * with query caching: [[queryCacheDuration]] and [[queryCacheDependency]].
 	 * @param integer $duration the number of seconds that query results may remain valid in cache.
-	 * See [[queryCacheDuration]] for more details.
+	 * If not set, it will use the value of [[queryCacheDuration]]. See [[queryCacheDuration]] for more details.
 	 * @param \yii\caching\Dependency $dependency the dependency for the cached query result.
 	 * See [[queryCacheDependency]] for more details.
 	 */

framework/db/Schema.php

@@ -7,6 +7,7 @@
 
 namespace yii\db;
 
+use Yii;
 use yii\base\NotSupportedException;
 use yii\base\InvalidCallException;
 use yii\caching\Cache;
@@ -84,21 +85,21 @@ abstract class Schema extends \yii\base\Object
 		$db = $this->db;
 		$realName = $this->getRealTableName($name);
 
-		/** @var $cache Cache */
-		if ($db->enableSchemaCache && ($cache = \Yii::$app->getComponent($db->schemaCacheID)) !== null && !in_array($name, $db->schemaCacheExclude, true)) {
-			$key = $this->getCacheKey($cache, $name);
-			if ($refresh || ($table = $cache->get($key)) === false) {
-				$table = $this->loadTableSchema($realName);
-				if ($table !== null) {
-					$cache->set($key, $table, $db->schemaCacheDuration);
+		if ($db->enableSchemaCache && !in_array($name, $db->schemaCacheExclude, true)) {
+			/** @var $cache Cache */
+			$cache = is_string($db->schemaCache) ? Yii::$app->getComponent($db->schemaCache) : $db->schemaCache;
+			if ($cache instanceof Cache) {
+				$key = $this->getCacheKey($cache, $name);
+				if ($refresh || ($table = $cache->get($key)) === false) {
+					$table = $this->loadTableSchema($realName);
+					if ($table !== null) {
+						$cache->set($key, $table, $db->schemaCacheDuration);
+					}
 				}
+				return $this->_tables[$name] = $table;
 			}
-			$this->_tables[$name] = $table;
-		} else {
-			$this->_tables[$name] = $table = $this->loadTableSchema($realName);
 		}
-
-		return $table;
+		return $this->_tables[$name] = $table = $this->loadTableSchema($realName);
 	}
 
 	/**
@@ -173,8 +174,9 @@ abstract class Schema extends \yii\base\Object
 	 */
 	public function refresh()
 	{
-		/** @var $cache \yii\caching\Cache */
-		if ($this->db->enableSchemaCache && ($cache = \Yii::$app->getComponent($this->db->schemaCacheID)) !== null) {
+		/** @var $cache Cache */
+		$cache = is_string($this->db->schemaCache) ? Yii::$app->getComponent($this->db->schemaCache) : $this->db->schemaCache;
+		if ($this->db->enableSchemaCache && $cache instanceof Cache) {
 			foreach ($this->_tables as $name => $table) {
 				$cache->delete($this->getCacheKey($cache, $name));
 			}

framework/logging/DbTarget.php

@@ -7,16 +7,15 @@
 
 namespace yii\logging;
 
+use Yii;
 use yii\db\Connection;
 use yii\base\InvalidConfigException;
 
 /**
  * DbTarget stores log messages in a database table.
  *
- * By default, DbTarget will use the database specified by [[connectionID]] and save
- * messages into a table named by [[tableName]]. Please refer to [[tableName]] for the required
- * table structure. Note that this table must be created beforehand. Otherwise an exception
- * will be thrown when DbTarget is saving messages into DB.
+ * By default, DbTarget stores the log messages in a DB table named 'tbl_log'. This table
+ * must be pre-created. The table name can be changed by setting [[logTable]].
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
  * @since 2.0
@@ -24,20 +23,18 @@ use yii\base\InvalidConfigException;
 class DbTarget extends Target
 {
 	/**
-	 * @var string the ID of [[Connection]] application component.
-	 * Defaults to 'db'. Please make sure that your database contains a table
-	 * whose name is as specified in [[tableName]] and has the required table structure.
-	 * @see tableName
+	 * @var Connection|string the DB connection object or the application component ID of the DB connection.
+	 * After the DbTarget object is created, if you want to change this property, you should only assign it
+	 * with a DB connection object.
 	 */
-	public $connectionID = 'db';
+	public $db = 'db';
 	/**
-	 * @var string the name of the DB table that stores log messages. Defaults to 'tbl_log'.
-	 *
-	 * The DB table should have the following structure:
+	 * @var string name of the DB table to store cache content.
+	 * The table should be pre-created as follows:
 	 *
 	 * ~~~
 	 * CREATE TABLE tbl_log (
-	 *	   id       INTEGER NOT NULL AUTO_INCREMENT PRIMARY KEY,
+	 *	   id       BIGINT NOT NULL AUTO_INCREMENT PRIMARY KEY,
 	 *	   level    INTEGER,
 	 *	   category VARCHAR(255),
 	 *	   log_time INTEGER,
@@ -48,42 +45,29 @@ class DbTarget extends Target
 	 * ~~~
 	 *
 	 * Note that the 'id' column must be created as an auto-incremental column.
-	 * The above SQL shows the syntax of MySQL. If you are using other DBMS, you need
+	 * The above SQL uses the MySQL syntax. If you are using other DBMS, you need
 	 * to adjust it accordingly. For example, in PostgreSQL, it should be `id SERIAL PRIMARY KEY`.
 	 *
 	 * The indexes declared above are not required. They are mainly used to improve the performance
 	 * of some queries about message levels and categories. Depending on your actual needs, you may
-	 * want to create additional indexes (e.g. index on log_time).
+	 * want to create additional indexes (e.g. index on `log_time`).
 	 */
-	public $tableName = 'tbl_log';
-
-	private $_db;
+	public $logTable = 'tbl_log';
 
 	/**
-	 * Returns the DB connection used for saving log messages.
-	 * @return Connection the DB connection instance
-	 * @throws InvalidConfigException if [[connectionID]] does not point to a valid application component.
+	 * Initializes the DbTarget component.
+	 * This method will initialize the [[db]] property to make sure it refers to a valid DB connection.
+	 * @throws InvalidConfigException if [[db]] is invalid.
 	 */
-	public function getDb()
+	public function init()
 	{
-		if ($this->_db === null) {
-			$db = \Yii::$app->getComponent($this->connectionID);
-			if ($db instanceof Connection) {
-				$this->_db = $db;
-			} else {
-				throw new InvalidConfigException("DbTarget::connectionID must refer to the ID of a DB application component.");
-			}
+		parent::init();
+		if (is_string($this->db)) {
+			$this->db = Yii::$app->getComponent($this->db);
+		}
+		if (!$this->db instanceof Connection) {
+			throw new InvalidConfigException("DbTarget::db must be either a DB connection instance or the application component ID of a DB connection.");
 		}
-		return $this->_db;
-	}
-
-	/**
-	 * Sets the DB connection used by the cache component.
-	 * @param Connection $value the DB connection instance
-	 */
-	public function setDb($value)
-	{
-		$this->_db = $value;
 	}
 
 	/**
@@ -93,10 +77,9 @@ class DbTarget extends Target
 	 */
 	public function export($messages)
 	{
-		$db = $this->getDb();
-		$tableName = $db->quoteTableName($this->tableName);
+		$tableName = $this->db->quoteTableName($this->logTable);
 		$sql = "INSERT INTO $tableName (level, category, log_time, message) VALUES (:level, :category, :log_time, :message)";
-		$command = $db->createCommand($sql);
+		$command = $this->db->createCommand($sql);
 		foreach ($messages as $message) {
 			$command->bindValues(array(
 				':level' => $message[1],

framework/web/CacheSession.php

@@ -15,7 +15,7 @@ use yii\base\InvalidConfigException;
  * CacheSession implements a session component using cache as storage medium.
  *
  * The cache being used can be any cache application component.
- * The ID of the cache application component is specified via [[cacheID]], which defaults to 'cache'.
+ * The ID of the cache application component is specified via [[cache]], which defaults to 'cache'.
  *
  * Beware, by definition cache storage are volatile, which means the data stored on them
  * may be swapped out and get lost. Therefore, you must make sure the cache used by this component
@@ -27,14 +27,27 @@ use yii\base\InvalidConfigException;
 class CacheSession extends Session
 {
 	/**
-	 * @var string the ID of the cache application component. Defaults to 'cache' (the primary cache application component.)
+	 * @var Cache|string the cache object or the application component ID of the cache object.
+	 * The session data will be stored using this cache object.
+	 *
+	 * After the CacheSession object is created, if you want to change this property,
+	 * you should only assign it with a cache object.
 	 */
-	public $cacheID = 'cache';
+	public $cache = 'cache';
 
 	/**
-	 * @var Cache the cache component
+	 * Initializes the application component.
 	 */
-	private $_cache;
+	public function init()
+	{
+		parent::init();
+		if (is_string($this->cache)) {
+			$this->cache = Yii::$app->getComponent($this->cache);
+		}
+		if (!$this->cache instanceof Cache) {
+			throw new InvalidConfigException('CacheSession::cache must refer to the application component ID of a cache object.');
+		}
+	}
 
 	/**
 	 * Returns a value indicating whether to use custom session storage.
@@ -47,33 +60,6 @@ class CacheSession extends Session
 	}
 
 	/**
-	 * Returns the cache instance used for storing session data.
-	 * @return Cache the cache instance
-	 * @throws InvalidConfigException if [[cacheID]] does not point to a valid application component.
-	 */
-	public function getCache()
-	{
-		if ($this->_cache === null) {
-			$cache = Yii::$app->getComponent($this->cacheID);
-			if ($cache instanceof Cache) {
-				$this->_cache = $cache;
-			} else {
-				throw new InvalidConfigException('CacheSession::cacheID must refer to the ID of a cache application component.');
-			}
-		}
-		return $this->_cache;
-	}
-
-	/**
-	 * Sets the cache instance used by the session component.
-	 * @param Cache $value the cache instance
-	 */
-	public function setCache($value)
-	{
-		$this->_cache = $value;
-	}
-
-	/**
 	 * Session read handler.
 	 * Do not call this method directly.
 	 * @param string $id session ID
@@ -81,7 +67,7 @@ class CacheSession extends Session
 	 */
 	public function readSession($id)
 	{
-		$data = $this->getCache()->get($this->calculateKey($id));
+		$data = $this->cache->get($this->calculateKey($id));
 		return $data === false ? '' : $data;
 	}
 
@@ -94,7 +80,7 @@ class CacheSession extends Session
 	 */
 	public function writeSession($id, $data)
 	{
-		return $this->getCache()->set($this->calculateKey($id), $data, $this->getTimeout());
+		return $this->cache->set($this->calculateKey($id), $data, $this->getTimeout());
 	}
 
 	/**
@@ -105,7 +91,7 @@ class CacheSession extends Session
 	 */
 	public function destroySession($id)
 	{
-		return $this->getCache()->delete($this->calculateKey($id));
+		return $this->cache->delete($this->calculateKey($id));
 	}
 
 	/**
@@ -115,6 +101,6 @@ class CacheSession extends Session
 	 */
 	protected function calculateKey($id)
 	{
-		return $this->getCache()->buildKey(array(__CLASS__, $id));
+		return $this->cache->buildKey(array(__CLASS__, $id));
 	}
 }

framework/web/DbSession.php

@@ -15,58 +15,70 @@ use yii\base\InvalidConfigException;
 /**
  * DbSession extends [[Session]] by using database as session data storage.
  *
- * DbSession uses a DB application component to perform DB operations. The ID of the DB application
- * component is specified via [[connectionID]] which defaults to 'db'.
- *
  * By default, DbSession stores session data in a DB table named 'tbl_session'. This table
- * must be pre-created. The table name can be changed by setting [[sessionTableName]].
- * The table should have the following structure:
- *
+ * must be pre-created. The table name can be changed by setting [[sessionTable]].
+ * 
+ * The following example shows how you can configure the application to use DbSession:
+ * 
  * ~~~
- * CREATE TABLE tbl_session
- * (
- *     id CHAR(32) PRIMARY KEY,
- *     expire INTEGER,
- *     data BLOB
+ * 'session' => array(
+ *     'class' => 'yii\web\DbSession',
+ *     // 'db' => 'mydb',
+ *     // 'sessionTable' => 'my_session',
  * )
  * ~~~
  *
- * where 'BLOB' refers to the BLOB-type of your preferred database. Below are the BLOB type
- * that can be used for some popular databases:
- *
- * - MySQL: LONGBLOB
- * - PostgreSQL: BYTEA
- * - MSSQL: BLOB
- *
- * When using DbSession in a production server, we recommend you create a DB index for the 'expire'
- * column in the session table to improve the performance.
- *
  * @author Qiang Xue <qiang.xue@gmail.com>
  * @since 2.0
  */
 class DbSession extends Session
 {
 	/**
-	 * @var string the ID of a {@link CDbConnection} application component. If not set, a SQLite database
-	 * will be automatically created and used. The SQLite database file is
-	 * is <code>protected/runtime/session-YiiVersion.db</code>.
+	 * @var Connection|string the DB connection object or the application component ID of the DB connection.
+	 * After the DbSession object is created, if you want to change this property, you should only assign it
+	 * with a DB connection object.
 	 */
-	public $connectionID;
+	public $db = 'db';
 	/**
-	 * @var string the name of the DB table to store session content.
-	 * Note, if {@link autoCreateSessionTable} is false and you want to create the DB table manually by yourself,
-	 * you need to make sure the DB table is of the following structure:
-	 * <pre>
-	 * (id CHAR(32) PRIMARY KEY, expire INTEGER, data BLOB)
-	 * </pre>
-	 * @see autoCreateSessionTable
+	 * @var string the name of the DB table that stores the session data.
+	 * The table should be pre-created as follows:
+	 *
+	 * ~~~
+	 * CREATE TABLE tbl_session
+	 * (
+	 *     id CHAR(40) NOT NULL PRIMARY KEY,
+	 *     expire INTEGER,
+	 *     data BLOB
+	 * )
+	 * ~~~
+	 *
+	 * where 'BLOB' refers to the BLOB-type of your preferred DBMS. Below are the BLOB type
+	 * that can be used for some popular DBMS:
+	 *
+	 * - MySQL: LONGBLOB
+	 * - PostgreSQL: BYTEA
+	 * - MSSQL: BLOB
+	 *
+	 * When using DbSession in a production server, we recommend you create a DB index for the 'expire'
+	 * column in the session table to improve the performance.
 	 */
-	public $sessionTableName = 'tbl_session';
+	public $sessionTable = 'tbl_session';
+
 	/**
-	 * @var Connection the DB connection instance
+	 * Initializes the DbSession component.
+	 * This method will initialize the [[db]] property to make sure it refers to a valid DB connection.
+	 * @throws InvalidConfigException if [[db]] is invalid.
 	 */
-	private $_db;
-
+	public function init()
+	{
+		parent::init();
+		if (is_string($this->db)) {
+			$this->db = Yii::$app->getComponent($this->db);
+		}
+		if (!$this->db instanceof Connection) {
+			throw new InvalidConfigException("DbSession::db must be either a DB connection instance or the application component ID of a DB connection.");
+		}		
+	}
 
 	/**
 	 * Returns a value indicating whether to use custom session storage.
@@ -94,56 +106,31 @@ class DbSession extends Session
 
 		parent::regenerateID(false);
 		$newID = session_id();
-		$db = $this->getDb();
 
 		$query = new Query;
-		$row = $query->from($this->sessionTableName)
+		$row = $query->from($this->sessionTable)
 			->where(array('id' => $oldID))
-			->createCommand($db)
+			->createCommand($this->db)
 			->queryRow();
 		if ($row !== false) {
 			if ($deleteOldSession) {
-				$db->createCommand()->update($this->sessionTableName, array(
-					'id' => $newID
-				), array('id' => $oldID))->execute();
+				$this->db->createCommand()
+					->update($this->sessionTable, array('id' => $newID), array('id' => $oldID))
+					->execute();
 			} else {
 				$row['id'] = $newID;
-				$db->createCommand()->insert($this->sessionTableName, $row)->execute();
+				$this->db->createCommand()
+					->insert($this->sessionTable, $row)
+					->execute();
 			}
 		} else {
 			// shouldn't reach here normally
-			$db->createCommand()->insert($this->sessionTableName, array(
-				'id' => $newID,
-				'expire' => time() + $this->getTimeout(),
-			))->execute();
-		}
-	}
-	
-	/**
-	 * Returns the DB connection instance used for storing session data.
-	 * @return Connection the DB connection instance
-	 * @throws InvalidConfigException if [[connectionID]] does not point to a valid application component.
-	 */
-	public function getDb()
-	{
-		if ($this->_db === null) {
-			$db = Yii::$app->getComponent($this->connectionID);
-			if ($db instanceof Connection) {
-				$this->_db = $db;
-			} else {
-				throw new InvalidConfigException("DbSession::connectionID must refer to the ID of a DB application component.");
-			}
+			$this->db->createCommand()
+				->insert($this->sessionTable, array(
+					'id' => $newID,
+					'expire' => time() + $this->getTimeout(),
+				))->execute();
 		}
-		return $this->_db;
-	}
-
-	/**
-	 * Sets the DB connection used by the session component.
-	 * @param Connection $value the DB connection instance
-	 */
-	public function setDb($value)
-	{
-		$this->_db = $value;
 	}
 
 	/**
@@ -156,9 +143,9 @@ class DbSession extends Session
 	{
 		$query = new Query;
 		$data = $query->select(array('data'))
-			->from($this->sessionTableName)
+			->from($this->sessionTable)
 			->where('expire>:expire AND id=:id', array(':expire' => time(), ':id' => $id))
-			->createCommand($this->getDb())
+			->createCommand($this->db)
 			->queryScalar();
 		return $data === false ? '' : $data;
 	}
@@ -176,24 +163,23 @@ class DbSession extends Session
 		// http://us.php.net/manual/en/function.session-set-save-handler.php
 		try {
 			$expire = time() + $this->getTimeout();
-			$db = $this->getDb();
 			$query = new Query;
 			$exists = $query->select(array('id'))
-				->from($this->sessionTableName)
+				->from($this->sessionTable)
 				->where(array('id' => $id))
-				->createCommand($db)
+				->createCommand($this->db)
 				->queryScalar();
 			if ($exists === false) {
-				$db->createCommand()->insert($this->sessionTableName, array(
-					'id' => $id,
-					'data' => $data,
-					'expire' => $expire,
-				))->execute();
+				$this->db->createCommand()
+					->insert($this->sessionTable, array(
+						'id' => $id,
+						'data' => $data,
+						'expire' => $expire,
+					))->execute();
 			} else {
-				$db->createCommand()->update($this->sessionTableName, array(
-					'data' => $data,
-					'expire' => $expire
-				), array('id' => $id))->execute();
+				$this->db->createCommand()
+					->update($this->sessionTable, array('data' => $data, 'expire' => $expire), array('id' => $id))
+					->execute();
 			}
 		} catch (\Exception $e) {
 			if (YII_DEBUG) {
@@ -213,8 +199,8 @@ class DbSession extends Session
 	 */
 	public function destroySession($id)
 	{
-		$this->getDb()->createCommand()
-			->delete($this->sessionTableName, array('id' => $id))
+		$this->db->createCommand()
+			->delete($this->sessionTable, array('id' => $id))
 			->execute();
 		return true;
 	}
@@ -227,8 +213,8 @@ class DbSession extends Session
 	 */
 	public function gcSession($maxLifetime)
 	{
-		$this->getDb()->createCommand()
-			->delete($this->sessionTableName, 'expire<:expire', array(':expire' => time()))
+		$this->db->createCommand()
+			->delete($this->sessionTable, 'expire<:expire', array(':expire' => time()))
 			->execute();
 		return true;
 	}

framework/web/PageCache.php

-<?php
-/**
- * @link http://www.yiiframework.com/
- * @copyright Copyright (c) 2008 Yii Software LLC
- * @license http://www.yiiframework.com/license/
- */
-
-namespace yii\web;
-
-use Yii;
-use yii\base\ActionFilter;
-use yii\base\Action;
-use yii\base\View;
-use yii\caching\Dependency;
-
-/**
- * @author Qiang Xue <qiang.xue@gmail.com>
- * @since 2.0
- */
-class PageCache extends ActionFilter
-{
-	/**
-	 * @var boolean whether the content being cached should be differentiated according to the route.
-	 * A route consists of the requested controller ID and action ID. Defaults to true.
-	 */
-	public $varyByRoute = true;
-	/**
-	 * @var View the view object that is used to create the fragment cache widget to implement page caching.
-	 * If not set, the view registered with the application will be used.
-	 */
-	public $view;
-
-	/**
-	 * @var string the ID of the cache application component. Defaults to 'cache' (the primary cache application component.)
-	 */
-	public $cacheID = 'cache';
-	/**
-	 * @var integer number of seconds that the data can remain valid in cache.
-	 * Use 0 to indicate that the cached data will never expire.
-	 */
-	public $duration = 60;
-	/**
-	 * @var array|Dependency the dependency that the cached content depends on.
-	 * This can be either a [[Dependency]] object or a configuration array for creating the dependency object.
-	 * For example,
-	 *
-	 * ~~~
-	 * array(
-	 *     'class' => 'yii\caching\DbDependency',
-	 *     'sql' => 'SELECT MAX(lastModified) FROM Post',
-	 * )
-	 * ~~~
-	 *
-	 * would make the output cache depends on the last modified time of all posts.
-	 * If any post has its modification time changed, the cached content would be invalidated.
-	 */
-	public $dependency;
-	/**
-	 * @var array list of factors that would cause the variation of the content being cached.
-	 * Each factor is a string representing a variation (e.g. the language, a GET parameter).
-	 * The following variation setting will cause the content to be cached in different versions
-	 * according to the current application language:
-	 *
-	 * ~~~
-	 * array(
-	 *     Yii::$app->language,
-	 * )
-	 */
-	public $variations;
-	/**
-	 * @var boolean whether to enable the fragment cache. You may use this property to turn on and off
-	 * the fragment cache according to specific setting (e.g. enable fragment cache only for GET requests).
-	 */
-	public $enabled = true;
-
-
-	public function init()
-	{
-		parent::init();
-		if ($this->view === null) {
-			$this->view = Yii::$app->getView();
-		}
-	}
-
-	/**
-	 * This method is invoked right before an action is to be executed (after all possible filters.)
-	 * You may override this method to do last-minute preparation for the action.
-	 * @param Action $action the action to be executed.
-	 * @return boolean whether the action should continue to be executed.
-	 */
-	public function beforeAction($action)
-	{
-		$properties = array();
-		foreach (array('cacheID', 'duration', 'dependency', 'variations', 'enabled') as $name) {
-			$properties[$name] = $this->$name;
-		}
-		$id = $this->varyByRoute ? $action->getUniqueId() : __CLASS__;
-		return $this->view->beginCache($id, $properties);
-	}
-
-	/**
-	 * This method is invoked right after an action is executed.
-	 * You may override this method to do some postprocessing for the action.
-	 * @param Action $action the action just executed.
-	 */
-	public function afterAction($action)
-	{
-		$this->view->endCache();
-	}
+<?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
+
+namespace yii\web;
+
+use Yii;
+use yii\base\ActionFilter;
+use yii\base\Action;
+use yii\base\View;
+use yii\caching\Dependency;
+
+/**
+ * @author Qiang Xue <qiang.xue@gmail.com>
+ * @since 2.0
+ */
+class PageCache extends ActionFilter
+{
+	/**
+	 * @var boolean whether the content being cached should be differentiated according to the route.
+	 * A route consists of the requested controller ID and action ID. Defaults to true.
+	 */
+	public $varyByRoute = true;
+	/**
+	 * @var View the view object that is used to create the fragment cache widget to implement page caching.
+	 * If not set, the view registered with the application will be used.
+	 */
+	public $view;
+	/**
+	 * @var string the application component ID of the [[\yii\caching\Cache|cache]] object.
+	 */
+	public $cache = 'cache';
+	/**
+	 * @var integer number of seconds that the data can remain valid in cache.
+	 * Use 0 to indicate that the cached data will never expire.
+	 */
+	public $duration = 60;
+	/**
+	 * @var array|Dependency the dependency that the cached content depends on.
+	 * This can be either a [[Dependency]] object or a configuration array for creating the dependency object.
+	 * For example,
+	 *
+	 * ~~~
+	 * array(
+	 *     'class' => 'yii\caching\DbDependency',
+	 *     'sql' => 'SELECT MAX(lastModified) FROM Post',
+	 * )
+	 * ~~~
+	 *
+	 * would make the output cache depends on the last modified time of all posts.
+	 * If any post has its modification time changed, the cached content would be invalidated.
+	 */
+	public $dependency;
+	/**
+	 * @var array list of factors that would cause the variation of the content being cached.
+	 * Each factor is a string representing a variation (e.g. the language, a GET parameter).
+	 * The following variation setting will cause the content to be cached in different versions
+	 * according to the current application language:
+	 *
+	 * ~~~
+	 * array(
+	 *     Yii::$app->language,
+	 * )
+	 */
+	public $variations;
+	/**
+	 * @var boolean whether to enable the fragment cache. You may use this property to turn on and off
+	 * the fragment cache according to specific setting (e.g. enable fragment cache only for GET requests).
+	 */
+	public $enabled = true;
+
+
+	public function init()
+	{
+		parent::init();
+		if ($this->view === null) {
+			$this->view = Yii::$app->getView();
+		}
+	}
+
+	/**
+	 * This method is invoked right before an action is to be executed (after all possible filters.)
+	 * You may override this method to do last-minute preparation for the action.
+	 * @param Action $action the action to be executed.
+	 * @return boolean whether the action should continue to be executed.
+	 */
+	public function beforeAction($action)
+	{
+		$properties = array();
+		foreach (array('cache', 'duration', 'dependency', 'variations', 'enabled') as $name) {
+			$properties[$name] = $this->$name;
+		}
+		$id = $this->varyByRoute ? $action->getUniqueId() : __CLASS__;
+		return $this->view->beginCache($id, $properties);
+	}
+
+	/**
+	 * This method is invoked right after an action is executed.
+	 * You may override this method to do some postprocessing for the action.
+	 * @param Action $action the action just executed.
+	 */
+	public function afterAction($action)
+	{
+		$this->view->endCache();
+	}
 }
\ No newline at end of file

framework/web/UrlManager.php

@@ -9,6 +9,7 @@ namespace yii\web;
 
 use Yii;
 use yii\base\Component;
+use yii\caching\Cache;
 
 /**
  * UrlManager handles HTTP request parsing and creation of URLs based on a set of rules.
@@ -49,11 +50,14 @@ class UrlManager extends Component
 	 */
 	public $routeVar = 'r';
 	/**
-	 * @var string the ID of the cache component that is used to cache the parsed URL rules.
-	 * Defaults to 'cache' which refers to the primary cache component registered with the application.
-	 * Set this property to false if you do not want to cache the URL rules.
+	 * @var Cache|string the cache object or the application component ID of the cache object.
+	 * Compiled URL rules will be cached through this cache object, if it is available.
+	 *
+	 * After the UrlManager object is created, if you want to change this property,
+	 * you should only assign it with a cache object.
+	 * Set this property to null if you do not want to cache the URL rules.
 	 */
-	public $cacheID = 'cache';
+	public $cache = 'cache';
 	/**
 	 * @var string the default class name for creating URL rule instances
 	 * when it is not specified in [[rules]].
@@ -65,11 +69,14 @@ class UrlManager extends Component
 
 
 	/**
-	 * Initializes the application component.
+	 * Initializes UrlManager.
 	 */
 	public function init()
 	{
 		parent::init();
+		if (is_string($this->cache)) {
+			$this->cache = Yii::$app->getComponent($this->cache);
+		}
 		$this->compileRules();
 	}
 
@@ -81,13 +88,10 @@ class UrlManager extends Component
 		if (!$this->enablePrettyUrl || $this->rules === array()) {
 			return;
 		}
-		/**
-		 * @var $cache \yii\caching\Cache
-		 */
-		if ($this->cacheID !== false && ($cache = Yii::$app->getComponent($this->cacheID)) !== null) {
-			$key = $cache->buildKey(__CLASS__);
+		if ($this->cache instanceof Cache) {
+			$key = $this->cache->buildKey(__CLASS__);
 			$hash = md5(json_encode($this->rules));
-			if (($data = $cache->get($key)) !== false && isset($data[1]) && $data[1] === $hash) {
+			if (($data = $this->cache->get($key)) !== false && isset($data[1]) && $data[1] === $hash) {
 				$this->rules = $data[0];
 				return;
 			}
@@ -100,8 +104,8 @@ class UrlManager extends Component
 			$this->rules[$i] = Yii::createObject($rule);
 		}
 
-		if (isset($cache)) {
-			$cache->set($key, array($this->rules, $hash));
+		if ($this->cache instanceof Cache) {
+			$this->cache->set($key, array($this->rules, $hash));
 		}
 	}
 

tests/unit/framework/web/UrlManagerTest.php

@@ -11,6 +11,7 @@ class UrlManagerTest extends \yiiunit\TestCase
 		// default setting with '/' as base url
 		$manager = new UrlManager(array(
 			'baseUrl' => '/',
+			'cache' => null,
 		));
 		$url = $manager->createUrl('post/view');
 		$this->assertEquals('/?r=post/view', $url);
@@ -20,6 +21,7 @@ class UrlManagerTest extends \yiiunit\TestCase
 		// default setting with '/test/' as base url
 		$manager = new UrlManager(array(
 			'baseUrl' => '/test/',
+			'cache' => null,
 		));
 		$url = $manager->createUrl('post/view', array('id' => 1, 'title' => 'sample post'));
 		$this->assertEquals('/test/?r=post/view&id=1&title=sample+post', $url);
@@ -28,18 +30,21 @@ class UrlManagerTest extends \yiiunit\TestCase
 		$manager = new UrlManager(array(
 			'enablePrettyUrl' => true,
 			'baseUrl' => '/',
+			'cache' => null,
 		));
 		$url = $manager->createUrl('post/view', array('id' => 1, 'title' => 'sample post'));
 		$this->assertEquals('/post/view?id=1&title=sample+post', $url);
 		$manager = new UrlManager(array(
 			'enablePrettyUrl' => true,
 			'baseUrl' => '/test/',
+			'cache' => null,
 		));
 		$url = $manager->createUrl('post/view', array('id' => 1, 'title' => 'sample post'));
 		$this->assertEquals('/test/post/view?id=1&title=sample+post', $url);
 		$manager = new UrlManager(array(
 			'enablePrettyUrl' => true,
 			'baseUrl' => '/test/index.php',
+			'cache' => null,
 		));
 		$url = $manager->createUrl('post/view', array('id' => 1, 'title' => 'sample post'));
 		$this->assertEquals('/test/index.php/post/view?id=1&title=sample+post', $url);
@@ -49,7 +54,7 @@ class UrlManagerTest extends \yiiunit\TestCase
 		// pretty URL with rules
 		$manager = new UrlManager(array(
 			'enablePrettyUrl' => true,
-			'cacheID' => false,
+			'cache' => null,
 			'rules' => array(
 				array(
 					'pattern' => 'post/<id>/<title>',
@@ -66,7 +71,7 @@ class UrlManagerTest extends \yiiunit\TestCase
 		// pretty URL with rules and suffix
 		$manager = new UrlManager(array(
 			'enablePrettyUrl' => true,
-			'cacheID' => false,
+			'cache' => null,
 			'rules' => array(
 				array(
 					'pattern' => 'post/<id>/<title>',
@@ -87,6 +92,7 @@ class UrlManagerTest extends \yiiunit\TestCase
 		$manager = new UrlManager(array(
 			'baseUrl' => '/',
 			'hostInfo' => 'http://www.example.com',
+			'cache' => null,
 		));
 		$url = $manager->createAbsoluteUrl('post/view', array('id' => 1, 'title' => 'sample post'));
 		$this->assertEquals('http://www.example.com/?r=post/view&id=1&title=sample+post', $url);
@@ -94,7 +100,9 @@ class UrlManagerTest extends \yiiunit\TestCase
 
 	public function testParseRequest()
 	{
-		$manager = new UrlManager;
+		$manager = new UrlManager(array(
+			'cache' => null,
+		));
 		$request = new Request;
 
 		// default setting without 'r' param
@@ -115,6 +123,7 @@ class UrlManagerTest extends \yiiunit\TestCase
 		// pretty URL without rules
 		$manager = new UrlManager(array(
 			'enablePrettyUrl' => true,
+			'cache' => null,
 		));
 		// empty pathinfo
 		$request->pathInfo = '';
@@ -136,7 +145,7 @@ class UrlManagerTest extends \yiiunit\TestCase
 		// pretty URL rules
 		$manager = new UrlManager(array(
 			'enablePrettyUrl' => true,
-			'cacheID' => false,
+			'cache' => null,
 			'rules' => array(
 				array(
 					'pattern' => 'post/<id>/<title>',
@@ -169,7 +178,7 @@ class UrlManagerTest extends \yiiunit\TestCase
 		$manager = new UrlManager(array(
 			'enablePrettyUrl' => true,
 			'suffix' => '.html',
-			'cacheID' => false,
+			'cache' => null,
 			'rules' => array(
 				array(
 					'pattern' => 'post/<id>/<title>',

tests/unit/framework/web/UrlRuleTest.php

@@ -10,7 +10,7 @@ class UrlRuleTest extends \yiiunit\TestCase
 {
 	public function testCreateUrl()
 	{
-		$manager = new UrlManager;
+		$manager = new UrlManager(array('cache' => null));
 		$suites = $this->getTestsForCreateUrl();
 		foreach ($suites as $i => $suite) {
 			list ($name, $config, $tests) = $suite;
@@ -25,7 +25,7 @@ class UrlRuleTest extends \yiiunit\TestCase
 
 	public function testParseRequest()
 	{
-		$manager = new UrlManager;
+		$manager = new UrlManager(array('cache' => null));
 		$request = new Request;
 		$suites = $this->getTestsForParseRequest();
 		foreach ($suites as $i => $suite) {