Merge branch 'release-48.17.0'

models/classes/Qti/Converter/TestConverter.php

@@ -0,0 +1,35 @@
+<?php
+
+/**
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; under version 2
+ * of the License (non-upgradable).
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *
+ * Copyright (c) 2024 (original work) Open Assessment Technologies SA;
+ */
+
+declare(strict_types=1);
+
+namespace oat\taoQtiTest\models\Qti\Converter;
+
+use oat\taoQtiItem\model\qti\converter\AbstractQtiConverter;
+
+class TestConverter extends AbstractQtiConverter
+{
+    private const ROOT_ELEMENT = 'qti-assessment-test';
+
+    protected function getRootElement(): string
+    {
+        return self::ROOT_ELEMENT;
+    }
+}

models/classes/Qti/ServiceProvider/QtiServiceProvider.php

@@ -24,10 +24,11 @@
 
 use oat\generis\model\DependencyInjection\ContainerServiceProviderInterface;
 use oat\oatbox\log\LoggerService;
+use oat\taoQtiItem\model\qti\converter\CaseConversionService;
+use oat\taoQtiTest\models\Qti\Converter\TestConverter;
 use oat\taoQtiTest\models\Qti\Identifier\Service\QtiIdentifierSetter;
 use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
 use taoQtiTest_models_classes_QtiTestService;
-
 use function Symfony\Component\DependencyInjection\Loader\Configurator\service;
 
 class QtiServiceProvider implements ContainerServiceProviderInterface
@@ -42,5 +43,12 @@ public function __invoke(ContainerConfigurator $configurator): void
                 service(taoQtiTest_models_classes_QtiTestService::class),
                 service(LoggerService::SERVICE_ID),
             ]);
+
+        $services
+            ->set(TestConverter::class)
+            ->args([
+                service(CaseConversionService::class),
+            ])
+            ->public();
     }
 }

models/classes/class.QtiTestService.php

@@ -1,5 +1,4 @@
 <?php
-
 /**
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -22,27 +21,31 @@
 use oat\oatbox\filesystem\Directory;
 use oat\oatbox\filesystem\File;
 use oat\oatbox\filesystem\FileSystemService;
+use oat\oatbox\reporting\Report;
 use oat\tao\model\IdentifierGenerator\Generator\IdentifierGeneratorInterface;
 use oat\tao\model\IdentifierGenerator\Generator\IdentifierGeneratorProxy;
 use oat\tao\model\resources\ResourceAccessDeniedException;
 use oat\tao\model\resources\SecureResourceServiceInterface;
 use oat\tao\model\TaoOntology;
 use oat\taoItems\model\Command\DeleteItemCommand;
+use oat\taoQtiItem\model\qti\converter\ManifestConverter;
 use oat\taoQtiItem\model\qti\ImportService;
 use oat\taoQtiItem\model\qti\metadata\importer\MetadataImporter;
-use oat\taoQtiItem\model\qti\metadata\imsManifest\MetaMetadataExtractor;
 use oat\taoQtiItem\model\qti\metadata\importer\MetaMetadataImportMapper;
 use oat\taoQtiItem\model\qti\metadata\importer\PropertyDoesNotExistException;
+use oat\taoQtiItem\model\qti\metadata\imsManifest\MetaMetadataExtractor;
 use oat\taoQtiItem\model\qti\metadata\MetadataGuardianResource;
 use oat\taoQtiItem\model\qti\metadata\MetadataService;
 use oat\taoQtiItem\model\qti\metadata\ontology\MappedMetadataInjector;
+use oat\taoQtiItem\model\qti\PackageParser;
 use oat\taoQtiItem\model\qti\Resource;
 use oat\taoQtiItem\model\qti\Service;
 use oat\taoQtiTest\models\cat\AdaptiveSectionInjectionException;
 use oat\taoQtiTest\models\cat\CatEngineNotFoundException;
 use oat\taoQtiTest\models\cat\CatService;
 use oat\taoQtiTest\models\classes\event\TestImportedEvent;
 use oat\taoQtiTest\models\metadata\MetadataTestContextAware;
+use oat\taoQtiTest\models\Qti\Converter\TestConverter;
 use oat\taoQtiTest\models\render\QtiPackageImportPreprocessing;
 use oat\taoQtiTest\models\test\AssessmentTestXmlFactory;
 use oat\taoTests\models\event\TestUpdatedEvent;
@@ -55,9 +58,8 @@
 use qtism\data\storage\xml\marshalling\UnmarshallingException;
 use qtism\data\storage\xml\XmlDocument;
 use qtism\data\storage\xml\XmlStorageException;
-use taoTests_models_classes_TestsService as TestService;
-use oat\oatbox\reporting\Report;
 use taoQtiTest_models_classes_import_TestImportForm as TestImportForm;
+use taoTests_models_classes_TestsService as TestService;
 
 /**
  * the QTI TestModel service.
@@ -201,7 +203,7 @@ protected function setDefaultModel($test): void
      * Save the json formated test into the test resource.
      *
      * @param core_kernel_classes_Resource $test
-     * @param string                       $json
+     * @param string $json
      *
      * @return bool true if saved
      *
@@ -212,7 +214,7 @@ public function saveJsonTest(core_kernel_classes_Resource $test, $json): bool
     {
         $saved = false;
 
-        if (! empty($json)) {
+        if (!empty($json)) {
             $this->verifyItemPermissions($test, $json);
 
             $doc = $this->getDoc($test);
@@ -266,7 +268,7 @@ public function setItems(core_kernel_classes_Resource $test, array $items)
         return false;
     }
 
-      /**
+    /**
      * Save the QTI test : set the items sequence and some options.
      *
      * @param core_kernel_classes_Resource $test A Resource describing a QTI Assessment Test.
@@ -280,7 +282,7 @@ public function save(core_kernel_classes_Resource $test, array $items)
         try {
             $doc = $this->getDoc($test);
             $this->setItemsToDoc($doc, $items);
-            $saved  = $this->saveDoc($test, $doc);
+            $saved = $this->saveDoc($test, $doc);
         } catch (StorageException $e) {
             throw new taoQtiTest_models_classes_QtiTestServiceException(
                 "An error occured while dealing with the QTI-XML test: " . $e->getMessage(),
@@ -306,7 +308,7 @@ public function getIdentifierFor(XmlDocument $doc, $qtiType)
         do {
             $identifier = $this->generateIdentifier($doc, $qtiType, $index);
             $index++;
-        } while (! $this->isIdentifierUnique($components, $identifier));
+        } while (!$this->isIdentifierUnique($components, $identifier));
 
         return $identifier;
     }
@@ -363,7 +365,7 @@ public function importMultipleTests(
         ?string $packageLabel = null
     ) {
         $testClass = $targetClass;
-        $report = new common_report_Report(common_report_Report::TYPE_INFO);
+        $report = new Report(Report::TYPE_INFO);
         $validPackage = false;
         $validManifest = false;
         $testsFound = false;
@@ -381,24 +383,25 @@ public function importMultipleTests(
         // phpcs:enable Generic.Files.LineLength
 
         try {
-            $qtiPackageParser = new taoQtiTest_models_classes_PackageParser($file);
+            $qtiPackageParser = new PackageParser($file);
             $qtiPackageParser->validate();
             $validPackage = true;
         } catch (Exception $e) {
-            $report->add(common_report_Report::createFailure($invalidArchiveMsg));
+            $report->add(Report::createError($invalidArchiveMsg));
         }
 
         // Validate the manifest (well formed XML, valid against the schema).
         if ($validPackage === true) {
             $folder = $qtiPackageParser->extract();
-
             if (is_dir($folder) === false) {
-                $report->add(common_report_Report::createFailure($invalidArchiveMsg));
+                $report->add(Report::createError($invalidArchiveMsg));
             } else {
-                $qtiManifestParser = new taoQtiTest_models_classes_ManifestParser($folder . 'imsmanifest.xml');
+                $file = $folder . 'imsmanifest.xml';
+                $qtiManifestParser = new taoQtiTest_models_classes_ManifestParser($file);
                 $this->propagate($qtiManifestParser);
+                $this->getManifestConverter()->convert($file, $qtiManifestParser);
+                // We validate manifest file against QTI 3.0
                 $qtiManifestParser->validate();
-
                 if ($qtiManifestParser->isValid() === true) {
                     $validManifest = true;
 
@@ -411,10 +414,10 @@ public function importMultipleTests(
 
                     if ($testsFound !== true) {
                         $report->add(
-                            common_report_Report::createFailure(
-                                // phpcs:disable Generic.Files.LineLength
+                            Report::createError(
+                            // phpcs:disable Generic.Files.LineLength
                                 __("Package is valid but no tests were found. Make sure that it contains valid QTI tests.")
-                                // phpcs:enable Generic.Files.LineLength
+                            // phpcs:enable Generic.Files.LineLength
                             )
                         );
                     } else {
@@ -577,12 +580,11 @@ protected function importTest(
 
         // Create the report that will hold information about the import
         // of $qtiTestResource in TAO.
-        $report = new common_report_Report(common_report_Report::TYPE_INFO);
+        $report = new Report(Report::TYPE_INFO);
 
         // Load and validate the manifest
         $qtiManifestParser = new taoQtiTest_models_classes_ManifestParser($folder . 'imsmanifest.xml');
         $this->propagate($qtiManifestParser);
-        $qtiManifestParser->validate();
 
         $domManifest = new DOMDocument('1.0', 'UTF-8');
         $domManifest->load($folder . 'imsmanifest.xml');
@@ -620,6 +622,8 @@ protected function importTest(
                 )
             );
         } else {
+            //Convert to QTI 2.2
+            $this->getTestConverter()->convert($expectedTestFile);
             // -- Load the test in a QTISM flavour.
             $testDefinition = new XmlDocument();
 
@@ -1079,7 +1083,6 @@ public function getTestFile(core_kernel_classes_Resource $test)
      */
     public function getDoc(core_kernel_classes_Resource $test)
     {
-
         $doc = new XmlDocument('2.1');
         $doc->loadFromString($this->getQtiTestFile($test)->read());
         return $doc;
@@ -1433,7 +1436,7 @@ public function getQtiTestTemplateFileAsString()
      */
     protected function getMetadataImporter()
     {
-        if (! $this->metadataImporter) {
+        if (!$this->metadataImporter) {
             $this->metadataImporter = $this->getServiceLocator()->get(MetadataService::SERVICE_ID)->getImporter();
         }
         return $this->metadataImporter;
@@ -1601,4 +1604,14 @@ private function getTestLabel(array $testMetadata, XmlDocument $testDefinition):
 
         return reset($labelMetadata)->getValue();
     }
+
+    private function getManifestConverter(): ManifestConverter
+    {
+        return $this->getPsrContainer()->get(ManifestConverter::class);
+    }
+
+    private function getTestConverter(): TestConverter
+    {
+        return $this->getPsrContainer()->get(TestConverter::class);
+    }
 }

models/classes/render/QTI3PackagePreprocessing.php

@@ -0,0 +1,51 @@
+<?php
+
+/**
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; under version 2
+ * of the License (non-upgradable).
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *
+ * Copyright (c) 2024 (original work) Open Assessment Technologies SA;
+ */
+
+declare(strict_types=1);
+
+namespace oat\taoQtiTest\models\classes\render;
+
+use oat\oatbox\reporting\Report;
+use oat\oatbox\service\ConfigurableService;
+use oat\taoQtiTest\models\render\QtiPackageImportPreprocessing;
+use ZipArchive;
+
+class QTI3PackagePreprocessing extends ConfigurableService implements QtiPackageImportPreprocessing
+{
+    public function run($file): Report
+    {
+        $content = $file->read();
+        $this->getZip()->open();
+        $content = str_replace(
+            'http://www.imsglobal.org/xsd/imsqtiasi_v3p0',
+            'http://www.imsglobal.org/xsd/imscp_v1p1',
+            $content
+        );
+
+        $file->write($content);
+
+        return new Report(Report::TYPE_INFO, 'QTI3 package preprocessing done');
+    }
+
+    private function getZip(): ZipArchive
+    {
+        return new ZipArchive();
+    }
+}