Merge branch 'master' of https://github.com/yiisoft/yii2 into jui-sortable

apps/advanced/.gitignore

 /yii
+composer.lock

apps/advanced/requirements.php

@@ -11,7 +11,14 @@
  */
 
 // you may need to adjust this path to the correct Yii framework path
-$frameworkPath = dirname(__FILE__) . '/../../yii';
+$frameworkPath = dirname(__FILE__) . '/vendor/yiisoft/yii2/yii';
+
+if (!is_dir($frameworkPath)) {
+	echo '<h1>Error</h1>';
+	echo '<p><strong>The path to yii framework seems to be incorrect.</strong></p>';
+	echo '<p>You need to install Yii framework via composer or adjust the framework path in file <abbr title="' . __FILE__ . '">' . basename(__FILE__) .'</abbr>.</p>';
+	echo '<p>Please refer to the <abbr title="' . dirname(__FILE__) . '/README.md">README</abbr> on how to install Yii.</p>';
+}
 
 require_once($frameworkPath . '/requirements/YiiRequirementChecker.php');
 $requirementsChecker = new YiiRequirementChecker();

apps/basic/.gitignore

+composer.lock
\ No newline at end of file

apps/basic/requirements.php

@@ -11,7 +11,14 @@
  */
 
 // you may need to adjust this path to the correct Yii framework path
-$frameworkPath = dirname(__FILE__) . '/../../yii';
+$frameworkPath = dirname(__FILE__) . '/vendor/yiisoft/yii2/yii.';
+
+if (!is_dir($frameworkPath)) {
+	echo '<h1>Error</h1>';
+	echo '<p><strong>The path to yii framework seems to be incorrect.</strong></p>';
+	echo '<p>You need to install Yii framework via composer or adjust the framework path in file <abbr title="' . __FILE__ . '">' . basename(__FILE__) .'</abbr>.</p>';
+	echo '<p>Please refer to the <abbr title="' . dirname(__FILE__) . '/README.md">README</abbr> on how to install Yii.</p>';
+}
 
 require_once($frameworkPath . '/requirements/YiiRequirementChecker.php');
 $requirementsChecker = new YiiRequirementChecker();

framework/yii/helpers/base/Console.php

@@ -574,6 +574,9 @@ class Console
 	/**
 	 * Usage: list($w, $h) = ConsoleHelper::getScreenSize();
 	 *
+	 * @param bool $refresh whether to force checking and not re-use cached size value.
+	 * This is useful to detect changing window size while the application is running but may
+	 * not get up to date values on every terminal.
 	 * @return array|boolean An array of ($width, $height) or false when it was not able to determine size.
 	 */
 	public static function getScreenSize($refresh = false)

framework/yii/jui/AutoComplete.php

@@ -8,8 +8,6 @@
 namespace yii\jui;
 
 use Yii;
-use yii\base\InvalidConfigException;
-use yii\base\Model;
 use yii\helpers\Html;
 
 /**
@@ -42,51 +40,27 @@ use yii\helpers\Html;
  * @author Alexander Kochetov <creocoder@gmail.com>
  * @since 2.0
  */
-class AutoComplete extends Widget
+class AutoComplete extends InputWidget
 {
 	/**
-	 * @var \yii\base\Model the data model that this widget is associated with.
-	 */
-	public $model;
-	/**
-	 * @var string the model attribute that this widget is associated with.
-	 */
-	public $attribute;
-	/**
-	 * @var string the input name. This must be set if [[model]] and [[attribute]] are not set.
-	 */
-	public $name;
-	/**
-	 * @var string the input value.
-	 */
-	public $value;
-
-
-	/**
 	 * Renders the widget.
 	 */
 	public function run()
 	{
-		echo $this->renderField();
+		echo $this->renderWidget();
 		$this->registerWidget('autocomplete');
 	}
 
 	/**
-	 * Renders the AutoComplete field. If [[model]] has been specified then it will render an active field.
-	 * If [[model]] is null or not from an [[Model]] instance, then the field will be rendered according to
-	 * the [[name]] attribute.
+	 * Renders the AutoComplete widget.
 	 * @return string the rendering result.
-	 * @throws InvalidConfigException when none of the required attributes are set to render the textInput.
-	 * That is, if [[model]] and [[attribute]] are not set, then [[name]] is required.
 	 */
-	public function renderField()
+	public function renderWidget()
 	{
-		if ($this->model instanceof Model && $this->attribute !== null) {
+		if ($this->hasModel()) {
 			return Html::activeTextInput($this->model, $this->attribute, $this->options);
-		} elseif ($this->name !== null) {
-			return Html::textInput($this->name, $this->value, $this->options);
 		} else {
-			throw new InvalidConfigException("Either 'name' or 'model' and 'attribute' properties must be specified.");
+			return Html::textInput($this->name, $this->value, $this->options);
 		}
 	}
 }