Skip to content

Commit

Permalink
Merge branch 'develop' into 4.3
Browse files Browse the repository at this point in the history
  • Loading branch information
brandonkelly committed Oct 10, 2022
2 parents b747878 + 9c4b581 commit 642d011
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions src/console/controllers/HelpController.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
use Craft;
use craft\helpers\App;
use craft\helpers\Json;
use ReflectionMethod;
use ReflectionFunctionAbstract;
use Throwable;
use yii\base\InvalidConfigException;
use yii\console\Controller;
Expand Down Expand Up @@ -215,10 +215,10 @@ protected function allCommandsInfo(): array
* Returns full description from the docblock without any kind of ANSI terminal formatting
*
* @see Controller::getActionHelp()
* @param ReflectionMethod $reflection
* @param ReflectionFunctionAbstract $reflection
* @return string
*/
protected function unformattedActionHelp(ReflectionMethod $reflection): string
protected function unformattedActionHelp(ReflectionFunctionAbstract $reflection): string
{
$comment = strtr(trim(preg_replace('/^\s*\**( |\t)?/m', '', trim($reflection->getDocComment(), '/'))), "\r", '');
if (preg_match('/^\s*@\w+/m', $comment, $matches, PREG_OFFSET_CAPTURE)) {
Expand Down

0 comments on commit 642d011

Please sign in to comment.