[CoreBundle] Fixing the upgrade. (#2482)

* self explanatory

* try to restore

* fixing

* avoir duplicate admintoolroles entries

* phpmd

* js checkstyle

* checkstyle

* jslint

* webpack

Author: ngodfraind

.eslintrc.json

@@ -28,7 +28,6 @@ public function load(ObjectManager $manager)
         $role = $manager->getRepository('ClarolineCoreBundle:Role')->findOneByName('ROLE_WS_CREATOR');
         $tool = $manager->getRepository('ClarolineCoreBundle:Tool\AdminTool')->findOneByName('workspace_management');
 
-        $this->container->get('claroline.manager.tool_manager')
-          ->addRoleToAdminTool($tool, $role);
+        $this->container->get('claroline.manager.tool_manager')->addRoleToAdminTool($tool, $role);
     }
 }

.gitattributes

@@ -12,9 +12,9 @@
 namespace Claroline\CoreBundle\Entity\Tool;
 
 use Claroline\CoreBundle\Entity\Plugin;
+use Claroline\CoreBundle\Entity\Role;
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\ORM\Mapping as ORM;
-use Claroline\CoreBundle\Entity\Role;
 
 /**
  * @ORM\Entity(repositoryClass="Claroline\CoreBundle\Repository\AdministrationToolRepository")
@@ -81,7 +81,9 @@ public function getName()
 
     public function addRole(Role $role)
     {
-        $this->roles->add($role);
+        if (!$this->roles->contains($role)) {
+            $this->roles->add($role);
+        }
     }
 
     public function removeRole(Role $role)

.github/ISSUE_TEMPLATE.md

@@ -57,7 +57,13 @@ public function check(PluginBundle $plugin, $updateMode = false)
 
         $config = $this->yamlParser->parse(file_get_contents($plugin->getConfigFile()));
         $names = [];
-        $listResource = $this->em->getRepository('ClarolineCoreBundle:Resource\ResourceType')->findAll();
+
+        //required for update to claroline v10 because database not updated yet from older version
+        try {
+            $listResource = $this->em->getRepository('ClarolineCoreBundle:Resource\ResourceType')->findAll();
+        } catch (\Exception $e) {
+            $listResource = [];
+        }
 
         foreach ($listResource as $resource) {
             $names[] = $resource->getName();
@@ -74,7 +80,13 @@ public function check(PluginBundle $plugin, $updateMode = false)
         }
 
         $resourceActions = [];
-        $listResourceActions = $this->em->getRepository('ClarolineCoreBundle:Resource\MenuAction')->findBy(['resourceType' => null, 'isCustom' => true]);
+
+        //required for update to claroline v10 because database not updated yet from older version
+        try {
+            $listResourceActions = $this->em->getRepository('ClarolineCoreBundle:Resource\MenuAction')->findBy(['resourceType' => null, 'isCustom' => true]);
+        } catch (\Exception $e) {
+            $listResourceActions = [];
+        }
 
         foreach ($listResourceActions as $resourceAction) {
             $resourceActions[] = $resourceAction->getName();

.github/PULL_REQUEST_TEMPLATE.md

@@ -137,6 +137,7 @@ public function update(PluginBundle $pluginBundle, array $pluginConfiguration)
 
         $plugin->setHasOptions($pluginConfiguration['has_options']);
         $this->em->persist($plugin);
+        $this->log('Configuration was retrieved: updating...');
         $this->updateConfiguration($pluginConfiguration, $plugin, $pluginBundle);
         $this->em->flush();
 

.modernizrrc

@@ -73,6 +73,7 @@ public function setLogger(LoggerInterface $logger)
     {
         $this->logger = $logger;
         $this->baseInstaller->setLogger($logger);
+        $this->recorder->setLogger($logger);
     }
 
     /**
@@ -187,6 +188,8 @@ public function updateAllConfigurations()
             $this->validator->activeUpdateMode();
             $this->validatePlugin($bundle['instance']);
             $this->validator->deactivateUpdateMode();
+            $this->log('Plugin validated: proceed to database changes...');
+            $this->om->clear();
             $this->recorder->update($bundle['instance'], $this->validator->getPluginConfiguration());
         }
     }

.sensiolabs.yml

@@ -98,4 +98,9 @@ public function isRegistered(PluginBundle $plugin)
     {
         return $this->dbWriter->isSaved($plugin);
     }
+
+    public function setLogger($logger)
+    {
+        $this->dbWriter->setLogger($logger);
+    }
 }

.travis.yml

@@ -14,7 +14,9 @@
 
 use Claroline\CoreBundle\Entity\Workspace\Workspace;
 use Claroline\InstallationBundle\Updater\Updater;
+use Doctrine\DBAL\Exception\ForeignKeyConstraintViolationException;
 use Doctrine\DBAL\Exception\TableNotFoundException;
+use Psr\Log\LogLevel;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\Security\Core\Authentication\Token\UsernamePasswordToken;
 
@@ -52,13 +54,17 @@ public function postUpdate()
         $roleManager = $this->container->get('claroline.manager.role_manager');
         $om = $this->container->get('claroline.persistence.object_manager');
         $models = $this->connection->query('SELECT * FROM claro_workspace_model')->fetchAll();
+        $toCheck = [];
+        $i = 0;
+        $this->connection->query('SET FOREIGN_KEY_CHECKS=0');
 
         foreach ($models as $model) {
-            $code = '[MOD]'.$model['name'].uniqid();
+            $code = '[MOD]'.$model['name'];
             $workspace = $om->getRepository('ClarolineCoreBundle:Workspace\Workspace')->findOneByCode($code);
 
             if (!$workspace) {
-                $this->log('Creating workspace from model '.$model['name']);
+                ++$i;
+                $this->log('Creating workspace from model '.$model['name'].': '.$i.'/'.count($models));
 
                 try {
                     $modelUsers = $this->connection->query("SELECT * FROM claro_workspace_model_user u where u.workspacemodel_id = {$model['id']}")->fetchAll();
@@ -102,14 +108,26 @@ public function postUpdate()
                     $roleManager->associateRoleToMultipleSubjects($users, $managerRole);
                     $roleManager->associateRoleToMultipleSubjects($groups, $managerRole);
                     $this->om->persist($newWorkspace);
-                    $this->om->flush();
+                    $this->om->forceFlush();
+                    $this->om->clear();
+                    $defaultUser = $this->container->get('claroline.manager.user_manager')->getDefaultUser();
+                    $token = new UsernamePasswordToken($defaultUser, '123', 'main', $defaultUser->getRoles());
+                    $this->container->get('security.token_storage')->setToken($token);
+                    $this->om->merge($defaultUser);
 
                     $this->log("Updatig cursus for model {$model['name']}");
-                    $modelResources = $this->connection->query("
-                      UPDATE claro_cursusbundle_course r
-                      SET r.workspace_model_id = {$newWorkspace->getId()}
-                      WHERE r.workspace_model_id = {$model['id']}"
-                    )->execute();
+                    try {
+                        $modelResources = $this->connection->query("
+                          UPDATE claro_cursusbundle_course r
+                          SET r.workspace_model_id = {$newWorkspace->getId()}
+                          WHERE r.workspace_model_id = {$model['id']}"
+                        )->execute();
+                    } catch (ForeignKeyConstraintViolationException $e) {
+                        $this->log('Error when setting the model flag for cursuses', LogLevel::ERROR);
+                        $this->log($e->getMessage(), LogLevel::ERROR);
+                        $this->log('Continuing update...');
+                        $toCheck[] = [$newWorkspace, $model];
+                    }
                 } catch (TableNotFoundException $e) {
                     $this->log('Model table already removed');
                 }
@@ -118,6 +136,7 @@ public function postUpdate()
             }
         }
 
+        $this->connection->query('SET FOREIGN_KEY_CHECKS=1');
         $this->dropModelTable();
     }
 

doc/badges/index.md

@@ -27,6 +27,7 @@ public function __construct(ContainerInterface $container, $logger)
         $this->container = $container;
         $this->logger = $logger;
         $this->om = $container->get('claroline.persistence.object_manager');
+        $this->connection = $this->container->get('doctrine.dbal.default_connection');
     }
 
     public function postUpdate()
@@ -70,31 +71,23 @@ public function setResourceNodeProperties()
         $i = 0;
         $this->log("Adding properties for {$totalObjects} resource nodes...");
 
-        foreach ($entities as $entity) {
-            if ($entity->isFullscreen() === null) {
-                $entity->setFullscreen(false);
-            }
-            if (!$entity->isClosable() === null) {
-                $entity->setClosable(false);
-            }
-            if (!$entity->getCloseTarget() === null) {
-                $entity->setCloseTarget(0);
-            }
-
-            ++$i;
-
-            $this->om->persist($entity);
-
-            if ($i % 300 === 0) {
-                $this->log("Flushing [{$i}/{$totalObjects}]");
-                $this->om->flush();
-            }
-        }
-
-        $this->om->flush();
-        $this->log('Clearing object manager...');
-        $this->om->clear();
-        $this->log('done !');
+        $this->connection->query('
+            UPDATE claro_resource_node crn
+            SET crn.fullscreen = false
+            WHERE crn.fullscreen is NULL'
+        )->execute();
+
+        $this->connection->query('
+            UPDATE claro_resource_node crn
+            SET crn.closable = false
+            WHERE crn.closable is NULL'
+        )->execute();
+
+        $this->connection->query('
+            UPDATE claro_resource_node crn
+            SET crn.closeTarget = 0
+            WHERE crn.closeTarget is NULL'
+        )->execute();
     }
 
     public function rebuildMaskAndMenus()

main/core/DataFixtures/PostInstall/Data/PostLoadRolesData.php

@@ -2,12 +2,12 @@
 
 namespace Icap\BadgeBundle\Manager;
 
-use Icap\BadgeBundle\Entity\BadgeRule;
 use Claroline\CoreBundle\Entity\User;
-use Icap\BadgeBundle\Entity\Badge;
-use Icap\BadgeBundle\Entity\UserBadge;
 use Claroline\CoreBundle\Library\Testing\MockeryTestCase;
 use Doctrine\Common\Collections\ArrayCollection;
+use Icap\BadgeBundle\Entity\Badge;
+use Icap\BadgeBundle\Entity\BadgeRule;
+use Icap\BadgeBundle\Entity\UserBadge;
 
 class BadgeManagerTest extends MockeryTestCase
 {
@@ -86,19 +86,19 @@ public function testAddBadgeToUsersProvider()
         $user = new User();
         $userBadge = new UserBadge();
 
-        return array(
-            array($badge, array(null, null, null), array($user, $user, $user), 3),
+        return [
+            [$badge, [null, null, null], [$user, $user, $user], 3],
 
-            array($badge, array($userBadge, null, null), array($user, $user, $user), 2),
-            array($badge, array(null, $userBadge, null), array($user, $user, $user), 2),
-            array($badge, array(null, null, $userBadge), array($user, $user, $user), 2),
+            [$badge, [$userBadge, null, null], [$user, $user, $user], 2],
+            [$badge, [null, $userBadge, null], [$user, $user, $user], 2],
+            [$badge, [null, null, $userBadge], [$user, $user, $user], 2],
 
-            array($badge, array(null, $userBadge, $userBadge), array($user, $user, $user), 1),
-            array($badge, array($userBadge, null, $userBadge), array($user, $user, $user), 1),
-            array($badge, array($userBadge, $userBadge, null), array($user, $user, $user), 1),
+            [$badge, [null, $userBadge, $userBadge], [$user, $user, $user], 1],
+            [$badge, [$userBadge, null, $userBadge], [$user, $user, $user], 1],
+            [$badge, [$userBadge, $userBadge, null], [$user, $user, $user], 1],
 
-            array($badge, array($userBadge, $userBadge, $userBadge), array($user, $user, $user), 0),
-        );
+            [$badge, [$userBadge, $userBadge, $userBadge], [$user, $user, $user], 0],
+        ];
     }
 
     /**
@@ -157,16 +157,16 @@ public function testGenerateExpiredDateProvider()
             ->setExpireDuration(2)
             ->setExpirePeriod(Badge::EXPIRE_PERIOD_YEAR);
 
-        return array(
-            array($badge1, new \DateTime('2014-02-02'), new \DateTime('2014-02-03')),
-            array($badge2, new \DateTime('2014-02-02'), new \DateTime('2014-02-04')),
-            array($badge3, new \DateTime('2014-02-02'), new \DateTime('2014-02-09')),
-            array($badge4, new \DateTime('2014-02-02'), new \DateTime('2014-02-16')),
-            array($badge5, new \DateTime('2014-02-02'), new \DateTime('2014-03-02')),
-            array($badge6, new \DateTime('2014-02-02'), new \DateTime('2014-04-02')),
-            array($badge7, new \DateTime('2014-02-02'), new \DateTime('2015-02-02')),
-            array($badge8, new \DateTime('2014-02-02'), new \DateTime('2016-02-02')),
-        );
+        return [
+            [$badge1, new \DateTime('2014-02-02'), new \DateTime('2014-02-03')],
+            [$badge2, new \DateTime('2014-02-02'), new \DateTime('2014-02-04')],
+            [$badge3, new \DateTime('2014-02-02'), new \DateTime('2014-02-09')],
+            [$badge4, new \DateTime('2014-02-02'), new \DateTime('2014-02-16')],
+            [$badge5, new \DateTime('2014-02-02'), new \DateTime('2014-03-02')],
+            [$badge6, new \DateTime('2014-02-02'), new \DateTime('2014-04-02')],
+            [$badge7, new \DateTime('2014-02-02'), new \DateTime('2015-02-02')],
+            [$badge8, new \DateTime('2014-02-02'), new \DateTime('2016-02-02')],
+        ];
     }
 
     public function testIsRuleChangedWithOneRuleAndNoChange()
@@ -209,7 +209,7 @@ public function testIsRuleChangedWitOneRuleAndOneNewRule()
         $unitOfWork
             ->shouldReceive('getEntityChangeSet')->once()
                 ->with($originalRule1)
-                ->andReturn(array());
+                ->andReturn([]);
         $entityManager = $this->entityManager;
         $entityManager
             ->shouldReceive('getUnitOfWork')
@@ -235,7 +235,7 @@ public function testIsRuleChangedWitOneRuleChanged()
         $unitOfWork
             ->shouldReceive('getEntityChangeSet')->once()
                 ->with($originalRule1)
-                ->andReturn(array('action' => array(uniqid(), uniqid())));
+                ->andReturn(['action' => [uniqid(), uniqid()]]);
         $entityManager = $this->entityManager;
         $entityManager
             ->shouldReceive('getUnitOfWork')

main/core/Entity/Tool/AdminTool.php

@@ -70,6 +70,7 @@ public function __construct(
 
     public function postUpdate()
     {
+        return;
         $this->updateExerciseTypes();
         $this->updateAnswerData();
         $this->cleanOldPairQuestions();

main/core/Library/Installation/Plugin/ConfigurationChecker.php

@@ -73,10 +73,6 @@ public function up(Schema $schema)
             ADD CONSTRAINT FK_4ABE4F561E27F6BF FOREIGN KEY (question_id)
             REFERENCES ujm_question_grid (id)
         ');
-        $this->addSql('
-            ALTER TABLE ujm_interaction_hole
-            DROP originalText
-        ');
     }
 
     public function down(Schema $schema)
@@ -98,9 +94,5 @@ public function down(Schema $schema)
         $this->addSql('
             DROP TABLE ujm_cell
         ');
-        $this->addSql('
-            ALTER TABLE ujm_interaction_hole
-            ADD originalText TEXT DEFAULT NULL COLLATE utf8_unicode_ci
-        ');
     }
 }

main/core/Library/Installation/Plugin/DatabaseWriter.php

@@ -18,10 +18,6 @@ public function up(Schema $schema)
             ALTER TABLE ujm_exercise 
             ADD show_end_page TINYINT(1) NOT NULL
         ');
-        $this->addSql('
-            ALTER TABLE ujm_hole 
-            DROP position
-        ');
     }
 
     public function down(Schema $schema)
@@ -30,9 +26,5 @@ public function down(Schema $schema)
             ALTER TABLE ujm_exercise 
             DROP show_end_page
         ');
-        $this->addSql('
-            ALTER TABLE ujm_hole 
-            ADD position INT DEFAULT NULL
-        ');
     }
 }

main/core/Library/Installation/Plugin/Installer.php

@@ -11,15 +11,15 @@ export default class ConfirmModalCtrl {
      * Confirm delete step
      * @returns void
      */
-    $scope.confirm = function() {
+    $scope.confirm = function () {
       $uibModalInstance.close()
     }
 
     /**
      * Abort delete step
      * @returns void
      */
-    $scope.cancel = function() {
+    $scope.cancel = function () {
       $uibModalInstance.dismiss('cancel')
     }
   }