fix output of namespaces when using xsl:copy-of in a xsl:for-each-gro…

…up statement
genkgo · Aug 11, 2023 · 0128747 · 0128747
1 parent da05b91
commit 0128747
Show file tree

Hide file tree

Showing 11 changed files with 48 additions and 17 deletions.
diff --git a/src/Callback/FunctionCollection.php b/src/Callback/FunctionCollection.php
@@ -8,7 +8,7 @@ final class FunctionCollection
     /**
      * @var array
      */
-    private $collection = [];
+    public $collection = [];
 
     /**
      * @param string $namespace

diff --git a/src/Xpath/Compiler.php b/src/Xpath/Compiler.php
@@ -57,13 +57,13 @@ public function compile(string $xpathExpression, DOMNode $currentElement): strin
      * @param DOMNode $currentElement
      * @return string
      */
-    public function compileTokens(Lexer $tokens, DOMNode $currentElement): string
+    public function compileTokens(Lexer $tokens, DOMNode $currentElement, array $namespaces = []): string
     {
         $resultTokens = [];
         foreach ($tokens as $token) {
             foreach ($this->expressions as $expression) {
                 if ($expression->supports($tokens)) {
-                    $resultTokens = $expression->merge($tokens, $currentElement, $resultTokens);
+                    $resultTokens = $expression->merge($tokens, $currentElement, $resultTokens, $namespaces);
                     continue 2;
                 }
             }

diff --git a/src/Xpath/Expression/DoubleQuoteExpression.php b/src/Xpath/Expression/DoubleQuoteExpression.php
@@ -31,7 +31,7 @@ public function supports(Lexer $lexer): bool
      * @param array $tokens
      * @return array
      */
-    public function merge(Lexer $lexer, DOMNode $currentElement, array $tokens): array
+    public function merge(Lexer $lexer, DOMNode $currentElement, array $tokens, array $namespaces = []): array
     {
         $expression = $lexer->current();
 

diff --git a/src/Xpath/Expression/ForLoopExpression.php b/src/Xpath/Expression/ForLoopExpression.php
@@ -35,7 +35,7 @@ public function supports(Lexer $lexer): bool
      * @param array $tokens
      * @return array
      */
-    public function merge(Lexer $lexer, DOMNode $currentElement, array $tokens): array
+    public function merge(Lexer $lexer, DOMNode $currentElement, array $tokens, array $namespaces = []): array
     {
         \array_splice(
             $tokens,

diff --git a/src/Xpath/Expression/FunctionExpression.php b/src/Xpath/Expression/FunctionExpression.php
@@ -41,26 +41,26 @@ public function supports(Lexer $lexer): bool
      * @param array $tokens
      * @return array
      */
-    public function merge(Lexer $lexer, DOMNode $currentElement, array $tokens): array
+    public function merge(Lexer $lexer, DOMNode $currentElement, array $tokens, array $namespaces = []): array
     {
-        return \array_merge($tokens, $this->createFunctionTokens($lexer, $currentElement));
+        return \array_merge($tokens, $this->createFunctionTokens($lexer, $currentElement, $namespaces));
     }
 
     /**
      * @param Lexer $lexer
      * @param DOMNode $currentElement
      * @return string[]
      */
-    private function createFunctionTokens(Lexer $lexer, DOMNode $currentElement)
+    private function createFunctionTokens(Lexer $lexer, DOMNode $currentElement, array $namespaces = [])
     {
         if ($currentElement->ownerDocument instanceof DOMDocument === false) {
             throw new \UnexpectedValueException('Expecting currentElement attached to document');
         }
 
         $token = $lexer->current();
         $documentElement = $currentElement->ownerDocument->documentElement;
-        $namespaces = FetchNamespacesFromNode::fetch($documentElement);
-        $functionQname = $this->convertTokenToFunctionName($token, $namespaces);
+        $documentNamespaces = \array_merge(FetchNamespacesFromNode::fetch($documentElement), $namespaces);
+        $functionQname = $this->convertTokenToFunctionName($token, $documentNamespaces);
 
         try {
             $dot = \strrpos($functionQname, ':');

diff --git a/src/Xpath/Expression/SequenceExpression.php b/src/Xpath/Expression/SequenceExpression.php
@@ -78,7 +78,7 @@ public function supports(Lexer $lexer): bool
      * @param array $tokens
      * @return array
      */
-    public function merge(Lexer $lexer, DOMNode $currentElement, array $tokens): array
+    public function merge(Lexer $lexer, DOMNode $currentElement, array $tokens, array $namespaces = []): array
     {
         return \array_merge($tokens, $this->sequenceConstructor->serialize($lexer, $currentElement));
     }

diff --git a/src/Xpath/ExpressionInterface.php b/src/Xpath/ExpressionInterface.php
@@ -19,5 +19,5 @@ public function supports(Lexer $lexer): bool;
      * @param array $tokens
      * @return array
      */
-    public function merge(Lexer $lexer, DOMNode $currentElement, array $tokens): array;
+    public function merge(Lexer $lexer, DOMNode $currentElement, array $tokens, array $namespaces = []): array;
 }
diff --git a/src/Xsl/Functions/GroupBy.php b/src/Xsl/Functions/GroupBy.php
@@ -25,12 +25,8 @@ public static function distinct(Arguments $arguments, TransformationContext $con
         /** @var DOMElement $current */
         $current = $arguments->get(3)[0];
 
-        foreach ($namespaces as $prefix => $namespace) {
-            $current->ownerDocument->documentElement->setAttributeNS('http://www.w3.org/2000/xmlns/', 'xmlns:' . $prefix, $namespace);
-        }
-
         $compiler = new Compiler($context->getFunctions());
-        $xpathExpression = $compiler->compileTokens(Lexer::tokenize('string(' . $groupBy . ')'), $current);
+        $xpathExpression = $compiler->compileTokens(Lexer::tokenize('string(' . $groupBy . ')'), $current, $namespaces);
 
         $values = [];
         foreach ($list as $key => $element) {

diff --git a/test/Integration/Xsl/ForEachGroupTest.php b/test/Integration/Xsl/ForEachGroupTest.php
@@ -206,6 +206,20 @@ public function testWithNamespaceFunctions(): void
         $this->assertEquals('201120152014', \trim($processor->transformToXml($data)));
     }
 
+    public function testWithNamespaceFunctionsCopyOf(): void
+    {
+        $styleSheet = new DOMDocument();
+        $styleSheet->load('Stubs/Xsl/ForEachGroup/group-by-namespace-functions-copy-of.xsl');
+
+        $processor = new XsltProcessor(new NullCache());
+        $processor->importStyleSheet($styleSheet);
+
+        $data = new DOMDocument();
+        $data->load('Stubs/packages.xml');
+
+        $this->assertEquals('<div><p>test</p></div><div><p>test</p></div><div><p>test</p></div><div><p>test</p></div>', \trim($processor->transformToXml($data)));
+    }
+
     public function testByAttributeValueTemplates(): void
     {
         $styleSheet = new DOMDocument();

diff --git a/test/Stubs/Xsl/ForEachGroup/group-by-namespace-functions-copy-of.xsl b/test/Stubs/Xsl/ForEachGroup/group-by-namespace-functions-copy-of.xsl
@@ -0,0 +1,17 @@
+<xsl:stylesheet version="2.0"
+                xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+    <xsl:output omit-xml-declaration="yes" />
+
+    <xsl:template match="packages">
+
+        <xsl:for-each-group select="package" group-by="year-from-dateTime(xs:dateTime(year/@value))">
+            <xsl:for-each select="current-group()">
+                <div><xsl:copy-of select="content/node()" /></div>
+            </xsl:for-each>
+        </xsl:for-each-group>
+
+    </xsl:template>
+
+</xsl:stylesheet>
diff --git a/test/Stubs/packages.xml b/test/Stubs/packages.xml
@@ -7,6 +7,7 @@
         <dependency name="a" author="Author1"/>
         <dependency name="b" author="Author1"/>
         <dependency name="c" author="Author2"/>
+        <content><p>test</p></content>
     </package>
     <package>
         <author>Genkgo</author>
@@ -16,6 +17,7 @@
         <dependency name="x" author="Author3"/>
         <dependency name="y" author="Author4"/>
         <dependency name="z" author="Author4"/>
+        <content><p>test</p></content>
     </package>
     <package>
         <author>Genkgo</author>
@@ -25,6 +27,7 @@
         <dependency name="h" author="Author5"/>
         <dependency name="i" author="Author1"/>
         <dependency name="j" author="Author2"/>
+        <content><p>test</p></content>
     </package>
     <package>
         <author>Genkgo</author>
@@ -34,5 +37,6 @@
         <dependency name="g" author="Author3"/>
         <dependency name="h" author="Author4"/>
         <dependency name="i" author="Author1"/>
+        <content><p>test</p></content>
     </package>
 </packages>