php/yii2
1
0
Fork 0
mirror of https://github.com/yiisoft/yii2.git synced 2025-08-26 06:15:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

fixed phpdoc command.

Browse Source 
fixed Markdown::process() to make it compatible with parent declaration.
This commit is contained in:
Qiang Xue
2014-01-11 17:33:48 -05:00
parent d6eeab2ff3
commit 135f06413a
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build/controllers/PhpDocController.php
View File

@ -43,7 +43,7 @@ class PhpDocController extends Controller
{
$except = [];
if ($root === null) {
$root = dirname(dirname(YII_PATH));
$root = dirname(YII_PATH);
$extensionPath = "$root/extensions";
foreach (scandir($extensionPath) as $extension) {
if (ctype_alpha($extension) && is_dir($extensionPath . '/' . $extension)) {

4
extensions/apidoc/helpers/Markdown.php
View File

@ -32,7 +32,7 @@ class Markdown extends \yii\helpers\Markdown
* @param TypeDoc $context
* @return string
*/
public static function process($content, $context)
public static function process($content, $context = null)
{
$content = trim(parent::process($content, []));
if (!strncmp($content, '<p>', 3) && substr($content, -4, 4) == '</p>') {
@ -77,4 +77,4 @@ class Markdown extends \yii\helpers\Markdown
return $content;
}
}
}