Fix ds:Transform

Author: tvdijen

src/XML/ds/Transform.php

@@ -16,21 +16,23 @@
  */
 final class Transform extends AbstractDsElement
 {
-    /** @var \SimpleSAML\XML\Chunk[] */
-    protected array $elements = [];
-
     /** @var string */
     protected string $Algorithm;
 
+    /** @var \SimpleSAML\XML\Chunk[] */
+    protected array $elements = [];
+
 
     /**
      * Initialize a ds:Transform
      *
-     * @param \SimpleSAML\XML\Chunk[] $elements
      * @param string $Algorithm
+     * @param \SimpleSAML\XML\Chunk[] $elements
      */
-    public function __construct(array $elements = [], string $Algorithm = 'http://www.w3.org/TR/1999/REC-xpath-19991116')
-    {
+    public function __construct(
+        string $Algorithm,
+        array $elements = []
+    ) {
         $this->setElements($elements);
         $this->setAlgorithm($Algorithm);
     }
@@ -117,7 +119,7 @@ public static function fromXML(DOMElement $xml): object
             $elements[] = new Chunk($element);
         }
 
-        return new self($elements, $Algorithm);
+        return new self($Algorithm, $elements);
     }
 
 

tests/XML/ds/TransformTest.php

@@ -43,6 +43,7 @@ public function setUp(): void
     public function testMarshalling(): void
     {
         $transform = new Transform(
+            'http://www.w3.org/TR/1999/REC-xpath-19991116',
             [
                 new Chunk(DOMDocumentFactory::fromString('<some:Chunk>Random</some:Chunk>')->documentElement),
                 new Chunk(DOMDocumentFactory::fromString('<ds:XPath>count(//. | //@* | //namespace::*)</ds:XPath>')->documentElement)
@@ -94,7 +95,7 @@ public function testUnmarshalling(): void
     public function testMarshallingEmptyElement(): void
     {
         $ds_ns = Transform::NS;
-        $transform = new Transform([]);
+        $transform = new Transform('http://www.w3.org/TR/1999/REC-xpath-19991116', []);
         $this->assertEquals(
             "<ds:Transform xmlns:ds=\"$ds_ns\" Algorithm=\"http://www.w3.org/TR/1999/REC-xpath-19991116\"/>",
             strval($transform)