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

Reactivate php_sim in Scrutinizer and fix some minor issues

This commit is contained in:
Ivan Lanin 2014-05-14 08:40:21 +07:00
parent e03e121e85
commit 6ba6ed40fc
4 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.scrutinizer.yml
View File

@ -18,7 +18,8 @@ tools:
enabled: true enabled: true
timeout: 900 timeout: 900
php_sim: php_sim:
min_mass: 16 enabled: true
min_mass: 30
php_pdepend: true php_pdepend: true
php_analyzer: true php_analyzer: true
sensiolabs_security_checker: true sensiolabs_security_checker: true

21
src/PhpWord/Shared/XMLReader.php
View File

@ -96,7 +96,7 @@ class XMLReader
* @param string $path * @param string $path
* @return \DOMElement|null * @return \DOMElement|null
*/ */
public function getElement($path, \DOMElement $contextNode) public function getElement($path, \DOMElement $contextNode = null)
{ {
$elements = $this->getElements($path, $contextNode); $elements = $this->getElements($path, $contextNode);
if ($elements->length > 0) { if ($elements->length > 0) {
@ -113,16 +113,17 @@ class XMLReader
* @param string $path * @param string $path
* @return string|null * @return string|null
*/ */
public function getAttribute($attribute, \DOMElement $contextNode, $path = null) public function getAttribute($attribute, \DOMElement $contextNode = null, $path = null)
{ {
if (is_null($path)) { $return = null;
$return = $contextNode->getAttribute($attribute); if ($path !== null) {
} else {
$elements = $this->getElements($path, $contextNode); $elements = $this->getElements($path, $contextNode);
if ($elements->length > 0) { if ($elements->length > 0) {
$return = $elements->item(0)->getAttribute($attribute); $return = $elements->item(0)->getAttribute($attribute);
} else { }
$return = null; } else {
if ($contextNode !== null) {
$return = $contextNode->getAttribute($attribute);
} }
} }
@ -135,7 +136,7 @@ class XMLReader
* @param string $path * @param string $path
* @return string|null * @return string|null
*/ */
public function getValue($path, \DOMElement $contextNode) public function getValue($path, \DOMElement $contextNode = null)
{ {
$elements = $this->getElements($path, $contextNode); $elements = $this->getElements($path, $contextNode);
if ($elements->length > 0) { if ($elements->length > 0) {
@ -151,7 +152,7 @@ class XMLReader
* @param string $path * @param string $path
* @return integer * @return integer
*/ */
public function countElements($path, \DOMElement $contextNode) public function countElements($path, \DOMElement $contextNode = null)
{ {
$elements = $this->getElements($path, $contextNode); $elements = $this->getElements($path, $contextNode);
@ -164,7 +165,7 @@ class XMLReader
* @param string $path * @param string $path
* @return boolean * @return boolean
*/ */
public function elementExists($path, \DOMElement $contextNode) public function elementExists($path, \DOMElement $contextNode = null)
{ {
return $this->getElements($path, $contextNode)->length > 0; return $this->getElements($path, $contextNode)->length > 0;
} }

4
src/PhpWord/Writer/RTF/Element/AbstractElement.php
View File

@ -51,9 +51,9 @@ class AbstractElement extends \PhpOffice\PhpWord\Writer\HTML\Element\AbstractEle
protected function getStyles() protected function getStyles()
{ {
/** @var \PhpOffice\PhpWord\Writer\RTF $parentWriter Scrutinizer type hint */ /** @var \PhpOffice\PhpWord\Writer\RTF $parentWriter Scrutinizer type hint */
/** @var \PhpOffice\PhpWord\Element\Text $element Scrutinizer type hint */
$parentWriter = $this->parentWriter; $parentWriter = $this->parentWriter;
/** @var \PhpOffice\PhpWord\Element\Text $element Scrutinizer type hint */
$element = $this->element; $element = $this->element;
// Font style // Font style

3
src/PhpWord/Writer/RTF/Element/Text.php
View File

@ -32,9 +32,8 @@ class Text extends AbstractElement
public function write() public function write()
{ {
/** @var \PhpOffice\PhpWord\Element\Text $element Scrutinizer type hint */ /** @var \PhpOffice\PhpWord\Element\Text $element Scrutinizer type hint */
$elementClass = str_replace('\\Writer\\RTF', '', get_class($this));
$element = $this->element; $element = $this->element;
$elementClass = str_replace('\\Writer\\RTF', '', get_class($this));
if (!$element instanceof $elementClass) { if (!$element instanceof $elementClass) {
return; return;
} }