From 004dc5ce50f8b3e3eb084b2d12dd650d9327bc79 Mon Sep 17 00:00:00 2001
From: Ionut Padurariu <ionut@taotesting.com>
Date: Fri, 4 May 2018 13:43:38 +0200
Subject: [PATCH 1/2] remove unnecessary logic

---
 manifest.php                 | 2 +-
 models/TestTakerImporter.php | 1 +
 scripts/update/Updater.php   | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/manifest.php b/manifest.php
index af84bfa7..31c0456f 100755
--- a/manifest.php
+++ b/manifest.php
@@ -33,7 +33,7 @@
     'label' => 'Test-taker core extension',
 	'description' => 'TAO TestTaker extension',
     'license' => 'GPL-2.0',
-    'version' => '3.7.1',
+    'version' => '3.8.0',
 	'author' => 'Open Assessment Technologies, CRP Henri Tudor',
 	'requires' => array(
 	    'tao' => '>=17.14.0',
diff --git a/models/TestTakerImporter.php b/models/TestTakerImporter.php
index 4ce62730..a35d7aad 100644
--- a/models/TestTakerImporter.php
+++ b/models/TestTakerImporter.php
@@ -62,6 +62,7 @@ class TestTakerImporter extends RdsUserImportService
     public function import($filePath, $extraProperties = [], $options = [])
     {
         $extraProperties[UserRdf::PROPERTY_ROLES] = TaoRoles::DELIVERY;
+        $extraProperties['roles'] = TaoRoles::DELIVERY;
         return parent::import($filePath, $extraProperties, $options);
     }
 
diff --git a/scripts/update/Updater.php b/scripts/update/Updater.php
index 6e0eb102..1e360d11 100644
--- a/scripts/update/Updater.php
+++ b/scripts/update/Updater.php
@@ -83,6 +83,6 @@ public function update($initialVersion)
 
             $this->setVersion('3.7.0');
         }
-        $this->skip('3.7.0', '3.7.1');
+        $this->skip('3.7.0', '3.8.0');
     }
 }

From 31478686a6dc4834fd727afeda8e196513f8376f Mon Sep 17 00:00:00 2001
From: Ionut Padurariu <31656944+ionutpad@users.noreply.github.com>
Date: Wed, 16 May 2018 14:17:20 +0200
Subject: [PATCH 2/2] Update manifest.php

---
 manifest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifest.php b/manifest.php
index 31c0456f..b7d4ffa8 100755
--- a/manifest.php
+++ b/manifest.php
@@ -36,7 +36,7 @@
     'version' => '3.8.0',
 	'author' => 'Open Assessment Technologies, CRP Henri Tudor',
 	'requires' => array(
-	    'tao' => '>=17.14.0',
+	    'tao' => '>=19.0.0',
 	    'taoBackOffice' => '>=1.3.0'
     ),
 	'models' => array(