Merge pull request 1EdTech#59 from JanHolger/patch-2

Fix invalid request when specifying no custom params

Author: dbhynds

src/LtiDeepLinkResource.php

@@ -111,8 +111,10 @@ public function toArray()
             'presentation' => [
                 'documentTarget' => $this->target,
             ],
-            'custom' => $this->custom_params,
         ];
+        if (!empty($this->custom_params)) {
+            $resource['custom'] = $this->custom_params;
+        }
         if ($this->lineitem !== null) {
             $resource['lineItem'] = [
                 'scoreMaximum' => $this->lineitem->getScoreMaximum(),

tests/LtiDeepLinkResourceTest.php

@@ -147,17 +147,16 @@ public function testItCastsToArray()
             'presentation' => [
                 'documentTarget' => 'iframe',
             ],
-            'custom' => [],
             'lineItem' => [
                 'scoreMaximum' => 80,
                 'label' => 'lineitem_label',
             ],
         ];
         $lineitem = Mockery::mock(LtiLineitem::class);
         $lineitem->shouldReceive('getScoreMaximum')
-            ->once()->andReturn($expected['lineItem']['scoreMaximum']);
+            ->twice()->andReturn($expected['lineItem']['scoreMaximum']);
         $lineitem->shouldReceive('getLabel')
-            ->once()->andReturn($expected['lineItem']['label']);
+            ->twice()->andReturn($expected['lineItem']['label']);
 
         $this->deepLinkResource->setTitle($expected['title']);
         $this->deepLinkResource->setText($expected['text']);
@@ -167,5 +166,11 @@ public function testItCastsToArray()
         $result = $this->deepLinkResource->toArray();
 
         $this->assertEquals($expected, $result);
+
+        // Test again with custom params
+        $expected['custom'] = ['a_key' => 'a_value'];
+        $this->deepLinkResource->setCustomParams(['a_key' => 'a_value']);
+        $result = $this->deepLinkResource->toArray();
+        $this->assertEquals($expected, $result);
     }
 }