diff --git a/apps/advanced/.gitignore b/apps/advanced/.gitignore index b1cf719..fd6a8d5 100644 --- a/apps/advanced/.gitignore +++ b/apps/advanced/.gitignore @@ -1 +1,2 @@ -/yii \ No newline at end of file +/yii +composer.lock diff --git a/apps/advanced/install b/apps/advanced/install old mode 100644 new mode 100755 diff --git a/apps/advanced/requirements.php b/apps/advanced/requirements.php index 5a2d910..c9e6493 100644 --- a/apps/advanced/requirements.php +++ b/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 '
The path to yii framework seems to be incorrect.
'; + echo 'You need to install Yii framework via composer or adjust the framework path in file ' . basename(__FILE__) .'.
'; + echo 'Please refer to the README on how to install Yii.
'; +} require_once($frameworkPath . '/requirements/YiiRequirementChecker.php'); $requirementsChecker = new YiiRequirementChecker(); diff --git a/apps/basic/.gitignore b/apps/basic/.gitignore new file mode 100644 index 0000000..2cf7a3f --- /dev/null +++ b/apps/basic/.gitignore @@ -0,0 +1 @@ +composer.lock \ No newline at end of file diff --git a/apps/basic/requirements.php b/apps/basic/requirements.php index 5a2d910..c075760 100644 --- a/apps/basic/requirements.php +++ b/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 'The path to yii framework seems to be incorrect.
'; + echo 'You need to install Yii framework via composer or adjust the framework path in file ' . basename(__FILE__) .'.
'; + echo 'Please refer to the README on how to install Yii.
'; +} require_once($frameworkPath . '/requirements/YiiRequirementChecker.php'); $requirementsChecker = new YiiRequirementChecker(); diff --git a/framework/yii/helpers/base/Console.php b/framework/yii/helpers/base/Console.php index c8b89c4..6ad0b7b 100644 --- a/framework/yii/helpers/base/Console.php +++ b/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) diff --git a/framework/yii/jui/AutoComplete.php b/framework/yii/jui/AutoComplete.php index f5bbae9..44ca23d 100644 --- a/framework/yii/jui/AutoComplete.php +++ b/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