fixed phpdoc command.

fixed Markdown::process() to make it compatible with parent declaration.
queirozfcom · Jan 11, 2014 · 135f064 · 135f064
1 parent d6eeab2
commit 135f064
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/build/controllers/PhpDocController.php b/build/controllers/PhpDocController.php
@@ -43,7 +43,7 @@ public function actionProperty($root = null)
 	{
 		$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)) {

diff --git a/extensions/apidoc/helpers/Markdown.php b/extensions/apidoc/helpers/Markdown.php
@@ -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 @@ public static function process($content, $context)
 
 		return $content;
 	}
-}
+}