CS fixes.

framework/yii/base/ErrorHandler.php

@@ -255,7 +255,7 @@ class ErrorHandler extends Component
 		if (isset($_SERVER['SERVER_SOFTWARE'])) {
 			foreach ($serverUrls as $url => $keywords) {
 				foreach ($keywords as $keyword) {
-					if (stripos($_SERVER['SERVER_SOFTWARE'], $keyword) !== false ) {
+					if (stripos($_SERVER['SERVER_SOFTWARE'], $keyword) !== false) {
 						return '<a href="' . $url . '" target="_blank">' . $this->htmlEncode($_SERVER['SERVER_SOFTWARE']) . '</a>';
 					}
 				}

framework/yii/base/Formatter.php

@@ -12,7 +12,6 @@ use DateTime;
 use yii\helpers\HtmlPurifier;
 use yii\helpers\Html;
 
-
 /**
  * Formatter provides a set of commonly used data formatting methods.
  *

framework/yii/base/InvalidCallException.php

@@ -23,4 +23,3 @@ class InvalidCallException extends Exception
 		return \Yii::t('yii', 'Invalid Call');
 	}
 }
-

framework/yii/base/InvalidConfigException.php

@@ -23,4 +23,3 @@ class InvalidConfigException extends Exception
 		return \Yii::t('yii', 'Invalid Configuration');
 	}
 }
-

framework/yii/base/InvalidParamException.php

@@ -23,4 +23,3 @@ class InvalidParamException extends Exception
 		return \Yii::t('yii', 'Invalid Parameter');
 	}
 }
-

framework/yii/base/InvalidRouteException.php

@@ -23,4 +23,3 @@ class InvalidRouteException extends UserException
 		return \Yii::t('yii', 'Invalid Route');
 	}
 }
-

framework/yii/base/Jsonable.php

@@ -18,5 +18,5 @@ interface Jsonable
 	/**
 	 * @return string the JSON representation of this object
 	 */
-	function toJson();
+	public function toJson();
 }

framework/yii/base/NotSupportedException.php

@@ -23,4 +23,3 @@ class NotSupportedException extends Exception
 		return \Yii::t('yii', 'Not Supported');
 	}
 }
-

framework/yii/base/Theme.php

@@ -73,7 +73,7 @@ class Theme extends Component
 	 */
 	public function init()
 	{
-	 	parent::init();
+		parent::init();
 		if (empty($this->pathMap)) {
 			if ($this->basePath !== null) {
 				$this->basePath = Yii::getAlias($this->basePath);

framework/yii/base/UnknownClassException.php

@@ -23,4 +23,3 @@ class UnknownClassException extends Exception
 		return \Yii::t('yii', 'Unknown Class');
 	}
 }
-

framework/yii/base/UnknownMethodException.php

@@ -23,4 +23,3 @@ class UnknownMethodException extends Exception
 		return \Yii::t('yii', 'Unknown Method');
 	}
 }
-

framework/yii/base/UnknownPropertyException.php

@@ -23,4 +23,3 @@ class UnknownPropertyException extends Exception
 		return \Yii::t('yii', 'Unknown Property');
 	}
 }
-

framework/yii/bootstrap/Button.php

@@ -6,9 +6,8 @@
  */
 
 namespace yii\bootstrap;
-use yii\base\InvalidConfigException;
-use yii\helpers\Html;
 
+use yii\helpers\Html;
 
 /**
  * Button renders a bootstrap button.

framework/yii/bootstrap/ButtonDropdown.php

@@ -6,8 +6,8 @@
  */
 
 namespace yii\bootstrap;
-use yii\helpers\Html;
 
+use yii\helpers\Html;
 
 /**
  * ButtonDropdown renders a group or split button dropdown bootstrap component.

framework/yii/bootstrap/ButtonGroup.php

@@ -10,7 +10,6 @@ namespace yii\bootstrap;
 use yii\helpers\base\ArrayHelper;
 use yii\helpers\Html;
 
-
 /**
  * ButtonGroup renders a button group bootstrap component.
  *

framework/yii/bootstrap/Collapse.php

@@ -130,4 +130,4 @@ class Collapse extends Widget
 
 		return implode("\n", $group);
 	}
-}
+}

framework/yii/bootstrap/Dropdown.php

@@ -11,7 +11,6 @@ use yii\base\InvalidConfigException;
 use yii\helpers\ArrayHelper;
 use yii\helpers\Html;
 
-
 /**
  * Dropdown renders a Bootstrap dropdown menu component.
  *

framework/yii/bootstrap/Nav.php

@@ -118,7 +118,7 @@ class Nav extends Widget
 		$url = Html::url(ArrayHelper::getValue($item, 'url', '#'));
 		$linkOptions = ArrayHelper::getValue($item, 'linkOptions', array());
 
-		if(ArrayHelper::getValue($item, 'active')) {
+		if (ArrayHelper::getValue($item, 'active')) {
 			$this->addCssClass($options, 'active');
 		}
 

framework/yii/bootstrap/Progress.php

@@ -11,7 +11,6 @@ use yii\base\InvalidConfigException;
 use yii\helpers\ArrayHelper;
 use yii\helpers\Html;
 
-
 /**
  * Progress renders a bootstrap progress bar component.
  *

framework/yii/bootstrap/Widget.php

@@ -11,7 +11,6 @@ use Yii;
 use yii\base\View;
 use yii\helpers\Json;
 
-
 /**
  * \yii\bootstrap\Widget is the base class for all bootstrap widgets.
  *

framework/yii/caching/DbCache.php

@@ -170,7 +170,7 @@ class DbCache extends Cache
 		} else {
 			return $this->addValue($key, $value, $expire);
 		}
- 	}
+	}
 
 	/**
 	 * Stores a value identified by a key into cache if the cache does not contain this key.

framework/yii/caching/XCache.php

@@ -86,4 +86,3 @@ class XCache extends Cache
 		return true;
 	}
 }
-

framework/yii/console/Exception.php

@@ -25,4 +25,3 @@ class Exception extends UserException
 		return \Yii::t('yii', 'Error');
 	}
 }
-

framework/yii/console/controllers/AssetController.php

@@ -220,7 +220,8 @@ class AssetController extends Controller
 	 * @param array $result already loaded bundles list.
 	 * @throws \yii\console\Exception on failure.
 	 */
-	protected function loadBundleDependency($name, $bundle, &$result) {
+	protected function loadBundleDependency($name, $bundle, &$result)
+	{
 		if (!empty($bundle->depends)) {
 			$assetManager = $this->getAssetManager();
 			foreach ($bundle->depends as $dependencyName) {
@@ -572,7 +573,7 @@ EOD;
 		$inputFileRelativePathParts = explode('/', $inputFileRelativePath);
 		$outputFileRelativePathParts = explode('/', $outputFileRelativePath);
 
-		$callback = function($matches) use ($inputFileRelativePathParts, $outputFileRelativePathParts) {
+		$callback = function ($matches) use ($inputFileRelativePathParts, $outputFileRelativePathParts) {
 			$fullMatch = $matches[0];
 			$inputUrl = $matches[1];
 

framework/yii/console/controllers/MessageController.php

@@ -179,8 +179,7 @@ class MessageController extends Controller
 			}
 			ksort($translated);
 			foreach ($translated as $message => $translation) {
-				if (!isset($merged[$message]) && !isset($todo[$message]) && !$removeOld)
+				if (!isset($merged[$message]) && !isset($todo[$message]) && !$removeOld) {
-				{
 					if (substr($translation, 0, 2) === '@@' && substr($translation, -2) === '@@') {
 						$todo[$message]=$translation;
 					} else {

framework/yii/db/Connection.php

@@ -305,8 +305,7 @@ class Connection extends Component
 				$this->pdo = $this->createPdoInstance();
 				$this->initConnection();
 				Yii::endProfile($token, __METHOD__);
-			}
+			} catch (\PDOException $e) {
-			catch (\PDOException $e) {
 				Yii::endProfile($token, __METHOD__);
 				Yii::error("Failed to open DB connection ({$this->dsn}): " . $e->getMessage(), __METHOD__);
 				$message = YII_DEBUG ? 'Failed to open DB connection: ' . $e->getMessage() : 'Failed to open DB connection.';
@@ -508,7 +507,7 @@ class Connection extends Component
 	{
 		$db = $this;
 		return preg_replace_callback('/(\\{\\{([%\w\-\. ]+)\\}\\}|\\[\\[([\w\-\. ]+)\\]\\])/',
-			function($matches) use($db) {
+			function ($matches) use ($db) {
 				if (isset($matches[3])) {
 					return $db->quoteColumnName($matches[3]);
 				} else {

framework/yii/debug/Module.php

@@ -14,4 +14,4 @@ namespace yii\debug;
 class Module extends \yii\base\Module
 {
 	public $controllerNamespace = 'yii\debug\controllers';
-}
+}

framework/yii/debug/controllers/DefaultController.php

@@ -31,4 +31,4 @@ class DefaultController extends Controller
 			echo "Unable to find debug data tagged with '$tag'.";
 		}
 	}
-}
+}

framework/yii/helpers/Json.php

@@ -14,5 +14,4 @@ namespace yii\helpers;
  */
 class Json extends base\Json
 {
-	
 }

framework/yii/helpers/base/Console.php

@@ -286,7 +286,7 @@ class Console
 	 * You can pass any of the FG_*, BG_* and TEXT_* constants and also [[xtermFgColor]] and [[xtermBgColor]].
 	 * @return string
 	 */
-	public static function ansiFormat($string, $format=array())
+	public static function ansiFormat($string, $format = array())
 	{
 		$code = implode(';', $format);
 		return "\033[0m" . ($code !== '' ? "\033[" . $code . "m" : '') . $string . "\033[0m";
@@ -589,11 +589,10 @@ class Console
 		if (static::isRunningOnWindows()) {
 			$output = array();
 			exec('mode con', $output);
-			if(isset($output) && strpos($output[1], 'CON')!==false) {
+			if (isset($output) && strpos($output[1], 'CON') !== false) {
 				return $size = array((int)preg_replace('~[^0-9]~', '', $output[3]), (int)preg_replace('~[^0-9]~', '', $output[4]));
 			}
 		} else {
-
 			// try stty if available
 			$stty = array();
 			if (exec('stty -a 2>&1', $stty) && preg_match('/rows\s+(\d+);\s*columns\s+(\d+);/mi', implode(' ', $stty), $matches)) {

framework/yii/helpers/base/Html.php

@@ -1479,5 +1479,4 @@ class Html
 		$name = strtolower(static::getInputName($model, $attribute));
 		return str_replace(array('[]', '][', '[', ']', ' '), array('', '-', '-', '', '-'), $name);
 	}
-
 }

framework/yii/helpers/base/Inflector.php

@@ -50,7 +50,7 @@ class Inflector
 		'/(ax|cris|test)is$/i' => '\1es',
 		'/s$/' => 's',
 		'/^$/' => '',
-		'/$/' => 's',		
+		'/$/' => 's',
 	);
 	/**
 	 * @var array the rules for converting a word into its singular form.
@@ -94,7 +94,7 @@ class Inflector
 		'/(n)ews$/i' => '\1\2ews',
 		'/eaus$/' => 'eau',
 		'/^(.*us)$/' => '\\1',
-		'/s$/i' => '',		
+		'/s$/i' => '',
 	);
 	/**
 	 * @var array the special rules for converting a word between its plural form and singular form.
@@ -468,7 +468,7 @@ class Inflector
 		if (in_array(($number % 100), range(11, 13))) {
 			return $number . 'th';
 		}
-		switch (($number % 10)) {
+		switch ($number % 10) {
 			case 1: return $number . 'st';
 			case 2: return $number . 'nd';
 			case 3: return $number . 'rd';

framework/yii/i18n/MessageSource.php

@@ -118,4 +118,3 @@ class MessageSource extends Component
 		}
 	}
 }
-

framework/yii/jui/Accordion.php

@@ -125,7 +125,7 @@ class Accordion extends Widget
 			$items[] = Html::tag($headerTag, $item['header'], $headerOptions);
 			$options = array_merge($this->itemOptions, ArrayHelper::getValue($item, 'options', array()));
 			$tag = ArrayHelper::remove($options, 'tag', 'div');
-			$items[] = Html::tag($tag, $item['content'], $options);;
+			$items[] = Html::tag($tag, $item['content'], $options);
 		}
 
 		return implode("\n", $items);

framework/yii/jui/Menu.php

@@ -10,7 +10,6 @@ namespace yii\jui;
 use Yii;
 use yii\helpers\Json;
 
-
 /**
  * Menu renders a menu jQuery UI widget.
  *

framework/yii/jui/Widget.php

@@ -10,7 +10,6 @@ namespace yii\jui;
 use Yii;
 use yii\helpers\Json;
 
-
 /**
  * \yii\jui\Widget is the base class for all jQuery UI widgets.
  *

framework/yii/rbac/DbManager.php

@@ -493,8 +493,9 @@ class DbManager extends Manager
 				'bizRule' => $row['biz_rule'],
 				'data' => $data,
 			));
-		} else
+		} else {
 			return null;
+		}
 	}
 
 	/**

framework/yii/rbac/PhpManager.php

@@ -468,7 +468,7 @@ class PhpManager extends Manager
 						'bizRule' => $assignment['bizRule'],
 						'data' => $assignment['data'],
 					));
- 				}
+				}
 			}
 		}
 	}

framework/yii/requirements/requirements.php

@@ -45,4 +45,4 @@ return array(
 		'by' => '<a href="http://www.php.net/manual/en/book.intl.php">Internationalization</a> support',
 		'memo' => 'PHP Intl extension 1.0.2 or higher is required when you want to use <abbr title="Internationalized domain names">IDN</abbr>-feature of EmailValidator or UrlValidator or the <code>yii\i18n\Formatter</code> class.'
 	),
-);
+);

framework/yii/validators/CaptchaValidator.php

@@ -117,4 +117,3 @@ class CaptchaValidator extends Validator
 		return 'yii.validation.captcha(value, messages, ' . json_encode($options) . ');';
 	}
 }
-

framework/yii/validators/DateValidator.php

@@ -73,4 +73,3 @@ class DateValidator extends Validator
 		return DateTime::createFromFormat($this->format, $value) !== false;
 	}
 }
-

framework/yii/validators/DefaultValueValidator.php

@@ -40,4 +40,3 @@ class DefaultValueValidator extends Validator
 		}
 	}
 }
-

framework/yii/validators/ExistValidator.php

@@ -99,4 +99,3 @@ class ExistValidator extends Validator
 		return $query->exists();
 	}
 }
-

framework/yii/validators/FilterValidator.php

@@ -6,6 +6,7 @@
  */
 
 namespace yii\validators;
+
 use yii\base\InvalidConfigException;
 
 /**

framework/yii/validators/RangeValidator.php

@@ -35,7 +35,7 @@ class RangeValidator extends Validator
 	 * @var boolean whether to invert the validation logic. Defaults to false. If set to true,
 	 * the attribute value should NOT be among the list of values defined via [[range]].
 	 **/
- 	public $not = false;
+	public $not = false;
 
 	/**
 	 * Initializes the validator.

framework/yii/validators/RegularExpressionValidator.php

@@ -32,7 +32,7 @@ class RegularExpressionValidator extends Validator
 	 * the regular expression defined via [[pattern]] should NOT match the attribute value.
 	 * @throws InvalidConfigException if the "pattern" is not a valid regular expression
 	 **/
- 	public $not = false;
+	public $not = false;
 
 	/**
 	 * Initializes the validator.

framework/yii/validators/StringValidator.php

@@ -174,4 +174,3 @@ class StringValidator extends Validator
 		return 'yii.validation.string(value, messages, ' . json_encode($options) . ');';
 	}
 }
-

framework/yii/validators/UrlValidator.php

@@ -99,7 +99,7 @@ class UrlValidator extends Validator
 			}
 
 			if ($this->enableIDN) {
-				$value = preg_replace_callback('/:\/\/([^\/]+)/', function($matches) {
+				$value = preg_replace_callback('/:\/\/([^\/]+)/', function ($matches) {
 					return '://' . idn_to_ascii($matches[1]);
 				}, $value);
 			}

framework/yii/validators/Validator.php

@@ -179,7 +179,7 @@ abstract class Validator extends Component
 		}
 		foreach ($attributes as $attribute) {
 			$skip = $this->skipOnError && $object->hasErrors($attribute)
-				 || $this->skipOnEmpty && $this->isEmpty($object->$attribute);
+				|| $this->skipOnEmpty && $this->isEmpty($object->$attribute);
 			if (!$skip) {
 				$this->validateAttribute($object, $attribute);
 			}

framework/yii/web/HeaderCollection.php

@@ -11,7 +11,6 @@ use Yii;
 use yii\base\Object;
 use ArrayIterator;
 
-
 /**
  * HeaderCollection is used by [[Response]] to maintain the currently registered HTTP headers.
  *

framework/yii/web/PageCache.php

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

framework/yii/web/Request.php

@@ -792,4 +792,3 @@ class Request extends \yii\base\Request
 		}
 	}
 }
-

framework/yii/web/User.php

@@ -221,7 +221,7 @@ class User extends Component
 			if ($destroySession) {
 				Yii::$app->getSession()->destroy();
 			}
- 			$this->afterLogout($identity);
+			$this->afterLogout($identity);
 		}
 	}
 

framework/yii/widgets/FragmentCache.php

@@ -1,174 +1,174 @@
-<?php
+<?php
-/**
+/**
- * @link http://www.yiiframework.com/
+ * @link http://www.yiiframework.com/
- * @copyright Copyright (c) 2008 Yii Software LLC
+ * @copyright Copyright (c) 2008 Yii Software LLC
- * @license http://www.yiiframework.com/license/
+ * @license http://www.yiiframework.com/license/
- */
+ */
-
+
-namespace yii\widgets;
+namespace yii\widgets;
-
+
-use Yii;
+use Yii;
-use yii\base\Widget;
+use yii\base\Widget;
-use yii\caching\Cache;
+use yii\caching\Cache;
-use yii\caching\Dependency;
+use yii\caching\Dependency;
-
+
-/**
+/**
- * @author Qiang Xue <qiang.xue@gmail.com>
+ * @author Qiang Xue <qiang.xue@gmail.com>
- * @since 2.0
+ * @since 2.0
- */
+ */
-class FragmentCache extends Widget
+class FragmentCache extends Widget
-{
+{
-	/**
+	/**
-	 * @var Cache|string the cache object or the application component ID of the cache object.
+	 * @var Cache|string the cache object or the application component ID of the cache object.
-	 * After the FragmentCache object is created, if you want to change this property,
+	 * After the FragmentCache object is created, if you want to change this property,
-	 * you should only assign it with a cache object.
+	 * you should only assign it with a cache object.
-	 */
+	 */
-	public $cache = 'cache';
+	public $cache = 'cache';
-	/**
+	/**
-	 * @var integer number of seconds that the data can remain valid in 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.
+	 * Use 0 to indicate that the cached data will never expire.
-	 */
+	 */
-	public $duration = 60;
+	public $duration = 60;
-	/**
+	/**
-	 * @var array|Dependency the dependency that the cached content depends on.
+	 * @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.
+	 * This can be either a [[Dependency]] object or a configuration array for creating the dependency object.
-	 * For example,
+	 * For example,
-	 *
+	 *
-	 * ~~~
+	 * ~~~
-	 * array(
+	 * array(
-	 *     'class' => 'yii\caching\DbDependency',
+	 *     'class' => 'yii\caching\DbDependency',
-	 *     'sql' => 'SELECT MAX(lastModified) FROM Post',
+	 *     'sql' => 'SELECT MAX(lastModified) FROM Post',
-	 * )
+	 * )
-	 * ~~~
+	 * ~~~
-	 *
+	 *
-	 * would make the output cache depends on the last modified time of all posts.
+	 * 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.
+	 * If any post has its modification time changed, the cached content would be invalidated.
-	 */
+	 */
-	public $dependency;
+	public $dependency;
-	/**
+	/**
-	 * @var array list of factors that would cause the variation of the content being cached.
+	 * @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).
+	 * 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
+	 * The following variation setting will cause the content to be cached in different versions
-	 * according to the current application language:
+	 * according to the current application language:
-	 *
+	 *
-	 * ~~~
+	 * ~~~
-	 * array(
+	 * array(
-	 *     Yii::$app->language,
+	 *     Yii::$app->language,
-	 * )
+	 * )
-	 */
+	 */
-	public $variations;
+	public $variations;
-	/**
+	/**
-	 * @var boolean whether to enable the fragment cache. You may use this property to turn on and off
+	 * @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).
+	 * the fragment cache according to specific setting (e.g. enable fragment cache only for GET requests).
-	 */
+	 */
-	public $enabled = true;
+	public $enabled = true;
-	/**
+	/**
-	 * @var array a list of placeholders for embedding dynamic contents. This property
+	 * @var array a list of placeholders for embedding dynamic contents. This property
-	 * is used internally to implement the content caching feature. Do not modify it.
+	 * is used internally to implement the content caching feature. Do not modify it.
-	 */
+	 */
-	public $dynamicPlaceholders;
+	public $dynamicPlaceholders;
-
+
-	/**
+	/**
-	 * Initializes the FragmentCache object.
+	 * Initializes the FragmentCache object.
-	 */
+	 */
-	public function init()
+	public function init()
-	{
+	{
-		parent::init();
+		parent::init();
-
+
-		if (!$this->enabled) {
+		if (!$this->enabled) {
-			$this->cache = null;
+			$this->cache = null;
-		} elseif (is_string($this->cache)) {
+		} elseif (is_string($this->cache)) {
-			$this->cache = Yii::$app->getComponent($this->cache);
+			$this->cache = Yii::$app->getComponent($this->cache);
-		}
+		}
-
+
-		if ($this->getCachedContent() === false) {
+		if ($this->getCachedContent() === false) {
-			$this->view->cacheStack[] = $this;
+			$this->view->cacheStack[] = $this;
-			ob_start();
+			ob_start();
-			ob_implicit_flush(false);
+			ob_implicit_flush(false);
-		}
+		}
-	}
+	}
-
+
-	/**
+	/**
-	 * Marks the end of content to be cached.
+	 * Marks the end of content to be cached.
-	 * Content displayed before this method call and after {@link init()}
+	 * Content displayed before this method call and after {@link init()}
-	 * will be captured and saved in cache.
+	 * will be captured and saved in cache.
-	 * This method does nothing if valid content is already found in cache.
+	 * This method does nothing if valid content is already found in cache.
-	 */
+	 */
-	public function run()
+	public function run()
-	{
+	{
-		if (($content = $this->getCachedContent()) !== false) {
+		if (($content = $this->getCachedContent()) !== false) {
-			echo $content;
+			echo $content;
-		} elseif ($this->cache instanceof Cache) {
+		} elseif ($this->cache instanceof Cache) {
-			$content = ob_get_clean();
+			$content = ob_get_clean();
-			array_pop($this->view->cacheStack);
+			array_pop($this->view->cacheStack);
-			if (is_array($this->dependency)) {
+			if (is_array($this->dependency)) {
-				$this->dependency = Yii::createObject($this->dependency);
+				$this->dependency = Yii::createObject($this->dependency);
-			}
+			}
-			$data = array($content, $this->dynamicPlaceholders);
+			$data = array($content, $this->dynamicPlaceholders);
-			$this->cache->set($this->calculateKey(), $data, $this->duration, $this->dependency);
+			$this->cache->set($this->calculateKey(), $data, $this->duration, $this->dependency);
-
+
-			if (empty($this->view->cacheStack) && !empty($this->dynamicPlaceholders)) {
+			if (empty($this->view->cacheStack) && !empty($this->dynamicPlaceholders)) {
-				$content = $this->updateDynamicContent($content, $this->dynamicPlaceholders);
+				$content = $this->updateDynamicContent($content, $this->dynamicPlaceholders);
-			}
+			}
-			echo $content;
+			echo $content;
-		}
+		}
-	}
+	}
-
+
-	/**
+	/**
-	 * @var string|boolean the cached content. False if the content is not cached.
+	 * @var string|boolean the cached content. False if the content is not cached.
-	 */
+	 */
-	private $_content;
+	private $_content;
-
+
-	/**
+	/**
-	 * Returns the cached content if available.
+	 * Returns the cached content if available.
-	 * @return string|boolean the cached content. False is returned if valid content is not found in the cache.
+	 * @return string|boolean the cached content. False is returned if valid content is not found in the cache.
-	 */
+	 */
-	public function getCachedContent()
+	public function getCachedContent()
-	{
+	{
-		if ($this->_content === null) {
+		if ($this->_content === null) {
-			$this->_content = false;
+			$this->_content = false;
-			if ($this->cache instanceof Cache) {
+			if ($this->cache instanceof Cache) {
-				$key = $this->calculateKey();
+				$key = $this->calculateKey();
-				$data = $this->cache->get($key);
+				$data = $this->cache->get($key);
-				if (is_array($data) && count($data) === 2) {
+				if (is_array($data) && count($data) === 2) {
-					list ($content, $placeholders) = $data;
+					list ($content, $placeholders) = $data;
-					if (is_array($placeholders) && count($placeholders) > 0) {
+					if (is_array($placeholders) && count($placeholders) > 0) {
-						if (empty($this->view->cacheStack)) {
+						if (empty($this->view->cacheStack)) {
-							// outermost cache: replace placeholder with dynamic content
+							// outermost cache: replace placeholder with dynamic content
-							$content = $this->updateDynamicContent($content, $placeholders);
+							$content = $this->updateDynamicContent($content, $placeholders);
-						}
+						}
-						foreach ($placeholders as $name => $statements) {
+						foreach ($placeholders as $name => $statements) {
-							$this->view->addDynamicPlaceholder($name, $statements);
+							$this->view->addDynamicPlaceholder($name, $statements);
-						}
+						}
-					}
+					}
-					$this->_content = $content;
+					$this->_content = $content;
-				}
+				}
-			}
+			}
-		}
+		}
-		return $this->_content;
+		return $this->_content;
-	}
+	}
-
+
-	protected function updateDynamicContent($content, $placeholders)
+	protected function updateDynamicContent($content, $placeholders)
-	{
+	{
-		foreach ($placeholders as $name => $statements) {
+		foreach ($placeholders as $name => $statements) {
-			$placeholders[$name] = $this->view->evaluateDynamicContent($statements);
+			$placeholders[$name] = $this->view->evaluateDynamicContent($statements);
-		}
+		}
-		return strtr($content, $placeholders);
+		return strtr($content, $placeholders);
-	}
+	}
-
+
-	/**
+	/**
-	 * Generates a unique key used for storing the content in cache.
+	 * Generates a unique key used for storing the content in cache.
-	 * The key generated depends on both [[id]] and [[variations]].
+	 * The key generated depends on both [[id]] and [[variations]].
-	 * @return mixed a valid cache key
+	 * @return mixed a valid cache key
-	 */
+	 */
-	protected function calculateKey()
+	protected function calculateKey()
-	{
+	{
-		$factors = array(__CLASS__, $this->getId());
+		$factors = array(__CLASS__, $this->getId());
-		if (is_array($this->variations)) {
+		if (is_array($this->variations)) {
-			foreach ($this->variations as $factor) {
+			foreach ($this->variations as $factor) {
-				$factors[] = $factor;
+				$factors[] = $factor;
-			}
+			}
-		}
+		}
-		return $factors;
+		return $factors;
-	}
+	}
-}
+}

framework/yii/widgets/ListPager.php

@@ -91,5 +91,4 @@ class ListPager extends Widget
 			'{page}' => $page + 1,
 		));
 	}
-
 }