QA: Docblock improvements and -q parameter for phpdoc

This commit is contained in:
Ivan Lanin 2014-05-30 20:44:06 +07:00
parent 900a96addf
commit 4f9399899a
7 changed files with 16 additions and 6 deletions

View File

@ -50,7 +50,7 @@ script:
## PHPUnit ## PHPUnit
- phpunit -c ./ --coverage-text --coverage-html ./build/coverage - phpunit -c ./ --coverage-text --coverage-html ./build/coverage
## PHPDocumentor ## PHPDocumentor
- vendor/bin/phpdoc.php -d ./src -t ./build/docs --ignore "*/src/PhpWord/Shared/*/*" --template="responsive-twig" - vendor/bin/phpdoc.php -q -d ./src -t ./build/docs --ignore "*/src/PhpWord/Shared/*/*" --template="responsive-twig"
after_script: after_script:
## PHPDocumentor ## PHPDocumentor

View File

@ -437,6 +437,7 @@ abstract class AbstractPart
* @param \PhpOffice\PhpWord\Shared\XMLReader $xmlReader * @param \PhpOffice\PhpWord\Shared\XMLReader $xmlReader
* @param \DOMElement $parentNode * @param \DOMElement $parentNode
* @param array $styleDefs * @param array $styleDefs
* @ignoreScrutinizerPatch
* @return array * @return array
*/ */
protected function readStyleDefs(XMLReader $xmlReader, \DOMElement $parentNode = null, $styleDefs = array()) protected function readStyleDefs(XMLReader $xmlReader, \DOMElement $parentNode = null, $styleDefs = array())
@ -467,6 +468,7 @@ abstract class AbstractPart
* Return style definition based on conversion method * Return style definition based on conversion method
* *
* @param string $method * @param string $method
* @ignoreScrutinizerPatch
* @param mixed $attributeValue * @param mixed $attributeValue
* @param mixed $expected * @param mixed $expected
* @return mixed * @return mixed

View File

@ -99,6 +99,7 @@ class Document extends AbstractPart
* *
* @param \PhpOffice\PhpWord\Shared\XMLReader $xmlReader * @param \PhpOffice\PhpWord\Shared\XMLReader $xmlReader
* @param \DOMElement $domNode * @param \DOMElement $domNode
* @ignoreScrutinizerPatch
* @return array * @return array
*/ */
private function readSectionStyle(XMLReader $xmlReader, \DOMElement $domNode) private function readSectionStyle(XMLReader $xmlReader, \DOMElement $domNode)

View File

@ -242,7 +242,9 @@ class Html
$cNodes = $node->childNodes; $cNodes = $node->childNodes;
if (count($cNodes) > 0) { if (count($cNodes) > 0) {
foreach ($cNodes as $cNode) { foreach ($cNodes as $cNode) {
self::parseNode($cNode, $newobject, $styles, $data); if ($newobject instanceof \PhpOffice\PhpWord\Element\AbstractContainer) {
self::parseNode($cNode, $newobject, $styles, $data);
}
} }
} }
} }

View File

@ -245,6 +245,7 @@ class Image extends AbstractStyle
/** /**
* Set margin top * Set margin top
* *
* @ignoreScrutinizerPatch
* @param int|float $value * @param int|float $value
* @return self * @return self
*/ */
@ -268,6 +269,7 @@ class Image extends AbstractStyle
/** /**
* Set margin left * Set margin left
* *
* @ignoreScrutinizerPatch
* @param int|float $value * @param int|float $value
* @return self * @return self
*/ */

View File

@ -190,7 +190,7 @@ class Paragraph extends AbstractStyle
*/ */
public function getStyleValues() public function getStyleValues()
{ {
return array( $styles = array(
'name' => $this->getStyleName(), 'name' => $this->getStyleName(),
'basedOn' => $this->getBasedOn(), 'basedOn' => $this->getBasedOn(),
'next' => $this->getNext(), 'next' => $this->getNext(),
@ -209,6 +209,8 @@ class Paragraph extends AbstractStyle
), ),
'tabs' => $this->getTabs(), 'tabs' => $this->getTabs(),
); );
return $styles;
} }
/** /**

View File

@ -20,6 +20,7 @@ namespace PhpOffice\PhpWord\Writer\Word2007\Style;
use PhpOffice\PhpWord\Shared\XMLWriter; use PhpOffice\PhpWord\Shared\XMLWriter;
use PhpOffice\PhpWord\Style; use PhpOffice\PhpWord\Style;
use PhpOffice\PhpWord\Style\Alignment as AlignmentStyle; use PhpOffice\PhpWord\Style\Alignment as AlignmentStyle;
use PhpOffice\PhpWord\Style\Paragraph as ParagraphStyle;
/** /**
* Paragraph style writer * Paragraph style writer
@ -71,7 +72,7 @@ class Paragraph extends AbstractStyle
private function writeStyle() private function writeStyle()
{ {
$style = $this->getStyle(); $style = $this->getStyle();
if (!$style instanceof \PhpOffice\PhpWord\Style\Paragraph) { if (!$style instanceof ParagraphStyle) {
return; return;
} }
$xmlWriter = $this->getXmlWriter(); $xmlWriter = $this->getXmlWriter();
@ -114,7 +115,7 @@ class Paragraph extends AbstractStyle
* *
* @param \PhpOffice\PhpWord\Shared\XMLWriter $xmlWriter * @param \PhpOffice\PhpWord\Shared\XMLWriter $xmlWriter
* @param string $name * @param string $name
* @param string $value * @param mixed $value
*/ */
private function writeChildStyle(XMLWriter $xmlWriter, $name, $value) private function writeChildStyle(XMLWriter $xmlWriter, $name, $value)
{ {
@ -131,7 +132,7 @@ class Paragraph extends AbstractStyle
* Write tabs * Write tabs
* *
* @param \PhpOffice\PhpWord\Shared\XMLWriter $xmlWriter * @param \PhpOffice\PhpWord\Shared\XMLWriter $xmlWriter
* @param array $tabs * @param \PhpOffice\PhpWord\Style\Tab[] $tabs
*/ */
private function writeTabs(XMLWriter $xmlWriter, $tabs) private function writeTabs(XMLWriter $xmlWriter, $tabs)
{ {