Merge branch 'master' of git.yiisoft.com:yii2

framework/base/ErrorHandler.php

@@ -51,6 +51,7 @@ class ErrorHandler extends Component
 
 
 	/**
+	 * Handles exception
 	 * @param \Exception $exception
 	 */
 	public function handle($exception)
@@ -64,6 +65,10 @@ class ErrorHandler extends Component
 		$this->renderException($exception);
 	}
 
+	/**
+	 * Renders exception
+	 * @param \Exception $exception
+	 */
 	protected function renderException($exception)
 	{
 		if ($this->errorAction !== null) {
@@ -196,6 +201,10 @@ class ErrorHandler extends Component
 		echo '<div class="code"><pre>' . $output . '</pre></div>';
 	}
 
+	/**
+	 * Renders calls stack trace
+	 * @param array $trace
+	 */
 	public function renderTrace($trace)
 	{
 		$count = 0;
@@ -233,6 +242,11 @@ class ErrorHandler extends Component
 		echo '</table>';
 	}
 
+	/**
+	 * Converts special characters to HTML entities
+	 * @param string $text text to encode
+	 * @return string
+	 */
 	public function htmlEncode($text)
 	{
 		return htmlspecialchars($text, ENT_QUOTES, \Yii::$app->charset);

framework/base/Response.php

@@ -13,27 +13,45 @@ namespace yii\base;
  */
 class Response extends Component
 {
+	/**
+	 * Starts output buffering
+	 */
 	public function beginOutput()
 	{
 		ob_start();
 		ob_implicit_flush(false);
 	}
 
+	/**
+	 * Returns contents of the output buffer and discards it
+	 * @return string output buffer contents
+	 */
 	public function endOutput()
 	{
 		return ob_get_clean();
 	}
 
+	/**
+	 * Returns contents of the output buffer
+	 * @return string output buffer contents
+	 */
 	public function getOutput()
 	{
 		return ob_get_contents();
 	}
 
+	/**
+	 * Discards the output buffer
+	 */
 	public function cleanOutput()
 	{
 		ob_clean();
 	}
 
+	/**
+	 * Discards the output buffer
+	 * @param boolean $all if true recursively discards all output buffers used
+	 */
 	public function removeOutput($all = true)
 	{
 		if ($all) {

framework/caching/DbDependency.php

@@ -52,6 +52,7 @@ class DbDependency extends Dependency
 	/**
 	 * Generates the data needed to determine if dependency has been changed.
 	 * This method returns the value of the global state.
+	 * @throws InvalidConfigException
 	 * @return mixed the data needed to determine if dependency has been changed.
 	 */
 	protected function generateDependencyData()

framework/caching/MemCache.php

@@ -106,7 +106,7 @@ class MemCache extends Cache
 	/**
 	 * Returns the underlying memcache (or memcached) object.
 	 * @return \Memcache|\Memcached the memcache (or memcached) object used by this cache component.
-	 * @throws Exception if memcache or memcached extension is not loaded
+	 * @throws InvalidConfigException if memcache or memcached extension is not loaded
 	 */
 	public function getMemcache()
 	{

framework/caching/ZendDataCache.php

@@ -10,7 +10,7 @@ namespace yii\caching;
 /**
  * ZendDataCache provides Zend data caching in terms of an application component.
  *
- * To use this application component, the [Zend Data Cache PHP extensionn](http://www.zend.com/en/products/server/)
+ * To use this application component, the [Zend Data Cache PHP extension](http://www.zend.com/en/products/server/)
  * must be loaded.
  *
  * See [[Cache]] for common cache operations that ZendDataCache supports.

framework/console/controllers/AppController.php

@@ -159,7 +159,7 @@ class AppController extends Controller
 	 * @param string $pathTo path to file we want to get relative path for
 	 * @param string $varName variable name w/o $ to replace value with relative path for
 	 *
-	 * @return string target file contetns
+	 * @return string target file contents
 	 */
 	public function replaceRelativePath($source, $pathTo, $varName)
 	{

framework/helpers/base/Html.php

@@ -728,7 +728,7 @@ class Html
 		if (!isset($options['size'])) {
 			$options['size'] = 4;
 		}
-		if (isset($options['multiple']) && $options['multiple'] && substr($name, -2) !== '[]') {
+		if (!empty($options['multiple']) && substr($name, -2) !== '[]') {
 			$name .= '[]';
 		}
 		$options['name'] = $name;

framework/helpers/base/VarDumper.php

@@ -64,7 +64,7 @@ class VarDumper
 		return self::$_output;
 	}
 
-	/*
+	/**
 	 * @param mixed $var variable to be dumped
 	 * @param integer $level depth level
 	 */

framework/validators/CaptchaValidator.php

@@ -68,6 +68,7 @@ class CaptchaValidator extends Validator
 
 	/**
 	 * Returns the CAPTCHA action object.
+	 * @throws InvalidConfigException
 	 * @return CaptchaAction the action object
 	 */
 	public function getCaptchaAction()

framework/widgets/ActiveForm.php

@@ -39,10 +39,16 @@ class ActiveForm extends Widget
 	public $errorMessageClass = 'yii-error-message';
 	/**
 	 * @var string the default CSS class that indicates an input has error.
-	 * This is
 	 */
 	public $errorClass = 'yii-error';
+	/**
+	 * @var string the default CSS class that indicates an input validated successfully.
+	 */
 	public $successClass = 'yii-success';
+
+	/**
+	 * @var string the default CSS class that indicates an input is currently being validated.
+	 */
 	public $validatingClass = 'yii-validating';
 	/**
 	 * @var boolean whether to enable client-side data validation. Defaults to false.
@@ -64,7 +70,7 @@ class ActiveForm extends Widget
 			$models = array($models);
 		}
 
-		$showAll = isset($options['showAll']) && $options['showAll'];
+		$showAll = !empty($options['showAll']);
 		$lines = array();
 		/** @var $model Model */
 		foreach ($models as $model) {
@@ -127,6 +133,14 @@ class ActiveForm extends Widget
 		return Html::label($label, $for, $options);
 	}
 
+	/**
+	 * @param string $type
+	 * @param Model $model
+	 * @param string $attribute
+	 * @param array $options
+	 *
+	 * @return string
+	 */
 	public function input($type, $model, $attribute, $options = array())
 	{
 		$value = $this->getAttributeValue($model, $attribute);