Introduce sso_provider_roles_eb6 to prepare for custom doctrine types - Update tests to delete sso_provider_roles_eb6 as well

Author: Stephan-Kok

src/OpenConext/EngineBlockFunctionalTestingBundle/Fixtures/ServiceRegistryFixture.php

@@ -116,16 +116,32 @@ public function save()
         $this->entityManager->flush();
     }
 
+    /**
+     * This call duplicate database call has been added to temporary push to both sso_provider_roles_eb5
+     * and sso_provider_roles_eb6
+     *
+     * TODO: Remove this code after sso_provider_roles_eb5 has been phased out
+     */
     public function reset()
     {
         $queryBuilder = $this->entityManager->getConnection()->createQueryBuilder();
         $queryBuilder
             ->delete('sso_provider_roles_eb5')
             ->execute();
 
+        $this->entityManager->getConnection()->createQueryBuilder()
+            ->delete('sso_provider_roles_eb6')
+            ->execute();
+
         return $this;
     }
 
+    /**
+     * This call duplicate database call has been added to temporary push to both sso_provider_roles_eb5
+     * and sso_provider_roles_eb6
+     *
+     * TODO: Remove this code after sso_provider_roles_eb5 has been phased out
+     */
     public function remove($entityId, $role)
     {
         $queryBuilder = $this->entityManager->getConnection()->createQueryBuilder();
@@ -136,6 +152,13 @@ public function remove($entityId, $role)
             ->setParameter('entityId', $entityId)
             ->setParameter('type', $role)
             ->execute();
+        $this->entityManager->getConnection()->createQueryBuilder()
+            ->delete('sso_provider_roles_eb6', 'roles')
+            ->where('roles.entity_id = :entityId')
+            ->andWhere('roles.type = :type')
+            ->setParameter('entityId', $entityId)
+            ->setParameter('type', $role)
+            ->execute();
 
         return $this;
     }

tests/functional/OpenConext/EngineBlockBundle/Controller/Api/AttributeReleasePolicyControllerApiTest.php

@@ -478,11 +478,20 @@ private function addServiceProviderFixture(ServiceProvider $serviceProvider)
         $em->flush();
     }
 
+    /**
+     * This call {->delete('sso_provider_roles_eb5')} has been added to temporary push to both sso_provider_roles_eb5
+     * and sso_provider_roles_eb6
+     *
+     * TODO: Remove this code after sso_provider_roles_eb5 has been phased out
+     */
     private function clearMetadataFixtures()
     {
         $queryBuilder = $this->getContainer()->get('doctrine')->getConnection()->createQueryBuilder();
         $queryBuilder
             ->delete('sso_provider_roles_eb5')
             ->execute();
+        $this->getContainer()->get('doctrine')->getConnection()->createQueryBuilder()
+            ->delete('sso_provider_roles_eb6')
+            ->execute();
     }
 }

tests/functional/OpenConext/EngineBlockBundle/Controller/Api/ConnectionsControllerTest.php

@@ -394,12 +394,21 @@ private function disableMetadataPushApiFeatureFor(Client $client)
         $client->getContainer()->set('engineblock.features', $featureToggles);
     }
 
+    /**
+     * This call {->delete('sso_provider_roles_eb5')} has been added to temporary push to both sso_provider_roles_eb5
+     * and sso_provider_roles_eb6
+     *
+     * TODO: Remove this code after sso_provider_roles_eb5 has been phased out
+     */
     private function clearMetadataFixtures()
     {
         $queryBuilder = $this->getContainer()->get('doctrine')->getConnection()->createQueryBuilder();
         $queryBuilder
             ->delete('sso_provider_roles_eb5')
             ->execute();
+        $this->getContainer()->get('doctrine')->getConnection()->createQueryBuilder()
+            ->delete('sso_provider_roles_eb6')
+            ->execute();
     }
 
     /**

tests/functional/OpenConext/EngineBlockBundle/Controller/Api/ConsentControllerTest.php

@@ -297,12 +297,21 @@ private function addServiceProviderFixture(ServiceProvider $serviceProvider)
         $em->flush();
     }
 
+    /**
+     * This call {->delete('sso_provider_roles_eb5')} has been added to temporary push to both sso_provider_roles_eb5
+     * and sso_provider_roles_eb6
+     *
+     * TODO: Remove this code after sso_provider_roles_eb5 has been phased out
+     */
     private function clearMetadataFixtures()
     {
         $queryBuilder = $this->getContainer()->get('doctrine')->getConnection()->createQueryBuilder();
         $queryBuilder
             ->delete('sso_provider_roles_eb5')
             ->execute();
+        $this->getContainer()->get('doctrine')->getConnection()->createQueryBuilder()
+            ->delete('sso_provider_roles_eb6')
+            ->execute();
     }
 
     private function clearConsentFixtures()