Merge branch 'release-45.2.2'

models/classes/class.QtiTestService.php

@@ -538,7 +538,6 @@ protected function importTest(core_kernel_classes_Class $targetClass, Resource $
         $reportCtx = new stdClass();
         $reportCtx->manifestResource = $qtiTestResource;
         $reportCtx->rdfsResource = $testResource;
-        $reportCtx->itemClass = $targetClass;
         $reportCtx->items = [];
         $reportCtx->newItems = [];
         $reportCtx->overwrittenItems = [];
@@ -549,8 +548,6 @@ protected function importTest(core_kernel_classes_Class $targetClass, Resource $
         // 'uriResource' key is needed by javascript in tao/views/templates/form/import.tpl
         $reportCtx->uriResource = $testResource->getUri();
 
-        $report->setData($reportCtx);
-
         // Expected test.xml file location.
         $expectedTestFile = $folder . str_replace('/', DIRECTORY_SEPARATOR, $qtiTestResource->getFile());
 
@@ -584,7 +581,7 @@ protected function importTest(core_kernel_classes_Class $targetClass, Resource $
                 }
 
                 $targetClass = $itemClass->createSubClass($testResource->getLabel());
-
+                $reportCtx->itemClass = $targetClass;
                 // -- Load all items related to test.
                 $itemError = false;
 
@@ -770,6 +767,8 @@ protected function importTest(core_kernel_classes_Class $targetClass, Resource $
             }
         }
 
+        $report->setData($reportCtx);
+
         if ($report->containsError() === false) {
             $report->setType(common_report_Report::TYPE_SUCCESS);
             $msg = __("IMS QTI Test referenced as \"%s\" in the IMS Manifest file successfully imported.", $qtiTestResource->getIdentifier());