Skip to content

Commit 2d35606

Browse files
ioigoumeioigoume
committed
Fix phpstan-dev execution issues
1 parent 4819753 commit 2d35606

7 files changed

Lines changed: 110 additions & 71 deletions

‎tests/XML/AbstractElementTest.php‎

Lines changed: 26 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,6 @@ final class AbstractElementTest extends TestCase
2929
use SerializableElementTestTrait;
3030

3131

32-
/**
33-
*/
3432
public static function setUpBeforeClass(): void
3533
{
3634
self::$testedClass = Element::class;
@@ -41,8 +39,6 @@ public static function setUpBeforeClass(): void
4139
}
4240

4341

44-
/**
45-
*/
4642
public function testMarshalling(): void
4743
{
4844
$element = new Element(
@@ -52,25 +48,38 @@ public function testMarshalling(): void
5248
StringValue::fromString('otherText'),
5349
);
5450

55-
$expectedXml = self::$xmlRepresentation->saveXml(self::$xmlRepresentation->documentElement);
51+
$representationRoot = self::$xmlRepresentation->documentElement;
52+
$this->assertInstanceOf(\Dom\Element::class, $representationRoot);
53+
54+
$expectedXml = self::$xmlRepresentation->saveXml($representationRoot);
55+
$this->assertNotSame('', $expectedXml);
56+
/** @var non-empty-string $expectedXml */
57+
5658
$actualXml = strval($element);
59+
$this->assertNotSame('', $actualXml);
60+
/** @var non-empty-string $actualXml */
5761

5862
$expectedDoc = DOMDocumentFactory::fromString($expectedXml);
5963
$actualDoc = DOMDocumentFactory::fromString($actualXml);
6064

65+
$expectedRoot = $expectedDoc->documentElement;
66+
$this->assertInstanceOf(\Dom\Element::class, $expectedRoot);
67+
68+
$actualRoot = $actualDoc->documentElement;
69+
$this->assertInstanceOf(\Dom\Element::class, $actualRoot);
70+
6171
$this->assertSame(
62-
$expectedDoc->documentElement->C14N(),
63-
$actualDoc->documentElement->C14N(),
72+
$expectedRoot->C14N(),
73+
$actualRoot->C14N(),
6474
);
6575
}
6676

6777

68-
/**
69-
*/
7078
public function testUnmarshalling(): void
7179
{
72-
/** @var \Dom\Element $elt */
7380
$elt = self::$xmlRepresentation->documentElement;
81+
$this->assertInstanceOf(\Dom\Element::class, $elt);
82+
7483
$element = Element::fromXML($elt);
7584

7685
$this->assertEquals('2', $element->getInteger());
@@ -80,12 +89,10 @@ public function testUnmarshalling(): void
8089
}
8190

8291

83-
/**
84-
*/
8592
public function testGetAttribute(): void
8693
{
87-
/** @var \Dom\Element $xml */
8894
$xml = self::$xmlRepresentation->documentElement;
95+
$this->assertInstanceOf(\Dom\Element::class, $xml);
8996

9097
// Get mandatory attributes
9198
$this->assertEquals('text', Element::getAttribute($xml, 'text', StringValue::class));
@@ -142,12 +149,11 @@ public function testGetAttribute(): void
142149
}
143150

144151

145-
/**
146-
*/
147152
public function testGetAttributeThrowsExceptionOnMissingAttribute(): void
148153
{
149-
/** @var \Dom\Element $xml */
150154
$xml = self::$xmlRepresentation->documentElement;
155+
$this->assertInstanceOf(\Dom\Element::class, $xml);
156+
151157
$xml = clone $xml;
152158
$xml->removeAttribute('text');
153159

@@ -156,12 +162,11 @@ public function testGetAttributeThrowsExceptionOnMissingAttribute(): void
156162
}
157163

158164

159-
/**
160-
*/
161165
public function testGetBooleanAttributeThrowsExceptionOnMissingAttribute(): void
162166
{
163-
/** @var \Dom\Element $xml */
164167
$xml = self::$xmlRepresentation->documentElement;
168+
$this->assertInstanceOf(\Dom\Element::class, $xml);
169+
165170
$xml = clone $xml;
166171
$xml->removeAttribute('boolean');
167172

@@ -170,12 +175,11 @@ public function testGetBooleanAttributeThrowsExceptionOnMissingAttribute(): void
170175
}
171176

172177

173-
/**
174-
*/
175178
public function testGetIntegerAttributeThrowsExceptionOnMissingAttribute(): void
176179
{
177-
/** @var \Dom\Element $xml */
178180
$xml = self::$xmlRepresentation->documentElement;
181+
$this->assertInstanceOf(\Dom\Element::class, $xml);
182+
179183
$xml = clone $xml;
180184
$xml->removeAttribute('integer');
181185

‎tests/XML/ChunkTest.php‎

Lines changed: 21 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,6 @@ final class ChunkTest extends TestCase
2828
use SerializableElementTestTrait;
2929

3030

31-
/**
32-
*/
3331
public static function setUpBeforeClass(): void
3432
{
3533
self::$testedClass = Chunk::class;
@@ -40,33 +38,45 @@ public static function setUpBeforeClass(): void
4038
}
4139

4240

43-
/**
44-
*/
4541
public function testMarshalling(): void
4642
{
47-
/** @var \Dom\Element $xml */
4843
$xml = self::$xmlRepresentation->documentElement;
44+
$this->assertInstanceOf(\Dom\Element::class, $xml);
45+
4946
$chunk = new Chunk($xml);
5047

51-
$expectedXml = self::$xmlRepresentation->saveXml(self::$xmlRepresentation->documentElement);
48+
$representationRoot = self::$xmlRepresentation->documentElement;
49+
$this->assertInstanceOf(\Dom\Element::class, $representationRoot);
50+
51+
$expectedXml = self::$xmlRepresentation->saveXml($representationRoot);
52+
$this->assertNotSame('', $expectedXml);
53+
/** @var non-empty-string $expectedXml */
54+
5255
$actualXml = strval($chunk);
56+
$this->assertNotSame('', $actualXml);
57+
/** @var non-empty-string $actualXml */
5358

5459
$expectedDoc = DOMDocumentFactory::fromString($expectedXml);
5560
$actualDoc = DOMDocumentFactory::fromString($actualXml);
5661

62+
$expectedRoot = $expectedDoc->documentElement;
63+
$this->assertInstanceOf(\Dom\Element::class, $expectedRoot);
64+
65+
$actualRoot = $actualDoc->documentElement;
66+
$this->assertInstanceOf(\Dom\Element::class, $actualRoot);
67+
5768
$this->assertSame(
58-
$expectedDoc->documentElement->C14N(),
59-
$actualDoc->documentElement->C14N(),
69+
$expectedRoot->C14N(),
70+
$actualRoot->C14N(),
6071
);
6172
}
6273

6374

64-
/**
65-
*/
6675
public function testUnmarshalling(): void
6776
{
68-
/** @var \Dom\Element $xml */
6977
$xml = self::$xmlRepresentation->documentElement;
78+
$this->assertInstanceOf(\Dom\Element::class, $xml);
79+
7080
$chunk = new Chunk($xml);
7181

7282
$this->assertEquals($chunk->getLocalName(), 'Element');

‎tests/XML/DOMDocumentFactoryTest.php‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,8 @@ public function testEmptyStringIsNotValid(): void
112112
$this->expectExceptionMessage(
113113
'Expected a non-whitespace string. Got: ""',
114114
);
115+
116+
/** @phpstan-ignore-next-line argument.type */
115117
DOMDocumentFactory::fromString('');
116118
}
117119

@@ -122,9 +124,15 @@ public function testNormalizeDocument(): void
122124
$notNormalized = DOMDocumentFactory::fromFile('tests/resources/xml/domdocument_not_normalized.xml');
123125
$normalizedDoc = DOMDocumentFactory::normalizeDocument($notNormalized);
124126

127+
$normalizedRoot = $normalized->documentElement;
128+
$this->assertInstanceOf(\Dom\Element::class, $normalizedRoot);
129+
130+
$normalizedDocRoot = $normalizedDoc->documentElement;
131+
$this->assertInstanceOf(\Dom\Element::class, $normalizedDocRoot);
132+
125133
$this->assertSame(
126-
$normalized->documentElement->C14N(),
127-
$normalizedDoc->documentElement->C14N(),
134+
$normalizedRoot->C14N(),
135+
$normalizedDocRoot->C14N(),
128136
);
129137
}
130138
}

‎tests/XML/ExtendableAttributesTest.php‎

Lines changed: 18 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,6 @@ final class ExtendableAttributesTest extends TestCase
2727
use SerializableElementTestTrait;
2828

2929

30-
/**
31-
*/
3230
public static function setUpBeforeClass(): void
3331
{
3432
self::$testedClass = ExtendableAttributesElement::class;
@@ -39,8 +37,6 @@ public static function setUpBeforeClass(): void
3937
}
4038

4139

42-
/**
43-
*/
4440
public function testMarshalling(): void
4541
{
4642
$extendableElement = new ExtendableAttributesElement(
@@ -50,21 +46,33 @@ public function testMarshalling(): void
5046
],
5147
);
5248

53-
$expectedXml = self::$xmlRepresentation->saveXml(self::$xmlRepresentation->documentElement);
49+
$representationRoot = self::$xmlRepresentation->documentElement;
50+
$this->assertInstanceOf(\Dom\Element::class, $representationRoot);
51+
52+
$expectedXml = self::$xmlRepresentation->saveXml($representationRoot);
53+
$this->assertNotSame('', $expectedXml);
54+
/** @var non-empty-string $expectedXml */
55+
5456
$actualXml = strval($extendableElement);
57+
$this->assertNotSame('', $actualXml);
58+
/** @var non-empty-string $actualXml */
5559

5660
$expectedDoc = DOMDocumentFactory::fromString($expectedXml);
5761
$actualDoc = DOMDocumentFactory::fromString($actualXml);
5862

63+
$expectedRoot = $expectedDoc->documentElement;
64+
$this->assertInstanceOf(\Dom\Element::class, $expectedRoot);
65+
66+
$actualRoot = $actualDoc->documentElement;
67+
$this->assertInstanceOf(\Dom\Element::class, $actualRoot);
68+
5969
$this->assertEquals(
60-
$expectedDoc->documentElement->C14N(),
61-
$actualDoc->documentElement->C14N(),
70+
$expectedRoot->C14N(),
71+
$actualRoot->C14N(),
6272
);
6373
}
6474

6575

66-
/**
67-
*/
6876
public function testMarshallingWithExcludedAttribute(): void
6977
{
7078
$this->expectException(InvalidDOMAttributeException::class);
@@ -78,12 +86,10 @@ public function testMarshallingWithExcludedAttribute(): void
7886
}
7987

8088

81-
/**
82-
*/
8389
public function testGetAttributesNSFromXML(): void
8490
{
85-
/** @var \Dom\Element $element */
8691
$element = self::$xmlRepresentation->documentElement;
92+
$this->assertInstanceOf(\Dom\Element::class, $element);
8793

8894
$elt = ExtendableAttributesElement::fromXML($element);
8995
$attributes = $elt->getAttributesNS();

‎tests/XML/ExtendableElementTest.php‎

Lines changed: 28 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -26,20 +26,15 @@ final class ExtendableElementTest extends TestCase
2626
use SerializableElementTestTrait;
2727

2828

29-
/**
30-
*/
3129
public static function setUpBeforeClass(): void
3230
{
3331
self::$testedClass = ExtendableElement::class;
3432

35-
self::$xmlRepresentation = DOMDocumentFactory::fromFile(
36-
dirname(__FILE__, 2) . '/resources/xml/ssp_ExtendableElement.xml',
37-
);
33+
$fixturePath = dirname(__FILE__, 2) . '/resources/xml/ssp_ExtendableElement.xml';
34+
self::$xmlRepresentation = DOMDocumentFactory::fromFile($fixturePath);
3835
}
3936

4037

41-
/**
42-
*/
4338
public function testMarshalling(): void
4439
{
4540
$dummyDocument1 = DOMDocumentFactory::fromString(
@@ -49,10 +44,11 @@ public function testMarshalling(): void
4944
'<dummy:Chunk xmlns:dummy="urn:custom:dummy">some</dummy:Chunk>',
5045
);
5146

52-
/** @var \Dom\Element $dummyElement1 */
5347
$dummyElement1 = $dummyDocument1->documentElement;
54-
/** @var \Dom\Element $dummyElement2 */
48+
$this->assertInstanceOf(\Dom\Element::class, $dummyElement1);
49+
5550
$dummyElement2 = $dummyDocument2->documentElement;
51+
$this->assertInstanceOf(\Dom\Element::class, $dummyElement2);
5652

5753
$extendableElement = new ExtendableElement(
5854
[
@@ -61,21 +57,33 @@ public function testMarshalling(): void
6157
],
6258
);
6359

64-
$expectedXml = self::$xmlRepresentation->saveXml(self::$xmlRepresentation->documentElement);
60+
$representationRoot = self::$xmlRepresentation->documentElement;
61+
$this->assertInstanceOf(\Dom\Element::class, $representationRoot);
62+
63+
$expectedXml = self::$xmlRepresentation->saveXml($representationRoot);
64+
$this->assertNotSame('', $expectedXml);
65+
/** @var non-empty-string $expectedXml */
66+
6567
$actualXml = strval($extendableElement);
68+
$this->assertNotSame('', $actualXml);
69+
/** @var non-empty-string $actualXml */
6670

6771
$expectedDoc = DOMDocumentFactory::fromString($expectedXml);
6872
$actualDoc = DOMDocumentFactory::fromString($actualXml);
6973

74+
$expectedRoot = $expectedDoc->documentElement;
75+
$this->assertInstanceOf(\Dom\Element::class, $expectedRoot);
76+
77+
$actualRoot = $actualDoc->documentElement;
78+
$this->assertInstanceOf(\Dom\Element::class, $actualRoot);
79+
7080
$this->assertEquals(
71-
$expectedDoc->documentElement->C14N(),
72-
$actualDoc->documentElement->C14N(),
81+
$expectedRoot->C14N(),
82+
$actualRoot->C14N(),
7383
);
7484
}
7585

7686

77-
/**
78-
*/
7987
public function testMarshallingWithExcludedElement(): void
8088
{
8189
$dummyDocument1 = DOMDocumentFactory::fromString(
@@ -88,12 +96,14 @@ public function testMarshallingWithExcludedElement(): void
8896
'<other:Chunk xmlns:other="urn:custom:other">some</other:Chunk>',
8997
);
9098

91-
/** @var \Dom\Element $dummyElement1 */
9299
$dummyElement1 = $dummyDocument1->documentElement;
93-
/** @var \Dom\Element $dummyElement2 */
100+
$this->assertInstanceOf(\Dom\Element::class, $dummyElement1);
101+
94102
$dummyElement2 = $dummyDocument2->documentElement;
95-
/** @var \Dom\Element $dummyElement3 */
103+
$this->assertInstanceOf(\Dom\Element::class, $dummyElement2);
104+
96105
$dummyElement3 = $dummyDocument3->documentElement;
106+
$this->assertInstanceOf(\Dom\Element::class, $dummyElement3);
97107

98108
$this->expectException(InvalidDOMElementException::class);
99109
new ExtendableElement(
@@ -106,12 +116,10 @@ public function testMarshallingWithExcludedElement(): void
106116
}
107117

108118

109-
/**
110-
*/
111119
public function testGetChildElementsFromXML(): void
112120
{
113-
/** @var \Dom\Element $element */
114121
$element = self::$xmlRepresentation->documentElement;
122+
$this->assertInstanceOf(\Dom\Element::class, $element);
115123

116124
$elt = ExtendableElement::fromXML($element);
117125
/** @var \SimpleSAML\XML\Chunk[] $elements */

0 commit comments

Comments
 (0)