Skip to content

Commit a39ef41

Browse files
Progi1984Progi1984
committed
Github Actions : PHPStan
1 parent a597340 commit a39ef41

File tree

12 files changed

+250
-99
lines changed

12 files changed

+250
-99
lines changed

‎.github/workflows/php.yml‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,36 @@ jobs:
3030
- name: Run PHPCSFixer
3131
run: php-cs-fixer fix --dry-run --diff
3232

33+
phpstan:
34+
name: PHP Static Analysis
35+
runs-on: ubuntu-latest
36+
strategy:
37+
fail-fast: false
38+
matrix:
39+
php:
40+
- '7.1'
41+
- '7.2'
42+
- '7.3'
43+
- '7.4'
44+
- '8.0'
45+
- '8.1'
46+
- '8.2'
47+
- '8.3'
48+
steps:
49+
- name: Setup PHP
50+
uses: shivammathur/setup-php@v2
51+
with:
52+
php-version: ${{ matrix.php }}
53+
extensions: xml
54+
55+
- uses: actions/checkout@v2
56+
57+
- name: Composer Install
58+
run: composer install --ansi --prefer-dist --no-interaction --no-progress
59+
60+
- name: Run phpstan
61+
run: ./vendor/bin/phpstan analyse -c phpstan.neon.dist
62+
3363
phpunit:
3464
name: PHPUnit
3565
runs-on: ubuntu-latest

‎composer.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
"friendsofphp/php-cs-fixer": "^2.1"
2323
},
2424
"require-dev": {
25-
"phpunit/phpunit": ">=7.0"
25+
"phpunit/phpunit": ">=7.0",
26+
"phpstan/phpstan": "^0.12.88 || ^1.0.0"
2627
}
2728
}

‎phpstan.neon.dist‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
parameters:
2+
level: 7
3+
bootstrapFiles:
4+
- vendor/autoload.php
5+
paths:
6+
- src
7+
- tests
8+
reportUnmatchedIgnoredErrors: false
9+
ignoreErrors:
10+
11+
## Remove after remove ArrayObject
12+
treatPhpDocTypesAsCertain: false

‎src/Math/Element/AbstractElement.php‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,28 @@
22

33
namespace PhpOffice\Math\Element;
44

5+
use PhpOffice\Math\Math;
6+
57
abstract class AbstractElement
68
{
79
/**
8-
* @var string
10+
* @var Math|AbstractGroupElement|null
911
*/
1012
protected $parent;
1113

14+
/**
15+
* @param Math|AbstractGroupElement|null $parent
16+
*/
1217
public function setParent($parent): self
1318
{
1419
$this->parent = $parent;
1520

1621
return $this;
1722
}
1823

24+
/**
25+
* @return Math|AbstractGroupElement|null
26+
*/
1927
public function getParent()
2028
{
2129
return $this->parent;

‎src/Math/Math.php‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22

33
namespace PhpOffice\Math;
44

5+
use PhpOffice\Math\Element\AbstractElement;
6+
57
class Math
68
{
79
/**
@@ -32,7 +34,7 @@ public function remove(Element\AbstractElement $element): self
3234
$this->elements = array_filter($this->elements, function ($child) use ($element) {
3335
return $child != $element;
3436
});
35-
$component->setParent(null);
37+
$element->setParent(null);
3638

3739
return $this;
3840
}

‎src/Math/Reader/MathML.php‎

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
use DOMDocument;
66
use DOMElement;
7+
use DOMNode;
78
use DOMXPath;
89
use Exception;
910
use PhpOffice\Math\Element;
@@ -41,10 +42,13 @@ public function read(string $content): ?Math
4142
return $this->math;
4243
}
4344

44-
protected function parseNode(?DOMElement $nodeRowElement, $parent): void
45+
/**
46+
* @param Math|Element\AbstractGroupElement $parent
47+
*/
48+
protected function parseNode(?DOMNode $nodeRowElement, $parent): void
4549
{
4650
$this->xpath = new DOMXpath($this->dom);
47-
foreach ($this->xpath->query('*', $nodeRowElement) as $nodeElement) {
51+
foreach ($this->xpath->query('*', $nodeRowElement) ?: [] as $nodeElement) {
4852
$element = $this->getElement($nodeElement);
4953
$parent->add($element);
5054

@@ -54,14 +58,14 @@ protected function parseNode(?DOMElement $nodeRowElement, $parent): void
5458
}
5559
}
5660

57-
protected function getElement(DOMElement $nodeElement): Element\AbstractElement
61+
protected function getElement(DOMNode $nodeElement): Element\AbstractElement
5862
{
5963
$nodeValue = trim($nodeElement->nodeValue);
6064
switch ($nodeElement->nodeName) {
6165
case 'mfrac':
6266
$element = new Element\Fraction();
6367
$nodeList = $this->xpath->query('*', $nodeElement);
64-
if ($nodeList->length == 2) {
68+
if ($nodeList && $nodeList->length == 2) {
6569
$element
6670
->setNumerator($this->getElement($nodeList->item(0)))
6771
->setDenominator($this->getElement($nodeList->item(1)));
@@ -71,13 +75,15 @@ protected function getElement(DOMElement $nodeElement): Element\AbstractElement
7175
case 'mi':
7276
return new Element\Identifier($nodeValue);
7377
case 'mn':
74-
return new Element\Numeric($nodeValue);
78+
return new Element\Numeric(floatval($nodeValue));
7579
case 'mo':
7680
if (empty($nodeValue)) {
7781
$nodeList = $this->xpath->query('*', $nodeElement);
7882
if (
79-
$nodeList->length == 1
83+
$nodeList
84+
&& $nodeList->length == 1
8085
&& $nodeList->item(0)->nodeName == 'mchar'
86+
&& $nodeList->item(0) instanceof DOMElement
8187
&& $nodeList->item(0)->hasAttribute('name')
8288
) {
8389
$nodeValue = $nodeList->item(0)->getAttribute('name');
@@ -90,7 +96,7 @@ protected function getElement(DOMElement $nodeElement): Element\AbstractElement
9096
case 'msup':
9197
$element = new Element\Superscript();
9298
$nodeList = $this->xpath->query('*', $nodeElement);
93-
if ($nodeList->length == 2) {
99+
if ($nodeList && $nodeList->length == 2) {
94100
$element
95101
->setBase($this->getElement($nodeList->item(0)))
96102
->setSuperscript($this->getElement($nodeList->item(1)));

‎src/Math/Reader/OfficeMathML.php‎

Lines changed: 17 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,20 @@
33
namespace PhpOffice\Math\Reader;
44

55
use DOMDocument;
6-
use DOMElement;
6+
use DOMNode;
77
use DOMXPath;
88
use Exception;
99
use PhpOffice\Math\Element;
1010
use PhpOffice\Math\Math;
1111

1212
class OfficeMathML implements ReaderInterface
1313
{
14+
/** @var DOMDocument */
15+
protected $dom;
16+
1417
/** @var Math */
1518
protected $math;
1619

17-
/** @var XMLReader */
18-
protected $xmlReader;
19-
2020
/** @var DOMXpath */
2121
protected $xpath;
2222

@@ -46,11 +46,13 @@ public function read(string $content): ?Math
4646
/**
4747
* @see https://devblogs.microsoft.com/math-in-office/officemath/
4848
* @see https://learn.microsoft.com/fr-fr/archive/blogs/murrays/mathml-and-ecma-math-omml
49+
*
50+
* @param Math|Element\AbstractGroupElement $parent
4951
*/
50-
protected function parseNode(?DOMElement $nodeRowElement, $parent): void
52+
protected function parseNode(?DOMNode $nodeRowElement, $parent): void
5153
{
5254
$this->xpath = new DOMXpath($this->dom);
53-
foreach ($this->xpath->query('*', $nodeRowElement) as $nodeElement) {
55+
foreach ($this->xpath->query('*', $nodeRowElement) ?: [] as $nodeElement) {
5456
$element = $this->getElement($nodeElement);
5557
$parent->add($element);
5658

@@ -60,27 +62,27 @@ protected function parseNode(?DOMElement $nodeRowElement, $parent): void
6062
}
6163
}
6264

63-
protected function getElement(DOMElement $nodeElement): Element\AbstractElement
65+
protected function getElement(DOMNode $nodeElement): Element\AbstractElement
6466
{
6567
switch ($nodeElement->nodeName) {
6668
case 'm:f':
6769
$element = new Element\Fraction();
6870
// Numerator
6971
$nodeNumerator = $this->xpath->query('m:num/m:r/m:t', $nodeElement);
70-
if ($nodeNumerator->length == 1) {
72+
if ($nodeNumerator && $nodeNumerator->length == 1) {
7173
$value = $nodeNumerator->item(0)->nodeValue;
7274
if (is_numeric($value)) {
73-
$element->setNumerator(new Element\Numeric($value));
75+
$element->setNumerator(new Element\Numeric(floatval($value)));
7476
} else {
7577
$element->setNumerator(new Element\Identifier($value));
7678
}
7779
}
7880
// Denominator
7981
$nodeDenominator = $this->xpath->query('m:den/m:r/m:t', $nodeElement);
80-
if ($nodeDenominator->length == 1) {
82+
if ($nodeDenominator && $nodeDenominator->length == 1) {
8183
$value = $nodeDenominator->item(0)->nodeValue;
8284
if (is_numeric($value)) {
83-
$element->setDenominator(new Element\Numeric($value));
85+
$element->setDenominator(new Element\Numeric(floatval($value)));
8486
} else {
8587
$element->setDenominator(new Element\Identifier($value));
8688
}
@@ -89,18 +91,19 @@ protected function getElement(DOMElement $nodeElement): Element\AbstractElement
8991
return $element;
9092
case 'm:r':
9193
$nodeText = $this->xpath->query('m:t', $nodeElement);
92-
if ($nodeText->length == 1) {
94+
if ($nodeText && $nodeText->length == 1) {
9395
$value = trim($nodeText->item(0)->nodeValue);
9496
if (in_array($value, $this->operators)) {
9597
return new Element\Operator($value);
9698
}
9799
if (is_numeric($value)) {
98-
return new Element\Numeric($value);
100+
return new Element\Numeric(floatval($value));
99101
}
100102

101103
return new Element\Identifier($value);
102104
}
103-
break;
105+
106+
return new Element\Identifier('');
104107
case 'm:oMath':
105108
return new Element\Row();
106109
default:

‎src/Math/Writer/MathML.php‎

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -69,10 +69,21 @@ protected function writeElementItem(Element\AbstractElement $element): void
6969
return;
7070
}
7171

72-
// Element\AbstractElement
73-
$this->output->startElement($this->getElementTagName($element));
74-
$this->output->text((string) $element->getValue());
75-
$this->output->endElement();
72+
if ($element instanceof Element\Identifier
73+
|| $element instanceof Element\Numeric
74+
|| $element instanceof Element\Operator) {
75+
$this->output->startElement($this->getElementTagName($element));
76+
$this->output->text((string) $element->getValue());
77+
$this->output->endElement();
78+
79+
return;
80+
}
81+
82+
throw new Exception(sprintf(
83+
'%s : The class `%s` is not implemented',
84+
__METHOD__,
85+
get_class($element)
86+
));
7687
}
7788

7889
protected function getElementTagName(Element\AbstractElement $element): string

‎src/Math/Writer/OfficeMathML.php‎

Lines changed: 17 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -62,12 +62,23 @@ protected function writeElementItem(Element\AbstractElement $element): void
6262
return;
6363
}
6464

65-
// Element\AbstractElement
66-
$this->output->startElement('m:r');
67-
$this->output->startElement('m:t');
68-
$this->output->text((string) $element->getValue());
69-
$this->output->endElement();
70-
$this->output->endElement();
65+
if ($element instanceof Element\Identifier
66+
|| $element instanceof Element\Numeric
67+
|| $element instanceof Element\Operator) {
68+
$this->output->startElement('m:r');
69+
$this->output->startElement('m:t');
70+
$this->output->text((string) $element->getValue());
71+
$this->output->endElement();
72+
$this->output->endElement();
73+
74+
return;
75+
}
76+
77+
throw new Exception(sprintf(
78+
'%s : The class `%s` is not implemented',
79+
__METHOD__,
80+
get_class($element)
81+
));
7182
}
7283

7384
protected function getElementTagName(Element\AbstractElement $element): string

0 commit comments

Comments
 (0)