Fix codesniffer issues

simplesamlphp · Feb 26, 2024 · 8b3a3f7 · 8b3a3f7
1 parent 8ca6a75
commit 8b3a3f7
Show file tree

Hide file tree

Showing 10 changed files with 15 additions and 20 deletions.
diff --git a/tests/resources/xml/saml_AttributeValueWithNameID.xml b/tests/resources/xml/saml_AttributeValueWithNameID.xml
@@ -0,0 +1,3 @@
+<saml:AttributeValue xmlns:saml="urn:oasis:names:tc:SAML:1.0:assertion">
+  <saml:NameIdentifier Format="urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified">abcd-some-value-xyz</saml:NameIdentifier>
+</saml:AttributeValue>
diff --git a/tests/resources/xml/saml_SubjectConfirmationDataWithNameID.xml b/tests/resources/xml/saml_SubjectConfirmationDataWithNameID.xml
@@ -0,0 +1,3 @@
+<saml:SubjectConfirmationData xmlns:saml="urn:oasis:names:tc:SAML:1.0:assertion">
+  <saml:NameIdentifier Format="urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified">abcd-some-value-xyz</saml:NameIdentifier>
+</saml:SubjectConfirmationData>
diff --git a/tests/src/SAML11/XML/saml/ActionTest.php b/tests/src/SAML11/XML/saml/ActionTest.php
@@ -6,7 +6,6 @@
 
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\SAML11\XML\saml\Action;
-use SimpleSAML\XML\Chunk;
 use SimpleSAML\XML\DOMDocumentFactory;
 use SimpleSAML\XML\TestUtils\SchemaValidationTestTrait;
 use SimpleSAML\XML\TestUtils\SerializableElementTestTrait;

diff --git a/tests/src/SAML11/XML/saml/AttributeValueTest.php b/tests/src/SAML11/XML/saml/AttributeValueTest.php
@@ -122,11 +122,8 @@ public function testEmptyStringAttribute(): void
      */
     public function testUnmarshallingNameID(): void
     {
-        $document = DOMDocumentFactory::fromString(<<<XML
-<saml:AttributeValue xmlns:saml="urn:oasis:names:tc:SAML:1.0:assertion">
-  <saml:NameIdentifier Format="urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified">abcd-some-value-xyz</saml:NameIdentifier>
-</saml:AttributeValue>
-XML
+        $document = DOMDocumentFactory::fromFile(
+            dirname(__FILE__, 5) . '/resources/xml/saml_AttributeValue.xml',
         );
 
         $av = AttributeValue::fromXML($document->documentElement);

diff --git a/tests/src/SAML11/XML/saml/AudienceTest.php b/tests/src/SAML11/XML/saml/AudienceTest.php
@@ -6,7 +6,6 @@
 
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\SAML11\XML\saml\Audience;
-use SimpleSAML\XML\Chunk;
 use SimpleSAML\XML\DOMDocumentFactory;
 use SimpleSAML\XML\TestUtils\SchemaValidationTestTrait;
 use SimpleSAML\XML\TestUtils\SerializableElementTestTrait;

diff --git a/tests/src/SAML11/XML/saml/AuthorityBindingTest.php b/tests/src/SAML11/XML/saml/AuthorityBindingTest.php
@@ -6,7 +6,6 @@
 
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\SAML11\XML\saml\AuthorityBinding;
-use SimpleSAML\XML\Chunk;
 use SimpleSAML\XML\DOMDocumentFactory;
 use SimpleSAML\XML\TestUtils\SchemaValidationTestTrait;
 use SimpleSAML\XML\TestUtils\SerializableElementTestTrait;
@@ -51,7 +50,11 @@ public static function setUpBeforeClass(): void
      */
     public function testMarshalling(): void
     {
-        $ab = new AuthorityBinding('samlp:AttributeQuery', 'urn:x-simplesamlphp:location', 'urn:x-simplesamlphp:binding');
+        $ab = new AuthorityBinding(
+            'samlp:AttributeQuery',
+            'urn:x-simplesamlphp:location',
+            'urn:x-simplesamlphp:binding',
+        );
 
         $this->assertEquals(
             self::$xmlRepresentation->saveXML(self::$xmlRepresentation->documentElement),

diff --git a/tests/src/SAML11/XML/saml/SubjectConfirmationDataTest.php b/tests/src/SAML11/XML/saml/SubjectConfirmationDataTest.php
@@ -6,7 +6,6 @@
 
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\SAML11\Constants as C;
-use SimpleSAML\SAML11\XML\saml\Assertion;
 use SimpleSAML\SAML11\XML\saml\NameIdentifier;
 use SimpleSAML\SAML11\XML\saml\SubjectConfirmationData;
 use SimpleSAML\XML\DOMDocumentFactory;
@@ -123,11 +122,8 @@ public function testEmptyStringAttribute(): void
      */
     public function testUnmarshallingNameID(): void
     {
-        $document = DOMDocumentFactory::fromString(<<<XML
-<saml:SubjectConfirmationData xmlns:saml="urn:oasis:names:tc:SAML:1.0:assertion">
-  <saml:NameIdentifier Format="urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified">abcd-some-value-xyz</saml:NameIdentifier>
-</saml:SubjectConfirmationData>
-XML
+        $document = DOMDocumentFactory::fromFile(
+            dirname(__FILE__, 5) . '/resources/xml/saml_SubjectConfirmationData.xml',
         );
 
         $scd = SubjectConfirmationData::fromXML($document->documentElement);

diff --git a/tests/src/SAML11/XML/saml/SubjectConfirmationTest.php b/tests/src/SAML11/XML/saml/SubjectConfirmationTest.php
@@ -5,10 +5,7 @@
 namespace SimpleSAML\Test\SAML11\XML\saml;
 
 use PHPUnit\Framework\TestCase;
-use SimpleSAML\SAML11\Constants as C;
-use SimpleSAML\SAML11\XML\saml\Assertion;
 use SimpleSAML\SAML11\XML\saml\ConfirmationMethod;
-use SimpleSAML\SAML11\XML\saml\NameIdentifier;
 use SimpleSAML\SAML11\XML\saml\SubjectConfirmation;
 use SimpleSAML\SAML11\XML\saml\SubjectConfirmationData;
 use SimpleSAML\XML\Chunk;

diff --git a/tests/src/SAML11/XML/saml/SubjectLocalityTest.php b/tests/src/SAML11/XML/saml/SubjectLocalityTest.php
@@ -6,7 +6,6 @@
 
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\SAML11\XML\saml\SubjectLocality;
-use SimpleSAML\XML\Chunk;
 use SimpleSAML\XML\DOMDocumentFactory;
 use SimpleSAML\XML\TestUtils\SchemaValidationTestTrait;
 use SimpleSAML\XML\TestUtils\SerializableElementTestTrait;

diff --git a/tests/src/SAML11/XML/saml/SubjectTest.php b/tests/src/SAML11/XML/saml/SubjectTest.php
@@ -5,7 +5,6 @@
 namespace SimpleSAML\Test\SAML11\XML\saml;
 
 use PHPUnit\Framework\TestCase;
-use SimpleSAML\SAML11\Constants as C;
 use SimpleSAML\SAML11\XML\saml\ConfirmationMethod;
 use SimpleSAML\SAML11\XML\saml\NameIdentifier;
 use SimpleSAML\SAML11\XML\saml\Subject;