XAPI: Return IRI directory - refs BT#16742

plugin/xapi/launch/launch.php

@@ -51,7 +51,7 @@ $actor = new Agent(
 $state = new State(
     $activity,
     $actor,
-    $plugin->generateIri('tool-'.$toolLaunch->getId(), 'state')
+    $plugin->generateIri('tool-'.$toolLaunch->getId(), 'state')->getValue()
 );
 
 $nowDate = api_get_utc_datetime(null, false, true)->format('c');

plugin/xapi/launch/tool.php

@@ -47,7 +47,7 @@ $actor = new Agent(
 $state = new State(
     $activity,
     $actor,
-    $plugin->generateIri('tool-'.$toolLaunch->getId(), 'state')
+    $plugin->generateIri('tool-'.$toolLaunch->getId(), 'state')->getValue()
 );
 
 $cidReq = api_get_cidreq();

plugin/xapi/src/Hook/XApiLearningPathEndHookObserver.php

@@ -81,13 +81,13 @@ class XApiLearningPathEndHookObserver extends XApiActivityHookObserver implement
 
         $nameMap = LanguageMap::create([$languageIso => $lpName]);
 
-        $activityIdIri = $this->plugin->generateIri(
+        $id = $this->plugin->generateIri(
             $this->lp->getId(),
             'lp'
         );
 
         return new Activity(
-            IRI::fromString($activityIdIri),
+            $id,
             new Definition(
                 $nameMap,
                 null,

plugin/xapi/src/Hook/XApiLearningPathItemViewedHookObserver.php

@@ -99,13 +99,13 @@ class XApiLearningPathItemViewedHookObserver
 
         $titleMap = LanguageMap::create([$languageIso => $itemTitle]);
 
-        $activityIdIri = $this->plugin->generateIri(
+        $id = $this->plugin->generateIri(
             $this->lpItem->getId(),
             'lp_item'
         );
 
         return new Activity(
-            IRI::fromString($activityIdIri),
+            $id,
             new Definition(
                 $titleMap,
                 null,
@@ -139,14 +139,12 @@ class XApiLearningPathItemViewedHookObserver
      */
     protected function getContext()
     {
-        $lpIri = $this->plugin->generateIri(
+        $id = $this->plugin->generateIri(
             $this->lpView->getLpId(),
             XApiPlugin::TYPE_LP
         );
 
-        $lpActivity = new Activity(
+        $lpActivity = new Activity($id);
-            IRI::fromString($lpIri)
-        );
 
         $activities = new ContextActivities(
             [$lpActivity]

plugin/xapi/src/Hook/XApiQuizEndHookObserver.php

@@ -90,13 +90,13 @@ class XApiQuizEndHookObserver extends XApiActivityHookObserver implements HookQu
         $titleMap = LanguageMap::create([$languageIso => $title]);
         $descriptionMap = $description ? LanguageMap::create([$languageIso => $description]) : null;
 
-        $activityIdIri = $this->plugin->generateIri(
+        $id = $this->plugin->generateIri(
             $this->quiz->getId(),
             'quiz'
         );
 
         return new Activity(
-            IRI::fromString($activityIdIri),
+            $id,
             new Definition(
                 $titleMap,
                 $descriptionMap,

plugin/xapi/src/Hook/XApiQuizQuestionAnsweredHookObserver.php

@@ -106,13 +106,13 @@ class XApiQuizQuestionAnsweredHookObserver
      */
     protected function getActivity()
     {
-        $activityIdIri = $this->plugin->generateIri(
+        $id = $this->plugin->generateIri(
             $this->question->getId(),
             'quiz_question'
         );
 
         return new Activity(
-            IRI::fromString($activityIdIri),
+            $id,
             $this->generateActivityDefinitionFromQuestionType()
         );
     }
@@ -271,10 +271,10 @@ class XApiQuizQuestionAnsweredHookObserver
     {
         $languageIso = api_get_language_isocode($this->course->getCourseLanguage());
 
-        $quizIri = $this->plugin->generateIri($this->quizInfo['id'], XApiPlugin::TYPE_QUIZ);
+        $id = $this->plugin->generateIri($this->quizInfo['id'], XApiPlugin::TYPE_QUIZ);
 
         $quizActivity = new Activity(
-            IRI::fromString($quizIri),
+            $id,
             new Definition(
                 LanguageMap::create([$languageIso => $this->quizInfo['title']]),
                 null,

plugin/xapi/src/XApiPlugin.php

@@ -329,11 +329,13 @@ class XApiPlugin extends Plugin implements HookPluginInterface
      * @param string $value
      * @param string $type
      *
-     * @return string
+     * @return \Xabbuh\XApi\Model\IRI
      */
     public function generateIri($value, $type)
     {
-        return api_get_path(WEB_PATH)."xapi/$type/$value";
+        return IRI::fromString(
+            api_get_path(WEB_PATH)."xapi/$type/$value"
+        );
     }
 
     /**