TAO-8697 - Replace Calls of singleton method by ServiceManager calls

config/default/Groups.conf.php

@@ -0,0 +1,6 @@
+<?php
+/**
+ * Default config header created during install
+ */
+
+return new oat\taoGroups\models\GroupsService();

manifest.php

@@ -33,7 +33,7 @@
     'label' => 'Groups core extension',
     'description' => 'TAO Groups extension',
     'license' => 'GPL-2.0',
-    'version' => '6.1.1',
+    'version' => '6.1.2',
     'author' => 'Open Assessment Technologies, CRP Henri Tudor',
     'requires' => array(
         'taoTestTaker' => '>=4.0.0',

models/GroupsService.php

@@ -39,6 +39,8 @@
  */
 class GroupsService extends OntologyClassService
 {
+    const SERVICE_ID = 'taoGroups/Groups';
+
     const CLASS_URI = 'http://www.tao.lu/Ontologies/TAOGroup.rdf#Group';
 
     const PROPERTY_MEMBERS_URI = 'http://www.tao.lu/Ontologies/TAOGroup.rdf#member';

models/update/Updater.php

@@ -28,6 +28,7 @@
 use oat\tao\model\accessControl\func\AccessRule;
 use oat\tao\model\user\TaoRoles;
 use oat\taoGroups\controller\Api;
+
 /**
  * Service methods to manage the Groups business models using the RDF API.
  *
@@ -78,5 +79,11 @@ public function update($initialVersion)
         }
 
         $this->skip('3.0.1','6.1.1');
+
+        if ($this->isVersion('6.1.1')) {
+            $groupsService = new GroupsService();
+            $this->getServiceManager()->register(GroupsService::SERVICE_ID, $groupsService);
+            $this->setVersion('6.1.2');
+        }
     }
 }

test/integration/GroupsTest.php

@@ -30,6 +30,7 @@
 use \core_kernel_classes_Class;
 use \core_kernel_classes_Property;
 use oat\tao\test\TaoPhpUnitTestRunner;
+use oat\oatbox\service\ServiceManager;
 
 
 
@@ -55,8 +56,15 @@ class GroupsTest extends TaoPhpUnitTestRunner {
     public function setUp()
     {
         TaoPhpUnitTestRunner::initTest();
-        $this->subjectsService = new TestTakerService();
-        $this->groupsService = new GroupsService();
+
+        $subjectsService = new TestTakerService();
+        $groupsService = new GroupsService();
+        $smMock = $this->getServiceLocatorMock([
+            'TestTakerService' => $subjectsService,
+            GroupsService::SERVICE_ID => $groupsService
+        ]);
+        $this->subjectsService = $smMock->get('TestTakerService');
+        $this->groupsService = $smMock->get(GroupsService::SERVICE_ID);
     }
 
     /**
@@ -204,4 +212,4 @@ public function testGetGroups()
         $subject->delete();
     }
 
-}
+}