Fix namespace

simplesamlphp · Oct 17, 2024 · 8fa701f · 8fa701f
1 parent f041bb5
commit 8fa701f
Show file tree

Hide file tree

Showing 21 changed files with 29 additions and 22 deletions.
diff --git a/resources/schemas/soap-envelope-1.2.xsd b/resources/schemas/soap-envelope-1.2.xsd
@@ -16,8 +16,8 @@
 -->
 
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
-           xmlns:tns="http://www.w3.org/2003/05/soap-envelope/"
-           targetNamespace="http://www.w3.org/2003/05/soap-envelope/" 
+           xmlns:tns="http://www.w3.org/2003/05/soap-envelope"
+           targetNamespace="http://www.w3.org/2003/05/soap-envelope" 
 		   elementFormDefault="qualified" >
 
   <xs:import namespace="http://www.w3.org/XML/1998/namespace" 
@@ -156,3 +156,10 @@
 
 
 </xs:schema>
+
+
+
+
+
+
+
diff --git a/src/Constants.php b/src/Constants.php
@@ -20,7 +20,7 @@ class Constants extends \SimpleSAML\XML\Constants
     /**
      * The namespace for the SOAP envelope 1.2.
      */
-    public const NS_SOAP_ENV_12 = 'http://www.w3.org/2003/05/soap-envelope/';
+    public const NS_SOAP_ENV_12 = 'http://www.w3.org/2003/05/soap-envelope';
 
     /**
      * The namespace for SOAP encoding 1.1.

diff --git a/src/XML/element.registry.php b/src/XML/element.registry.php
@@ -9,7 +9,7 @@
         'Fault' => '\SimpleSAML\SOAP\XML\env_200106\Fault',
         'Header' => '\SimpleSAML\SOAP\XML\env_200106\Header',
     ],
-    'http://www.w3.org/2003/05/soap-envelope/' => [
+    'http://www.w3.org/2003/05/soap-envelope' => [
         'Body' => '\SimpleSAML\SOAP\XML\env_200305\Body',
         'Envelope' => '\SimpleSAML\SOAP\XML\env_200305\Envelope',
         'Fault' => '\SimpleSAML\SOAP\XML\env_200305\Fault',

diff --git a/tests/XML/env_200305/BodyTest.php b/tests/XML/env_200305/BodyTest.php
@@ -80,7 +80,7 @@ public function testMarshallingWithNoContent(): void
     {
         $body = new Body(null, [], []);
         $this->assertEquals(
-            '<env:Body xmlns:env="http://www.w3.org/2003/05/soap-envelope/"/>',
+            '<env:Body xmlns:env="http://www.w3.org/2003/05/soap-envelope"/>',
             strval($body),
         );
         $this->assertTrue($body->isEmptyElement());

diff --git a/tests/XML/env_200305/DetailTest.php b/tests/XML/env_200305/DetailTest.php
@@ -70,7 +70,7 @@ public function testMarshallingWithNoContent(): void
     {
         $detail = new Detail([], []);
         $this->assertEquals(
-            '<env:Detail xmlns:env="http://www.w3.org/2003/05/soap-envelope/"/>',
+            '<env:Detail xmlns:env="http://www.w3.org/2003/05/soap-envelope"/>',
             strval($detail),
         );
         $this->assertTrue($detail->isEmptyElement());

diff --git a/tests/XML/env_200305/HeaderTest.php b/tests/XML/env_200305/HeaderTest.php
@@ -74,7 +74,7 @@ public function testMarshallingWithNoContent(): void
     {
         $header = new Header([], []);
         $this->assertEquals(
-            '<env:Header xmlns:env="http://www.w3.org/2003/05/soap-envelope/"/>',
+            '<env:Header xmlns:env="http://www.w3.org/2003/05/soap-envelope"/>',
             strval($header),
         );
         $this->assertTrue($header->isEmptyElement());

diff --git a/tests/resources/xml/env/200305/Body.xml b/tests/resources/xml/env/200305/Body.xml
@@ -1,4 +1,4 @@
-<env:Body xmlns:env="http://www.w3.org/2003/05/soap-envelope/" xmlns:test="urn:test:something" test:attr1="testval1">
+<env:Body xmlns:env="http://www.w3.org/2003/05/soap-envelope" xmlns:test="urn:test:something" test:attr1="testval1">
   <m:GetPrice xmlns:m="https://www.w3schools.com/prices">
     <m:Item>Apples</m:Item>
   </m:GetPrice>

diff --git a/tests/resources/xml/env/200305/Code.xml b/tests/resources/xml/env/200305/Code.xml
@@ -1,4 +1,4 @@
-<env:Code xmlns:env="http://www.w3.org/2003/05/soap-envelope/">
+<env:Code xmlns:env="http://www.w3.org/2003/05/soap-envelope">
   <env:Value>env:Sender</env:Value>
   <env:Subcode>
     <env:Value xmlns:m="http://www.example.org/timeouts">m:SomethingNotFromSpec</env:Value>

diff --git a/tests/resources/xml/env/200305/Detail.xml b/tests/resources/xml/env/200305/Detail.xml
@@ -1,4 +1,4 @@
-<env:Detail xmlns:env="http://www.w3.org/2003/05/soap-envelope/" xmlns:test="urn:test:something" test:attr1="testval1">
+<env:Detail xmlns:env="http://www.w3.org/2003/05/soap-envelope" xmlns:test="urn:test:something" test:attr1="testval1">
   <m:GetPrice xmlns:m="https://www.w3schools.com/prices">
     <m:Item>Apples</m:Item>
   </m:GetPrice>

diff --git a/tests/resources/xml/env/200305/Envelope.xml b/tests/resources/xml/env/200305/Envelope.xml
@@ -1,4 +1,4 @@
-<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope/" xmlns:test="urn:test:something" test:attr1="testval1">
+<env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope" xmlns:test="urn:test:something" test:attr1="testval1">
   <env:Header test:attr1="testval1">
     <m:GetPrice xmlns:m="https://www.w3schools.com/prices">
       <m:Item>Apples</m:Item>

diff --git a/tests/resources/xml/env/200305/Fault.xml b/tests/resources/xml/env/200305/Fault.xml
@@ -1,4 +1,4 @@
-<env:Fault xmlns:env="http://www.w3.org/2003/05/soap-envelope/" xmlns:xml="http://www.w3.org/XML/1998/namespace">
+<env:Fault xmlns:env="http://www.w3.org/2003/05/soap-envelope" xmlns:xml="http://www.w3.org/XML/1998/namespace">
   <env:Code>
     <env:Value>env:Sender</env:Value>
     <env:Subcode>

diff --git a/tests/resources/xml/env/200305/Header.xml b/tests/resources/xml/env/200305/Header.xml
@@ -1,4 +1,4 @@
-<env:Header xmlns:env="http://www.w3.org/2003/05/soap-envelope/" xmlns:test="urn:test:something" test:attr1="testval1">
+<env:Header xmlns:env="http://www.w3.org/2003/05/soap-envelope" xmlns:test="urn:test:something" test:attr1="testval1">
   <m:GetPrice xmlns:m="https://www.w3schools.com/prices">
     <m:Item>Apples</m:Item>
   </m:GetPrice>

diff --git a/tests/resources/xml/env/200305/Node.xml b/tests/resources/xml/env/200305/Node.xml
@@ -1 +1 @@
-<env:Node xmlns:env="http://www.w3.org/2003/05/soap-envelope/">urn:x-simplesamlphp:namespace</env:Node>
+<env:Node xmlns:env="http://www.w3.org/2003/05/soap-envelope">urn:x-simplesamlphp:namespace</env:Node>
diff --git a/tests/resources/xml/env/200305/NotUnderstood.xml b/tests/resources/xml/env/200305/NotUnderstood.xml
@@ -1 +1 @@
-<env:NotUnderstood xmlns:env="http://www.w3.org/2003/05/soap-envelope/" xmlns:ssp="urn:x-simplesamlphp:namespace" qname="ssp:Chunk"></env:NotUnderstood>
+<env:NotUnderstood xmlns:env="http://www.w3.org/2003/05/soap-envelope" xmlns:ssp="urn:x-simplesamlphp:namespace" qname="ssp:Chunk"></env:NotUnderstood>
diff --git a/tests/resources/xml/env/200305/Reason.xml b/tests/resources/xml/env/200305/Reason.xml
@@ -1,4 +1,4 @@
-<env:Reason xmlns:env="http://www.w3.org/2003/05/soap-envelope/">
+<env:Reason xmlns:env="http://www.w3.org/2003/05/soap-envelope">
   <env:Text xml:lang="en">It's broken</env:Text>
   <env:Text xml:lang="nl">Het is stuk</env:Text>
 </env:Reason>
diff --git a/tests/resources/xml/env/200305/Role.xml b/tests/resources/xml/env/200305/Role.xml
@@ -1 +1 @@
-<env:Role xmlns:env="http://www.w3.org/2003/05/soap-envelope/">urn:x-simplesamlphp:namespace</env:Role>
+<env:Role xmlns:env="http://www.w3.org/2003/05/soap-envelope">urn:x-simplesamlphp:namespace</env:Role>
diff --git a/tests/resources/xml/env/200305/Subcode.xml b/tests/resources/xml/env/200305/Subcode.xml
@@ -1,4 +1,4 @@
-<env:Subcode xmlns:env="http://www.w3.org/2003/05/soap-envelope/">
+<env:Subcode xmlns:env="http://www.w3.org/2003/05/soap-envelope">
   <env:Value>m:SomethingNotFromSpec</env:Value>
   <env:Subcode>
     <env:Value>m:MessageTimeout</env:Value>

diff --git a/tests/resources/xml/env/200305/SupportedEnvelope.xml b/tests/resources/xml/env/200305/SupportedEnvelope.xml
@@ -1 +1 @@
-<env:SupportedEnvelope xmlns:env="http://www.w3.org/2003/05/soap-envelope/" qname="ssp:Chunk" />
+<env:SupportedEnvelope xmlns:env="http://www.w3.org/2003/05/soap-envelope" qname="ssp:Chunk" />
diff --git a/tests/resources/xml/env/200305/Text.xml b/tests/resources/xml/env/200305/Text.xml
@@ -1 +1 @@
-<env:Text xmlns:env="http://www.w3.org/2003/05/soap-envelope/" xml:lang="en">It's broken</env:Text>
+<env:Text xmlns:env="http://www.w3.org/2003/05/soap-envelope" xml:lang="en">It's broken</env:Text>
diff --git a/tests/resources/xml/env/200305/Upgrade.xml b/tests/resources/xml/env/200305/Upgrade.xml
@@ -1,3 +1,3 @@
-<env:Upgrade xmlns:env="http://www.w3.org/2003/05/soap-envelope/">
+<env:Upgrade xmlns:env="http://www.w3.org/2003/05/soap-envelope">
   <env:SupportedEnvelope qname="env:SupportedEnvelope" />
 </env:Upgrade>
diff --git a/tests/resources/xml/env/200305/Value.xml b/tests/resources/xml/env/200305/Value.xml
@@ -1 +1 @@
-<env:Value xmlns:env="http://www.w3.org/2003/05/soap-envelope/">env:Sender</env:Value>
+<env:Value xmlns:env="http://www.w3.org/2003/05/soap-envelope">env:Sender</env:Value>
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		<env:Node xmlns:env="http://www.w3.org/2003/05/soap-envelope/">urn:x-simplesamlphp:namespace</env:Node>
		<env:Node xmlns:env="http://www.w3.org/2003/05/soap-envelope">urn:x-simplesamlphp:namespace</env:Node>
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		<env:NotUnderstood xmlns:env="http://www.w3.org/2003/05/soap-envelope/" xmlns:ssp="urn:x-simplesamlphp:namespace" qname="ssp:Chunk"></env:NotUnderstood>
		<env:NotUnderstood xmlns:env="http://www.w3.org/2003/05/soap-envelope" xmlns:ssp="urn:x-simplesamlphp:namespace" qname="ssp:Chunk"></env:NotUnderstood>
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		<env:Role xmlns:env="http://www.w3.org/2003/05/soap-envelope/">urn:x-simplesamlphp:namespace</env:Role>
		<env:Role xmlns:env="http://www.w3.org/2003/05/soap-envelope">urn:x-simplesamlphp:namespace</env:Role>
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		<env:SupportedEnvelope xmlns:env="http://www.w3.org/2003/05/soap-envelope/" qname="ssp:Chunk" />
		<env:SupportedEnvelope xmlns:env="http://www.w3.org/2003/05/soap-envelope" qname="ssp:Chunk" />
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		<env:Text xmlns:env="http://www.w3.org/2003/05/soap-envelope/" xml:lang="en">It's broken</env:Text>
		<env:Text xmlns:env="http://www.w3.org/2003/05/soap-envelope" xml:lang="en">It's broken</env:Text>
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		<env:Value xmlns:env="http://www.w3.org/2003/05/soap-envelope/">env:Sender</env:Value>
		<env:Value xmlns:env="http://www.w3.org/2003/05/soap-envelope">env:Sender</env:Value>