Skip to content

Commit 9882e35

Browse files
tvdijentvdijen
committed
Cleaning up
1 parent 8128ec4 commit 9882e35

10 files changed

Lines changed: 39 additions & 44 deletions

‎src/XML/DOMDocumentFactory.php‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
namespace SimpleSAML\XML;
66

77
use Dom;
8+
use DOMException;
89
use SimpleSAML\XML\Assert\Assert;
910
use SimpleSAML\XML\Constants as C;
1011
use SimpleSAML\XML\Exception\IOException;
@@ -86,7 +87,7 @@ public static function fromString(
8687
* @throws \DOMException
8788
*/
8889
static function (int $severity, string $message): never {
89-
throw new \DOMException($message);
90+
throw new DOMException($message);
9091
},
9192
);
9293

‎src/XML/TestUtils/ArrayizableElementTestTrait.php‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
44

55
namespace SimpleSAML\XML\TestUtils;
66

7-
use PHPUnit\Framework\Attributes\Depends;
8-
97
use function class_exists;
108

119
/**
@@ -26,7 +24,6 @@ trait ArrayizableElementTestTrait
2624
/**
2725
* Test arrayization / de-arrayization
2826
*/
29-
#[Depends('testMarshalling')]
3027
public function testArrayization(): void
3128
{
3229
if (!class_exists(self::$testedClass)) {

‎src/XML/TestUtils/SchemaValidationTestTrait.php‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
namespace SimpleSAML\XML\TestUtils;
66

77
use Dom;
8-
use PHPUnit\Framework\Attributes\Depends;
98
use SimpleSAML\XML\DOMDocumentFactory;
109

1110
use function class_exists;
@@ -31,7 +30,6 @@ trait SchemaValidationTestTrait
3130
/**
3231
* Test schema validation.
3332
*/
34-
#[Depends('testSerialization')]
3533
public function testSchemaValidation(): void
3634
{
3735
if (!class_exists(self::$testedClass)) {

‎src/XML/TestUtils/SerializableElementTestTrait.php‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@
55
namespace SimpleSAML\XML\TestUtils;
66

77
use Dom;
8-
use PHPUnit\Framework\Assert;
9-
use PHPUnit\Framework\Attributes\Depends;
108
use SimpleSAML\XML\DOMDocumentFactory;
119

1210
use function class_exists;
@@ -62,8 +60,6 @@ public function testUnmarshalling(): void
6260
/**
6361
* Test serialization / unserialization.
6462
*/
65-
#[Depends('testMarshalling')]
66-
#[Depends('testUnmarshalling')]
6763
public function testSerialization(): void
6864
{
6965
if (!class_exists(self::$testedClass)) {
@@ -90,10 +86,10 @@ private function assertXmlStringEquals(string $expectedXml, string $actualXml):
9086
$expectedDoc = DOMDocumentFactory::fromString($expectedXml);
9187
$actualDoc = DOMDocumentFactory::fromString($actualXml);
9288

93-
Assert::assertNotNull($expectedDoc->documentElement);
94-
Assert::assertNotNull($actualDoc->documentElement);
89+
$this->assertNotNull($expectedDoc->documentElement);
90+
$this->assertNotNull($actualDoc->documentElement);
9591

96-
Assert::assertSame(
92+
$this->assertEquals(
9793
$expectedDoc->documentElement->C14N(),
9894
$actualDoc->documentElement->C14N(),
9995
);

‎tests/XML/AbstractElementTest.php‎

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

55
namespace SimpleSAML\Test\XML;
66

7+
use Dom;
78
use PHPUnit\Framework\Attributes\CoversClass;
89
use PHPUnit\Framework\TestCase;
910
use SimpleSAML\Test\Helper\Element;
@@ -49,7 +50,7 @@ public function testMarshalling(): void
4950
);
5051

5152
$representationRoot = self::$xmlRepresentation->documentElement;
52-
$this->assertInstanceOf(\Dom\Element::class, $representationRoot);
53+
$this->assertInstanceOf(Dom\Element::class, $representationRoot);
5354

5455
$expectedXml = self::$xmlRepresentation->saveXml($representationRoot);
5556
$this->assertNotSame('', $expectedXml);
@@ -63,10 +64,10 @@ public function testMarshalling(): void
6364
$actualDoc = DOMDocumentFactory::fromString($actualXml);
6465

6566
$expectedRoot = $expectedDoc->documentElement;
66-
$this->assertInstanceOf(\Dom\Element::class, $expectedRoot);
67+
$this->assertInstanceOf(Dom\Element::class, $expectedRoot);
6768

6869
$actualRoot = $actualDoc->documentElement;
69-
$this->assertInstanceOf(\Dom\Element::class, $actualRoot);
70+
$this->assertInstanceOf(Dom\Element::class, $actualRoot);
7071

7172
$this->assertSame(
7273
$expectedRoot->C14N(),
@@ -78,7 +79,7 @@ public function testMarshalling(): void
7879
public function testUnmarshalling(): void
7980
{
8081
$elt = self::$xmlRepresentation->documentElement;
81-
$this->assertInstanceOf(\Dom\Element::class, $elt);
82+
$this->assertInstanceOf(Dom\Element::class, $elt);
8283

8384
$element = Element::fromXML($elt);
8485

@@ -92,7 +93,7 @@ public function testUnmarshalling(): void
9293
public function testGetAttribute(): void
9394
{
9495
$xml = self::$xmlRepresentation->documentElement;
95-
$this->assertInstanceOf(\Dom\Element::class, $xml);
96+
$this->assertInstanceOf(Dom\Element::class, $xml);
9697

9798
// Get mandatory attributes
9899
$this->assertEquals('text', Element::getAttribute($xml, 'text', StringValue::class));
@@ -152,7 +153,7 @@ public function testGetAttribute(): void
152153
public function testGetAttributeThrowsExceptionOnMissingAttribute(): void
153154
{
154155
$xml = self::$xmlRepresentation->documentElement;
155-
$this->assertInstanceOf(\Dom\Element::class, $xml);
156+
$this->assertInstanceOf(Dom\Element::class, $xml);
156157

157158
$xml = clone $xml;
158159
$xml->removeAttribute('text');
@@ -165,7 +166,7 @@ public function testGetAttributeThrowsExceptionOnMissingAttribute(): void
165166
public function testGetBooleanAttributeThrowsExceptionOnMissingAttribute(): void
166167
{
167168
$xml = self::$xmlRepresentation->documentElement;
168-
$this->assertInstanceOf(\Dom\Element::class, $xml);
169+
$this->assertInstanceOf(Dom\Element::class, $xml);
169170

170171
$xml = clone $xml;
171172
$xml->removeAttribute('boolean');
@@ -178,7 +179,7 @@ public function testGetBooleanAttributeThrowsExceptionOnMissingAttribute(): void
178179
public function testGetIntegerAttributeThrowsExceptionOnMissingAttribute(): void
179180
{
180181
$xml = self::$xmlRepresentation->documentElement;
181-
$this->assertInstanceOf(\Dom\Element::class, $xml);
182+
$this->assertInstanceOf(Dom\Element::class, $xml);
182183

183184
$xml = clone $xml;
184185
$xml->removeAttribute('integer');

‎tests/XML/ChunkTest.php‎

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

55
namespace SimpleSAML\Test\XML;
66

7+
use Dom;
78
use PHPUnit\Framework\Attributes\CoversClass;
89
use PHPUnit\Framework\TestCase;
910
use SimpleSAML\XML\Chunk;
@@ -41,12 +42,12 @@ public static function setUpBeforeClass(): void
4142
public function testMarshalling(): void
4243
{
4344
$xml = self::$xmlRepresentation->documentElement;
44-
$this->assertInstanceOf(\Dom\Element::class, $xml);
45+
$this->assertInstanceOf(Dom\Element::class, $xml);
4546

4647
$chunk = new Chunk($xml);
4748

4849
$representationRoot = self::$xmlRepresentation->documentElement;
49-
$this->assertInstanceOf(\Dom\Element::class, $representationRoot);
50+
$this->assertInstanceOf(Dom\Element::class, $representationRoot);
5051

5152
$expectedXml = self::$xmlRepresentation->saveXml($representationRoot);
5253
$this->assertNotSame('', $expectedXml);
@@ -60,10 +61,10 @@ public function testMarshalling(): void
6061
$actualDoc = DOMDocumentFactory::fromString($actualXml);
6162

6263
$expectedRoot = $expectedDoc->documentElement;
63-
$this->assertInstanceOf(\Dom\Element::class, $expectedRoot);
64+
$this->assertInstanceOf(Dom\Element::class, $expectedRoot);
6465

6566
$actualRoot = $actualDoc->documentElement;
66-
$this->assertInstanceOf(\Dom\Element::class, $actualRoot);
67+
$this->assertInstanceOf(Dom\Element::class, $actualRoot);
6768

6869
$this->assertSame(
6970
$expectedRoot->C14N(),
@@ -75,7 +76,7 @@ public function testMarshalling(): void
7576
public function testUnmarshalling(): void
7677
{
7778
$xml = self::$xmlRepresentation->documentElement;
78-
$this->assertInstanceOf(\Dom\Element::class, $xml);
79+
$this->assertInstanceOf(Dom\Element::class, $xml);
7980

8081
$chunk = new Chunk($xml);
8182

‎tests/XML/DOMDocumentFactoryTest.php‎

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

55
namespace SimpleSAML\Test\XML;
66

7+
use Dom;
78
use DOMException;
89
use PHPUnit\Framework\Attributes\CoversClass;
910
use PHPUnit\Framework\Attributes\Group;
@@ -125,10 +126,10 @@ public function testNormalizeDocument(): void
125126
$normalizedDoc = DOMDocumentFactory::normalizeDocument($notNormalized);
126127

127128
$normalizedRoot = $normalized->documentElement;
128-
$this->assertInstanceOf(\Dom\Element::class, $normalizedRoot);
129+
$this->assertInstanceOf(Dom\Element::class, $normalizedRoot);
129130

130131
$normalizedDocRoot = $normalizedDoc->documentElement;
131-
$this->assertInstanceOf(\Dom\Element::class, $normalizedDocRoot);
132+
$this->assertInstanceOf(Dom\Element::class, $normalizedDocRoot);
132133

133134
$this->assertSame(
134135
$normalizedRoot->C14N(),

‎tests/XML/ExtendableAttributesTest.php‎

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

55
namespace SimpleSAML\Test\XML;
66

7+
use Dom;
78
use PHPUnit\Framework\TestCase;
89
use SimpleSAML\Test\Helper\ExtendableAttributesElement;
910
use SimpleSAML\XML\Attribute;
@@ -47,7 +48,7 @@ public function testMarshalling(): void
4748
);
4849

4950
$representationRoot = self::$xmlRepresentation->documentElement;
50-
$this->assertInstanceOf(\Dom\Element::class, $representationRoot);
51+
$this->assertInstanceOf(Dom\Element::class, $representationRoot);
5152

5253
$expectedXml = self::$xmlRepresentation->saveXml($representationRoot);
5354
$this->assertNotSame('', $expectedXml);
@@ -61,10 +62,10 @@ public function testMarshalling(): void
6162
$actualDoc = DOMDocumentFactory::fromString($actualXml);
6263

6364
$expectedRoot = $expectedDoc->documentElement;
64-
$this->assertInstanceOf(\Dom\Element::class, $expectedRoot);
65+
$this->assertInstanceOf(Dom\Element::class, $expectedRoot);
6566

6667
$actualRoot = $actualDoc->documentElement;
67-
$this->assertInstanceOf(\Dom\Element::class, $actualRoot);
68+
$this->assertInstanceOf(Dom\Element::class, $actualRoot);
6869

6970
$this->assertEquals(
7071
$expectedRoot->C14N(),
@@ -89,7 +90,7 @@ public function testMarshallingWithExcludedAttribute(): void
8990
public function testGetAttributesNSFromXML(): void
9091
{
9192
$element = self::$xmlRepresentation->documentElement;
92-
$this->assertInstanceOf(\Dom\Element::class, $element);
93+
$this->assertInstanceOf(Dom\Element::class, $element);
9394

9495
$elt = ExtendableAttributesElement::fromXML($element);
9596
$attributes = $elt->getAttributesNS();

‎tests/XML/ExtendableElementTest.php‎

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

55
namespace SimpleSAML\Test\XML;
66

7+
use Dom;
78
use PHPUnit\Framework\TestCase;
89
use SimpleSAML\Test\Helper\ExtendableElement;
910
use SimpleSAML\XML\Chunk;
@@ -45,10 +46,10 @@ public function testMarshalling(): void
4546
);
4647

4748
$dummyElement1 = $dummyDocument1->documentElement;
48-
$this->assertInstanceOf(\Dom\Element::class, $dummyElement1);
49+
$this->assertInstanceOf(Dom\Element::class, $dummyElement1);
4950

5051
$dummyElement2 = $dummyDocument2->documentElement;
51-
$this->assertInstanceOf(\Dom\Element::class, $dummyElement2);
52+
$this->assertInstanceOf(Dom\Element::class, $dummyElement2);
5253

5354
$extendableElement = new ExtendableElement(
5455
[
@@ -58,7 +59,7 @@ public function testMarshalling(): void
5859
);
5960

6061
$representationRoot = self::$xmlRepresentation->documentElement;
61-
$this->assertInstanceOf(\Dom\Element::class, $representationRoot);
62+
$this->assertInstanceOf(Dom\Element::class, $representationRoot);
6263

6364
$expectedXml = self::$xmlRepresentation->saveXml($representationRoot);
6465
$this->assertNotSame('', $expectedXml);
@@ -72,10 +73,10 @@ public function testMarshalling(): void
7273
$actualDoc = DOMDocumentFactory::fromString($actualXml);
7374

7475
$expectedRoot = $expectedDoc->documentElement;
75-
$this->assertInstanceOf(\Dom\Element::class, $expectedRoot);
76+
$this->assertInstanceOf(Dom\Element::class, $expectedRoot);
7677

7778
$actualRoot = $actualDoc->documentElement;
78-
$this->assertInstanceOf(\Dom\Element::class, $actualRoot);
79+
$this->assertInstanceOf(Dom\Element::class, $actualRoot);
7980

8081
$this->assertEquals(
8182
$expectedRoot->C14N(),
@@ -97,13 +98,13 @@ public function testMarshallingWithExcludedElement(): void
9798
);
9899

99100
$dummyElement1 = $dummyDocument1->documentElement;
100-
$this->assertInstanceOf(\Dom\Element::class, $dummyElement1);
101+
$this->assertInstanceOf(Dom\Element::class, $dummyElement1);
101102

102103
$dummyElement2 = $dummyDocument2->documentElement;
103-
$this->assertInstanceOf(\Dom\Element::class, $dummyElement2);
104+
$this->assertInstanceOf(Dom\Element::class, $dummyElement2);
104105

105106
$dummyElement3 = $dummyDocument3->documentElement;
106-
$this->assertInstanceOf(\Dom\Element::class, $dummyElement3);
107+
$this->assertInstanceOf(Dom\Element::class, $dummyElement3);
107108

108109
$this->expectException(InvalidDOMElementException::class);
109110
new ExtendableElement(
@@ -119,7 +120,7 @@ public function testMarshallingWithExcludedElement(): void
119120
public function testGetChildElementsFromXML(): void
120121
{
121122
$element = self::$xmlRepresentation->documentElement;
122-
$this->assertInstanceOf(\Dom\Element::class, $element);
123+
$this->assertInstanceOf(Dom\Element::class, $element);
123124

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

‎tools/composer-require-checker.json‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
{
22
"symbol-whitelist": [
3-
"LIBXML_NO_XXE",
4-
"PHPUnit\\Framework\\Attributes\\Depends",
5-
"PHPUnit\\Framework\\Assert"
3+
"LIBXML_NO_XXE"
64
]
75
}

0 commit comments

Comments
 (0)