From 119c302033020c80c4f630ee7c91e596c68ea333 Mon Sep 17 00:00:00 2001 From: Carsten Brandt Date: Tue, 30 Dec 2014 17:33:53 +0100 Subject: [PATCH] fixed issue with UTF-8 characters in help description parsing fixes #6691 --- framework/CHANGELOG.md | 1 + framework/console/Controller.php | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/framework/CHANGELOG.md b/framework/CHANGELOG.md index 4d6c271d7f..5cc7189f7c 100644 --- a/framework/CHANGELOG.md +++ b/framework/CHANGELOG.md @@ -9,6 +9,7 @@ Yii Framework 2 Change Log - Bug #6557: Link URLs generated by `yii\widgets\Menu` are not encoded (qiangxue) - Bug #6632: `yii\di\Container::get()` did not handle config parameter correctly when it is passed as a constructor parameter (qiangxue) - Bug #6648: Added explicit type casting to avoid dblib issues on SQL Server 2014 (o-rey) +- Bug #6691: Fixed console help description parsing with UTF8 characters (cebe) - Enh #4502: Added alias support to URL route when calling `Url::toRoute()` and `Url::to()` (qiangxue, lynicidn) - Enh #6247: Logger and error handler are now using slightly less memory (stepanselyuk, samdark) - Enh #6434: Added `yii\behaviors\SluggableBehavior::immutable` to support keeping the generated slug unchanged (trntv) diff --git a/framework/console/Controller.php b/framework/console/Controller.php index e6d703fa31..2581417967 100644 --- a/framework/console/Controller.php +++ b/framework/console/Controller.php @@ -486,7 +486,7 @@ class Controller extends \yii\base\Controller */ protected function parseDocCommentSummary($reflection) { - $docLines = preg_split('~\R~', $reflection->getDocComment()); + $docLines = preg_split('~\R~u', $reflection->getDocComment()); if (isset($docLines[1])) { return trim($docLines[1], ' *'); }