Merge pull request #120 from oat-sa/fix/issue-119

Fix/issue 119

CHANGELOG.md

@@ -1,6 +1,11 @@
 CHANGELOG
 =========
 
+6.0.1
+-----
+
+* Fixed issue [#119](https://github.com/oat-sa/lib-lti1p3-core/issues/119)
+
 6.0.0
 -----
 

psalm.xml.dist

@@ -61,6 +61,11 @@
                 <file name="src/Security/Jwt/Decoder/AssociativeDecoder.php"/>
             </errorLevel>
         </UndefinedConstant>
+        <RedundantCondition>
+            <errorLevel type="suppress">
+                <file name="src/Message/LtiMessage.php"/>
+            </errorLevel>
+        </RedundantCondition>
     </issueHandlers>
     <mockClasses>
         <class name="PHPUnit\Framework\MockObject\MockObject"/>

src/Message/LtiMessage.php

@@ -77,7 +77,11 @@ public static function fromServerRequest(ServerRequestInterface $request): LtiMe
 
     public function toUrl(): string
     {
-        return sprintf('%s?%s', $this->url, http_build_query(array_filter($this->getParameters()->all())));
+        $separator = false !== strpos($this->url, '?')
+            ? '&'
+            : '?';
+
+        return sprintf('%s%s%s', $this->url, $separator, http_build_query(array_filter($this->getParameters()->all())));
     }
 
     public function toHtmlLink(string $title, array $attributes = []): string

tests/Unit/Message/LtiMessageTest.php

@@ -120,6 +120,18 @@ public function testToUrl(): void
         $this->assertEquals('http://example.com?parameter=value', $this->subject->toUrl());
     }
 
+    public function testToUrlWithExistingQueryParameters(): void
+    {
+        $subject = new LtiMessage(
+            'http://example.com?existingParameter=existingValue',
+            [
+                'newParameter' => 'newValue',
+            ]
+        );
+
+        $this->assertEquals('http://example.com?existingParameter=existingValue&newParameter=newValue', $subject->toUrl());
+    }
+
     public function testToHtmlLink(): void
     {
         $this->assertEquals(