Clientbase
/
PHPWord
mirror of https://github.com/basemaster/PHPWord.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix phpstan issues

This commit is contained in:
troosan 2018-07-14 02:54:17 +02:00
parent adc1428607
commit 32907215ed
7 changed files with 17 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
phpstan.neon
View File

@ -1,7 +1,7 @@
includes:
- vendor/phpstan/phpstan/conf/config.level1.neon
parameters:
memory-limit: 200000
memory-limit: 20000000
autoload_directories:
- tests
autoload_files:

14
src/PhpWord/Element/Title.php
View File

@ -61,14 +61,12 @@ class Title extends AbstractElement
*/
public function __construct($text, $depth = 1)
{
if (isset($text)) {
if (is_string($text)) {
$this->text = CommonText::toUTF8($text);
} elseif ($text instanceof TextRun) {
$this->text = $text;
} else {
throw new \InvalidArgumentException('Invalid text, should be a string or a TextRun');
}
if (is_string($text)) {
$this->text = CommonText::toUTF8($text);
} elseif ($text instanceof TextRun) {
$this->text = $text;
} else {
throw new \InvalidArgumentException('Invalid text, should be a string or a TextRun');
}
$this->depth = $depth;

2
src/PhpWord/Shared/Html.php
View File

@ -75,7 +75,7 @@ class Html
$dom = new \DOMDocument();
$dom->preserveWhiteSpace = $preserveWhiteSpace;
$dom->loadXML($html);
self::$xpath = new \DOMXpath($dom);
self::$xpath = new \DOMXPath($dom);
$node = $dom->getElementsByTagName('body');
self::parseNode($node->item(0), $element);

1
src/PhpWord/Writer/Word2007/Element/Title.php
View File

@ -47,6 +47,7 @@ class Title extends AbstractElement
$xmlWriter->endElement();
}
$bookmarkRId = null;
if ($element->getDepth() !== 0) {
$rId = $element->getRelationId();
$bookmarkRId = $element->getPhpWord()->addBookmark();

4
src/PhpWord/Writer/Word2007/Part/Chart.php
View File

@ -330,11 +330,11 @@ class Chart extends AbstractPart
$valueAxisTitle = $style->getValueAxisTitle();
if ($axisType == 'c:catAx') {
if (isset($categoryAxisTitle)) {
if (!is_null($categoryAxisTitle)) {
$this->writeAxisTitle($xmlWriter, $categoryAxisTitle);
}
} elseif ($axisType == 'c:valAx') {
if (isset($valueAxisTitle)) {
if (!is_null($valueAxisTitle)) {
$this->writeAxisTitle($xmlWriter, $valueAxisTitle);
}
}

6
tests/PhpWord/Writer/HTML/ElementTest.php
View File

@ -70,7 +70,7 @@ class ElementTest extends \PHPUnit\Framework\TestCase
$text2->setTrackChange(new TrackChange(TrackChange::DELETED, 'another author', new \DateTime()));
$dom = $this->getAsHTML($phpWord);
$xpath = new \DOMXpath($dom);
$xpath = new \DOMXPath($dom);
$this->assertTrue($xpath->query('/html/body/p[1]/ins')->length == 1);
$this->assertTrue($xpath->query('/html/body/p[2]/del')->length == 1);
@ -94,7 +94,7 @@ class ElementTest extends \PHPUnit\Framework\TestCase
$cell22->addText('second cell');
$dom = $this->getAsHTML($phpWord);
$xpath = new \DOMXpath($dom);
$xpath = new \DOMXPath($dom);
$this->assertTrue($xpath->query('/html/body/table/tr[1]/td')->length == 1);
$this->assertEquals('2', $xpath->query('/html/body/table/tr/td[1]')->item(0)->attributes->getNamedItem('colspan')->textContent);
@ -123,7 +123,7 @@ class ElementTest extends \PHPUnit\Framework\TestCase
$row3->addCell(500)->addText('third cell being spanned');
$dom = $this->getAsHTML($phpWord);
$xpath = new \DOMXpath($dom);
$xpath = new \DOMXPath($dom);
$this->assertTrue($xpath->query('/html/body/table/tr[1]/td')->length == 2);
$this->assertEquals('3', $xpath->query('/html/body/table/tr[1]/td[1]')->item(0)->attributes->getNamedItem('rowspan')->textContent);

6
tests/PhpWord/_includes/XmlDocument.php
View File

@ -37,9 +37,9 @@ class XmlDocument
private $dom;
/**
* DOMXpath object
* DOMXPath object
*
* @var \DOMXpath
* @var \DOMXPath
*/
private $xpath;
@ -98,7 +98,7 @@ class XmlDocument
}
if (null === $this->xpath) {
$this->xpath = new \DOMXpath($this->dom);
$this->xpath = new \DOMXPath($this->dom);
$this->xpath->registerNamespace('w14', 'http://schemas.microsoft.com/office/word/2010/wordml');
}