Better inheritdoc support

Author: phpfui

src/PHPFUI/InstaDoc/Section/CodeCommon.php

@@ -194,8 +194,8 @@ protected function formatComments(?\phpDocumentor\Reflection\DocBlock $docBlock,
 
 		$container = new \PHPFUI\Container();
 
-		$container->add($this->parsedown->text($this->getInheritedSummary($docBlock, $reflectionMethod)));
-		$desc = $docBlock->getDescription();
+		$container->add($this->parsedown->text($this->getInheritedText($docBlock, $reflectionMethod, 'getSummary')));
+		$desc = $this->getInheritedText($docBlock, $reflectionMethod, 'getDescription');
 
 		if ($desc)
 			{
@@ -382,18 +382,16 @@ protected function getComments(?\phpDocumentor\Reflection\DocBlock $docBlock, ?\
 
 	protected function getDocBlock($method) : ?\phpDocumentor\Reflection\DocBlock
 		{
-		/**
-		 * @todo get attributes everywhere
-		 * $attributes = $this->getAttributes($method);
-		 */
 		$comments = $method->getDocComment();
-		$comments = \str_ireplace('{@inheritdoc}', '@inheritdoc', $comments);
 
 		if (! $comments)
 			{
 			return null;
 			}
 
+		$comments = \str_ireplace('inheritdocs', 'inheritdoc', $comments);
+		$comments = \str_ireplace('{@inheritdoc}', '@inheritdoc', $comments);
+
 		try
 			{
 			$docBlock = $this->factory->create($comments);
@@ -414,9 +412,9 @@ protected function getHtmlClass(string $class) : string
 		return \str_replace('\\', '-', $class);
 		}
 
-	protected function getInheritedSummary(\phpDocumentor\Reflection\DocBlock $docBlock, ?\ReflectionMethod $reflectionMethod = null) : string
+	protected function getInheritedText(\phpDocumentor\Reflection\DocBlock $docBlock, ?\ReflectionMethod $reflectionMethod = null, string $textType = 'getDescription') : string
 		{
-		$summary = $docBlock->getSummary();
+		$summary = $docBlock->{$textType}();
 
 		if (! $reflectionMethod)
 			{
@@ -429,7 +427,7 @@ protected function getInheritedSummary(\phpDocumentor\Reflection\DocBlock $docBl
 			{
 			$pos = \stripos($tag->getName(), 'inheritdoc');
 
-			if (false !== $pos && 0 >= $pos)
+			if (false !== $pos && 0 <= $pos)
 				{
 				$reflectionClass = $reflectionMethod->getDeclaringClass();
 				$parent = $reflectionClass->getParentClass();
@@ -451,7 +449,7 @@ protected function getInheritedSummary(\phpDocumentor\Reflection\DocBlock $docBl
 
 						if ($docBlock)
 							{
-							return $summary . "\n" . $this->getInheritedSummary($docBlock, $method);
+							return $this->getInheritedText($docBlock, $method, $textType) . $summary;
 							}
 						}
 					$parent = $parent->getParentClass();

src/PHPFUI/InstaDoc/Section/Doc.php

@@ -474,7 +474,7 @@ protected function objectCompare($lhs, $rhs) : int
 		return \strcasecmp($lhs->name, $rhs->name);
 		}
 
-	protected function objectSort(array & $objects) : void
+	protected function objectSort(array &$objects) : void
 		{
 		\usort($objects, [$this, 'objectCompare']);
 		}