ソースを参照

Moving main/inc/Entity to src/ChamiloLMS/Entity.

Julio Montoya 11 年 前
コミット
00c26eee9d
100 ファイル変更421 行追加415 行削除
  1. 3 3
      main/admin/extra_field_workflow.php
  2. 1 1
      main/admin/user_edit.php
  3. 1 1
      main/auth/inscription.php
  4. 4 4
      main/exercice/exercise.class.php
  5. 1 1
      main/exercice/exercise_reminder.php
  6. 4 4
      main/exercice/testcategory.class.php
  7. 3 3
      main/exercice/tests_category.php
  8. 3 3
      main/group/group_edit.php
  9. 3 3
      main/inc/ajax/exercise.ajax.php
  10. 1 1
      main/inc/global.inc.php
  11. 3 3
      main/inc/lib/api.lib.php
  12. 1 1
      main/inc/lib/document.lib.php
  13. 4 3
      main/inc/lib/events.lib.inc.php
  14. 2 2
      main/inc/lib/extra_field.lib.php
  15. 13 12
      main/inc/lib/extra_field_value.lib.php
  16. 1 1
      main/inc/lib/fileManager.lib.php
  17. 6 6
      main/inc/lib/usermanager.lib.php
  18. 39 53
      main/inc/services.php
  19. 16 16
      main/link/link.class.php
  20. 11 11
      main/newscorm/learnpath.class.php
  21. 1 1
      main/newscorm/lp_list.php
  22. 8 8
      main/pages/index.php
  23. 4 6
      main/timeline/index.php
  24. 1 1
      src/ChamiloLMS/Component/Auth/LoginListener.php
  25. 4 1
      src/ChamiloLMS/Component/Auth/LoginSuccessHandler.php
  26. 1 1
      src/ChamiloLMS/Component/Auth/Role.php
  27. 1 1
      src/ChamiloLMS/Component/Editor/CkEditor/CkEditor.php
  28. 2 2
      src/ChamiloLMS/Component/Editor/Connector.php
  29. 4 4
      src/ChamiloLMS/Component/Editor/Driver/DropBoxDriver.php
  30. 12 10
      src/ChamiloLMS/Controller/Admin/Administrator/BranchController.php
  31. 11 9
      src/ChamiloLMS/Controller/Admin/Administrator/JuryController.php
  32. 4 3
      src/ChamiloLMS/Controller/Admin/Administrator/QuestionScoreController.php
  33. 4 3
      src/ChamiloLMS/Controller/Admin/Administrator/QuestionScoreNameController.php
  34. 4 3
      src/ChamiloLMS/Controller/Admin/Administrator/RoleController.php
  35. 1 1
      src/ChamiloLMS/Controller/Admin/Administrator/UpgradeController.php
  36. 15 14
      src/ChamiloLMS/Controller/Admin/Director/BranchDirectorController.php
  37. 25 25
      src/ChamiloLMS/Controller/Admin/JuryMember/JuryMemberController.php
  38. 21 17
      src/ChamiloLMS/Controller/Admin/JuryPresident/JuryPresidentController.php
  39. 7 7
      src/ChamiloLMS/Controller/Admin/QuestionManager/QuestionManagerController.php
  40. 4 6
      src/ChamiloLMS/Controller/App/SessionPath/SessionPathController.php
  41. 2 3
      src/ChamiloLMS/Controller/App/SessionPath/SessionTreeController.php
  42. 3 3
      src/ChamiloLMS/Controller/BaseController.php
  43. 1 2
      src/ChamiloLMS/Controller/EditorController.php
  44. 4 4
      src/ChamiloLMS/Controller/IndexController.php
  45. 9 9
      src/ChamiloLMS/Controller/LearnpathController.php
  46. 8 8
      src/ChamiloLMS/Controller/Tool/CourseHome/CourseHomeController.php
  47. 7 7
      src/ChamiloLMS/Controller/Tool/Curriculum/CurriculumCategoryController.php
  48. 7 6
      src/ChamiloLMS/Controller/Tool/Curriculum/CurriculumItemController.php
  49. 23 25
      src/ChamiloLMS/Controller/Tool/Curriculum/CurriculumUserController.php
  50. 2 2
      src/ChamiloLMS/Controller/Tool/Introduction/IntroductionController.php
  51. 9 3
      src/ChamiloLMS/Controller/User/ProfileController.php
  52. 1 1
      src/ChamiloLMS/Entity/AccessUrl.php
  53. 1 1
      src/ChamiloLMS/Entity/AccessUrlRelCourse.php
  54. 1 1
      src/ChamiloLMS/Entity/AccessUrlRelSession.php
  55. 1 1
      src/ChamiloLMS/Entity/AccessUrlRelUser.php
  56. 2 2
      src/ChamiloLMS/Entity/BranchSync.php
  57. 1 1
      src/ChamiloLMS/Entity/CDropboxFile.php
  58. 1 1
      src/ChamiloLMS/Entity/CDropboxPost.php
  59. 1 1
      src/ChamiloLMS/Entity/CGroupInfo.php
  60. 2 2
      src/ChamiloLMS/Entity/CItemProperty.php
  61. 2 2
      src/ChamiloLMS/Entity/CLp.php
  62. 1 1
      src/ChamiloLMS/Entity/CLpCategory.php
  63. 1 1
      src/ChamiloLMS/Entity/CQuiz.php
  64. 1 1
      src/ChamiloLMS/Entity/CQuizCategory.php
  65. 2 2
      src/ChamiloLMS/Entity/CQuizQuestion.php
  66. 2 2
      src/ChamiloLMS/Entity/CQuizQuestionRelCategory.php
  67. 1 1
      src/ChamiloLMS/Entity/CQuizRelQuestion.php
  68. 1 1
      src/ChamiloLMS/Entity/CTimeline.php
  69. 1 1
      src/ChamiloLMS/Entity/CTool.php
  70. 1 1
      src/ChamiloLMS/Entity/CToolIntro.php
  71. 2 2
      src/ChamiloLMS/Entity/Course.php
  72. 1 1
      src/ChamiloLMS/Entity/CourseFieldValues.php
  73. 1 1
      src/ChamiloLMS/Entity/CourseRelUser.php
  74. 1 1
      src/ChamiloLMS/Entity/CurriculumCategory.php
  75. 1 1
      src/ChamiloLMS/Entity/CurriculumItem.php
  76. 2 2
      src/ChamiloLMS/Entity/CurriculumItemRelUser.php
  77. 1 1
      src/ChamiloLMS/Entity/CurriculumRelUser.php
  78. 1 1
      src/ChamiloLMS/Entity/ExtraField.php
  79. 1 1
      src/ChamiloLMS/Entity/ExtraFieldOptionRelFieldOption.php
  80. 1 1
      src/ChamiloLMS/Entity/ExtraFieldValues.php
  81. 1 1
      src/ChamiloLMS/Entity/Groups.php
  82. 2 2
      src/ChamiloLMS/Entity/Jury.php
  83. 1 1
      src/ChamiloLMS/Entity/JuryMembers.php
  84. 2 2
      src/ChamiloLMS/Entity/Pages.php
  85. 1 1
      src/ChamiloLMS/Entity/QuestionField.php
  86. 0 0
      src/ChamiloLMS/Entity/QuestionFieldOptions.php
  87. 1 1
      src/ChamiloLMS/Entity/QuestionFieldValues.php
  88. 2 2
      src/ChamiloLMS/Entity/QuestionScore.php
  89. 1 1
      src/ChamiloLMS/Entity/QuestionScoreName.php
  90. 3 3
      src/ChamiloLMS/Entity/Repository/BranchSyncRepository.php
  91. 2 2
      src/ChamiloLMS/Entity/Repository/CQuizCategoryRepository.php
  92. 2 2
      src/ChamiloLMS/Entity/Repository/CQuizQuestionRelCategoryRepository.php
  93. 1 1
      src/ChamiloLMS/Entity/Repository/CQuizQuestionRepository.php
  94. 4 4
      src/ChamiloLMS/Entity/Repository/CourseRepository.php
  95. 3 3
      src/ChamiloLMS/Entity/Repository/CurriculumItemRelUserRepository.php
  96. 24 20
      src/ChamiloLMS/Entity/Repository/ItemPropertyRepository.php
  97. 3 3
      src/ChamiloLMS/Entity/Repository/JuryRepository.php
  98. 1 1
      src/ChamiloLMS/Entity/Repository/LpRepository.php
  99. 1 1
      src/ChamiloLMS/Entity/Repository/PagesRepository.php
  100. 1 1
      src/ChamiloLMS/Entity/Repository/QuestionScoreRepository.php

+ 3 - 3
main/admin/extra_field_workflow.php

@@ -122,7 +122,7 @@ $options[0] = get_lang('SelectAnOption');
 ksort($options);
 $form->addElement('select', 'status', get_lang('SelectRole'), $options, array('onclick' => 'changeStatus(this)'));
 
-$checks = $app['orm.em']->getRepository('Entity\ExtraFieldOptionRelFieldOption')->findBy(array('fieldId' => $field_id, 'roleId' => $roleId));
+$checks = $app['orm.em']->getRepository('ChamiloLMS\Entity\ExtraFieldOptionRelFieldOption')->findBy(array('fieldId' => $field_id, 'roleId' => $roleId));
 $includedFields = array();
 if (!empty($checks)) {
     foreach ($checks as $availableField) {
@@ -176,7 +176,7 @@ if ($form->validate()) {
     if (!empty($result)) {
         foreach ($result as $id => $items) {
             foreach ($items as $subItemId => $value) {
-                $extraFieldOptionRelFieldOption = $app['orm.em']->getRepository('Entity\ExtraFieldOptionRelFieldOption')->findOneBy(
+                $extraFieldOptionRelFieldOption = $app['orm.em']->getRepository('ChamiloLMS\Entity\ExtraFieldOptionRelFieldOption')->findOneBy(
                     array(
                     'fieldId' => $field_id,
                     'fieldOptionId' => $subItemId,
@@ -187,7 +187,7 @@ if ($form->validate()) {
 
                 if ($value == 1) {
                     if (empty($extraFieldOptionRelFieldOption)) {
-                        $extraFieldOptionRelFieldOption = new Entity\ExtraFieldOptionRelFieldOption();
+                        $extraFieldOptionRelFieldOption = new \ChamiloLMS\Entity\ExtraFieldOptionRelFieldOption();
                         $extraFieldOptionRelFieldOption->setFieldId($field_id);
                         $extraFieldOptionRelFieldOption->setFieldOptionId($subItemId);
                         $extraFieldOptionRelFieldOption->setRelatedFieldOptionId($id);

+ 1 - 1
main/admin/user_edit.php

@@ -301,7 +301,7 @@ if ($expiration_date == '0000-00-00 00:00:00') {
     $user_data['expiration_date']['i'] = substr($expiration_date, 14, 2);
 }
 
-$user = $app['orm.em']->getRepository('Entity\User')->find($user_data['user_id']);
+$user = $app['orm.em']->getRepository('ChamiloLMS\Entity\User')->find($user_data['user_id']);
 
 $roles = $user->getRoles();
 

+ 1 - 1
main/auth/inscription.php

@@ -448,7 +448,7 @@ if ($form->validate()) {
     }
 
     // Symfony way to login as a user
-    $user = $app['orm.em']->getRepository('Entity\User')->find($user_id);
+    $user = $app['orm.em']->getRepository('ChamiloLMS\Entity\User')->find($user_id);
 
     // Here, "secured" is the name of the firewall in your security.yml
     $token = new UsernamePasswordToken($user, $user->getPassword(), 'secured', $user->getRoles());

+ 4 - 4
main/exercice/exercise.class.php

@@ -965,7 +965,7 @@ class Exercise
         if (!empty($questions_by_category)) {
             global $app;
             $em = $app['orm.em'];
-            $repo = $em->getRepository('Entity\CQuizCategory');
+            $repo = $em->getRepository('ChamiloLMS\Entity\CQuizCategory');
 
             $newCategoryList = array();
 
@@ -980,7 +980,7 @@ class Exercise
 
                 if (!empty($cat['parent_id'])) {
                     if (!isset($parentsLoaded[$cat['parent_id']])) {
-                        $categoryEntity = $em->find('Entity\CQuizCategory', $cat['parent_id']);
+                        $categoryEntity = $em->find('ChamiloLMS\Entity\CQuizCategory', $cat['parent_id']);
                         $parentsLoaded[$cat['parent_id']] = $categoryEntity;
                     } else {
                         $categoryEntity = $parentsLoaded[$cat['parent_id']];
@@ -990,7 +990,7 @@ class Exercise
                     if ($this->categoryMinusOne) {
                         //$index = 1;
                     }
-                    /** @var Entity\CQuizCategory $categoryParent*/
+                    /** @var \ChamiloLMS\Entity\CQuizCategory $categoryParent*/
 
                     foreach ($path as $categoryParent) {
                         $visibility = $categoryParent->getVisibility();
@@ -1754,7 +1754,7 @@ class Exercise
 
         global $app;
         $em = $app['orm.em'];
-        $types = $em->getRepository('Entity\QuestionScore')->findAll();
+        $types = $em->getRepository('ChamiloLMS\Entity\QuestionScore')->findAll();
         $options = array(
             '0' => get_lang('SelectAnOption')
         );

+ 1 - 1
main/exercice/exercise_reminder.php

@@ -205,7 +205,7 @@ foreach ($question_list as $questionId) {
 
     $rootCategories = null;
     global $app;
-    $repo = $app['orm.em']->getRepository('Entity\CQuizCategory');
+    $repo = $app['orm.em']->getRepository('ChamiloLMS\Entity\CQuizCategory');
     foreach ($objQuestionTmp->category_list as $categoryId) {
         $cat = $repo->find($categoryId);
         $parentCat = $repo->getPath($cat);

+ 4 - 4
main/exercice/testcategory.class.php

@@ -129,7 +129,7 @@ class Testcategory
         if ($data['nb'] <= 0) {
             // @todo inject the app in the class
             global $app;
-            $category = new \Entity\CQuizCategory();
+            $category = new ChamiloLMS\Entity\CQuizCategory();
             $category->setTitle($this->name);
             $category->setDescription($this->description);
 
@@ -221,7 +221,7 @@ class Testcategory
             return false;
         }
 
-        $repo = $app['orm.ems']['db_write']->getRepository('Entity\CQuizCategory');
+        $repo = $app['orm.ems']['db_write']->getRepository('ChamiloLMS\Entity\CQuizCategory');
         $repo->removeFromTree($category);
         // clear cached nodes
         $app['orm.ems']['db_write']->clear();
@@ -957,7 +957,7 @@ class Testcategory
             unset($category_list['total']);
         }
         $em = $app['orm.em'];
-        $repo = $em->getRepository('Entity\CQuizCategory');
+        $repo = $em->getRepository('ChamiloLMS\Entity\CQuizCategory');
 
         $redefineCategoryList = array();
 
@@ -965,7 +965,7 @@ class Testcategory
             $globalCategoryScore = array();
 
             foreach ($category_list as $category_id => $category_item) {
-                $cat = $em->find('Entity\CQuizCategory', $category_id);
+                $cat = $em->find('ChamiloLMS\Entity\CQuizCategory', $category_id);
                 $path = $repo->getPath($cat);
 
                 $categoryName = $category_name_list[$category_id];

+ 3 - 3
main/exercice/tests_category.php

@@ -278,14 +278,14 @@ function display_categories($type = 'simple') {
     );
 
     // @todo put this in a function
-    $repo = $app['orm.em']->getRepository('Entity\CQuizCategory');
+    $repo = $app['orm.em']->getRepository('ChamiloLMS\Entity\CQuizCategory');
 
     $query = null;
     if ($type == 'global') {
         $query = $app['orm.em']
             ->createQueryBuilder()
             ->select('node')
-            ->from('Entity\CQuizCategory', 'node')
+            ->from('ChamiloLMS\Entity\CQuizCategory', 'node')
             ->where('node.cId = 0')
             ->orderBy('node.root, node.lft', 'ASC')
             ->getQuery();
@@ -293,7 +293,7 @@ function display_categories($type = 'simple') {
         $query = $app['orm.em']
             ->createQueryBuilder()
             ->select('node')
-            ->from('Entity\CQuizCategory', 'node')
+            ->from('ChamiloLMS\Entity\CQuizCategory', 'node')
             ->where('node.cId = :courseId')
             //->add('orderBy', 'node.title ASC')
             ->orderBy('node.root, node.lft', 'ASC')

+ 3 - 3
main/group/group_edit.php

@@ -138,10 +138,10 @@ $form->add_textfield('name', get_lang('GroupName'));
 $form->addElement('textarea', 'description', get_lang('Description'), array('class' => 'span6', 'rows' => 6));
 
 // Getting course info
-$course = $app['orm.em']->getRepository('Entity\Course')->find(api_get_course_int_id());
+$course = $app['orm.em']->getRepository('ChamiloLMS\Entity\Course')->find(api_get_course_int_id());
 
 //Getting subscribed students
-$subscribedUsers = $app['orm.em']->getRepository('Entity\Course')->getSubscribedStudents($course);
+$subscribedUsers = $app['orm.em']->getRepository('ChamiloLMS\Entity\Course')->getSubscribedStudents($course);
 $subscribedUsers = $subscribedUsers->getQuery();
 $subscribedUsers = $subscribedUsers->execute();
 
@@ -474,4 +474,4 @@ if (isset($_GET['show_message_sucess'])) {
 $form->setDefaults($defaults);
 $form->display();
 
-Display :: display_footer();
+Display :: display_footer();

+ 3 - 3
main/inc/ajax/exercise.ajax.php

@@ -109,19 +109,19 @@ switch ($action) {
         $courseId = api_get_course_int_id();
 
         $em = $this->get('orm.em');
-        $repo = $em->getRepository('Entity\CQuizCategory');
+        $repo = $em->getRepository('ChamiloLMS\Entity\CQuizCategory');
 
         $json_items = array();
         if (!empty($items)) {
             foreach ($items as $item) {
                 if ($item['c_id'] == 0) {
                     if ($filterByGlobal) {
-                        $cat = $em->find('Entity\CQuizCategory', $item['iid']);
+                        $cat = $em->find('ChamiloLMS\Entity\CQuizCategory', $item['iid']);
                         $idList = array();
                         if ($cat) {
                             $path = $repo->getPath($cat);
                             if (!empty($path)) {
-                                /** @var Entity\CQuizCategory $cat */
+                                /** @var \ChamiloLMS\Entity\CQuizCategory $cat */
                                 foreach ($path as $cat) {
                                     $idList[] = $cat->getIid();
                                 }

+ 1 - 1
main/inc/global.inc.php

@@ -444,7 +444,7 @@ $app->before(
             // Checking token in order to get the current user.
             $token = $security->getToken();
             if (null !== $token) {
-                /** @var Entity\User $user */
+                /** @var \ChamiloLMS\Entity\User $user */
                 $user = $token->getUser();
             }
 

+ 3 - 3
main/inc/lib/api.lib.php

@@ -3137,7 +3137,7 @@ function api_item_property_update(
     if (is_array($_course)) {
         $course_id	 = $_course['real_id'];
     } else {
-        if ($_course instanceof \Entity\Course) {
+        if ($_course instanceof \ChamiloLMS\Entity\Course) {
             $course_id = $_course->getId();
         }
     }
@@ -6133,7 +6133,7 @@ function api_set_default_visibility($course, $item_id, $tool_id, $group_id = nul
     if (is_array($course)) {
         $courseId = $course['real_id'];
     } else {
-        if ($course instanceof \Entity\Course) {
+        if ($course instanceof \ChamiloLMS\Entity\Course) {
             $courseId = $course->getId();
         }
     }
@@ -6819,7 +6819,7 @@ function api_get_user_roles()
 {
     global $app;
     $em = $app['orm.ems']['db_read'];
-    $roles = $em->getRepository('Entity\Role')->findBy(array(), array('name'=>'asc'));
+    $roles = $em->getRepository('ChamiloLMS\Entity\Role')->findBy(array(), array('name'=>'asc'));
     $userRoles = array();
     foreach ($roles as $role) {
         $userRoles[$role->getId()] = $role->getName();

+ 1 - 1
main/inc/lib/document.lib.php

@@ -960,7 +960,7 @@ class DocumentManager
         if (is_array($_course)) {
             $course_id = $_course['real_id'];
         } else {
-            if ($_course instanceof \Entity\Course) {
+            if ($_course instanceof \ChamiloLMS\Entity\Course) {
                 $course_id = $_course->getId();
                 $_course = api_get_course_info_by_id($course_id);
             }

+ 4 - 3
main/inc/lib/events.lib.inc.php

@@ -11,13 +11,14 @@
  *
  * @package chamilo.library
  */
-
+use ChamiloLMS\Entity\User;
+use ChamiloLMS\Entity\Role;
 /**
  * @author Sebastien Piraux <piraux_seb@hotmail.com> old code
  * @author Julio Montoya 2013
  * @desc Record information for login event when an user identifies himself with username & password
  */
-function event_login(\Entity\User $user)
+function event_login(User $user)
 {
     $userId =  $user->getUserId();
 
@@ -37,7 +38,7 @@ function event_login(\Entity\User $user)
 
     // auto subscribe
 
-    /** @var \Entity\Role $role  */
+    /** @var Role $role */
     foreach ($roles as $role) {
         $role = $role->getRole();
         $userStatusParsed = 'student';

+ 2 - 2
main/inc/lib/extra_field.lib.php

@@ -634,13 +634,13 @@ class ExtraField extends Model
                         $addOptions = array();
 
                         global $app;
-                        $optionsExists = $app['orm.em']->getRepository('Entity\ExtraFieldOptionRelFieldOption')->
+                        $optionsExists = $app['orm.em']->getRepository('ChamiloLMS\Entity\ExtraFieldOptionRelFieldOption')->
                             findOneBy(array('fieldId' => $field_details['id']));
 
                         if ($optionsExists) {
                             if (isset($userInfo['status']) && !empty($userInfo['status'])) {
 
-                                $fieldWorkFlow = $app['orm.em']->getRepository('Entity\ExtraFieldOptionRelFieldOption')
+                                $fieldWorkFlow = $app['orm.em']->getRepository('ChamiloLMS\Entity\ExtraFieldOptionRelFieldOption')
                                 ->findBy(
                                     array(
                                         'fieldId' => $field_details['id'],

+ 13 - 12
main/inc/lib/extra_field_value.lib.php

@@ -10,6 +10,7 @@
  * Class managing the values in extra fields for any datatype
  * @package chamilo.library.extrafields
  */
+
 class ExtraFieldValue extends Model
 {
     public $type = null;
@@ -35,25 +36,25 @@ class ExtraFieldValue extends Model
                 $this->table = Database::get_main_table(TABLE_MAIN_COURSE_FIELD_VALUES);
                 $this->table_handler_field = Database::get_main_table(TABLE_MAIN_COURSE_FIELD);
                 $this->author_id = 'user_id';
-                $this->entityName = 'Entity\CourseFieldValues';
+                $this->entityName = 'ChamiloLMS\Entity\CourseFieldValues';
                 break;
             case 'user':
                 $this->table = Database::get_main_table(TABLE_MAIN_USER_FIELD_VALUES);
                 $this->table_handler_field = Database::get_main_table(TABLE_MAIN_USER_FIELD);
                 $this->author_id = 'author_id';
-                $this->entityName = 'Entity\UserFieldValues';
+                $this->entityName = 'ChamiloLMS\Entity\UserFieldValues';
                 break;
             case 'session':
                 $this->table = Database::get_main_table(TABLE_MAIN_SESSION_FIELD_VALUES);
                 $this->table_handler_field = Database::get_main_table(TABLE_MAIN_SESSION_FIELD);
                 $this->author_id = 'user_id';
-                $this->entityName = 'Entity\SessionFieldValues';
+                $this->entityName = 'ChamiloLMS\Entity\SessionFieldValues';
                 break;
             case 'question':
                 $this->table = Database::get_main_table(TABLE_MAIN_QUESTION_FIELD_VALUES);
                 $this->table_handler_field = Database::get_main_table(TABLE_MAIN_QUESTION_FIELD);
                 $this->author_id = 'user_id';
-                $this->entityName = 'Entity\QuestionFieldValues';
+                $this->entityName = 'ChamiloLMS\Entity\QuestionFieldValues';
                 break;
             default:
                 //unmanaged datatype, return false to let the caller know it
@@ -190,22 +191,22 @@ class ExtraFieldValue extends Model
                     global $app;
                     switch($this->type) {
                         case 'question':
-                            $extraFieldValue = new Entity\QuestionFieldValues();
+                            $extraFieldValue = new ChamiloLMS\Entity\QuestionFieldValues();
                             $extraFieldValue->setUserId(api_get_user_id());
                             $extraFieldValue->setQuestionId($params[$this->handler_id]);
                             break;
                         case 'course':
-                            $extraFieldValue = new Entity\CourseFieldValues();
+                            $extraFieldValue = new ChamiloLMS\Entity\CourseFieldValues();
                             $extraFieldValue->setUserId(api_get_user_id());
                             $extraFieldValue->setQuestionId($params[$this->handler_id]);
                             break;
                         case 'user':
-                            $extraFieldValue = new Entity\UserFieldValues();
+                            $extraFieldValue = new ChamiloLMS\Entity\UserFieldValues();
                             $extraFieldValue->setUserId($params[$this->handler_id]);
                             $extraFieldValue->setAuthorId(api_get_user_id());
                             break;
                         case 'session':
-                            $extraFieldValue = new Entity\SessionFieldValues();
+                            $extraFieldValue = new ChamiloLMS\Entity\SessionFieldValues();
                             $extraFieldValue->setUserId(api_get_user_id());
                             $extraFieldValue->setSessionId($params[$this->handler_id]);
                             break;
@@ -232,22 +233,22 @@ class ExtraFieldValue extends Model
                     global $app;
                     switch($this->type) {
                         case 'question':
-                            $extraFieldValue = $app['orm.ems']['db_write']->getRepository('Entity\QuestionFieldValues')->find($field_values['id']);
+                            $extraFieldValue = $app['orm.ems']['db_write']->getRepository('ChamiloLMS\Entity\QuestionFieldValues')->find($field_values['id']);
                             $extraFieldValue->setUserId(api_get_user_id());
                             $extraFieldValue->setQuestionId($params[$this->handler_id]);
                             break;
                         case 'course':
-                            $extraFieldValue = $app['orm.ems']['db_write']->getRepository('Entity\CourseFieldValues')->find($field_values['id']);
+                            $extraFieldValue = $app['orm.ems']['db_write']->getRepository('ChamiloLMS\Entity\CourseFieldValues')->find($field_values['id']);
                             $extraFieldValue->setUserId(api_get_user_id());
                             $extraFieldValue->setCourseCode($params[$this->handler_id]);
                             break;
                         case 'user':
-                            $extraFieldValue = $app['orm.ems']['db_write']->getRepository('Entity\UserFieldValues')->find($field_values['id']);
+                            $extraFieldValue = $app['orm.ems']['db_write']->getRepository('ChamiloLMS\Entity\UserFieldValues')->find($field_values['id']);
                             $extraFieldValue->setUserId(api_get_user_id());
                             $extraFieldValue->setAuthorId(api_get_user_id());
                             break;
                         case 'session':
-                            $extraFieldValue = $app['orm.ems']['db_write']->getRepository('Entity\SessionFieldValues')->find($field_values['id']);
+                            $extraFieldValue = $app['orm.ems']['db_write']->getRepository('ChamiloLMS\Entity\SessionFieldValues')->find($field_values['id']);
                             $extraFieldValue->setUserId(api_get_user_id());
                             $extraFieldValue->setSessionId($params[$this->handler_id]);
                             break;

+ 1 - 1
main/inc/lib/fileManager.lib.php

@@ -1627,7 +1627,7 @@ class FileManager
         if (is_array($course)) {
             $c_id = $course['real_id'];
         } else {
-            if ($course instanceof \Entity\Course) {
+            if ($course instanceof \ChamiloLMS\Entity\Course) {
                 $c_id = $course->getId();
             }
         }

+ 6 - 6
main/inc/lib/usermanager.lib.php

@@ -338,11 +338,11 @@ class UserManager
 
 
             // Adding user
-            /** @var Entity\User $user */
+            /** @var ChamiloLMS\Entity\User $user */
             $em = self::$em;
 
-            $user = $em->getRepository('Entity\User')->find($return);
-            $role = $em->getRepository('Entity\Role')->find($status);
+            $user = $em->getRepository('ChamiloLMS\Entity\User')->find($return);
+            $role = $em->getRepository('ChamiloLMS\Entity\Role')->find($status);
 
             $user->getRolesObj()->add($role);
             $em->persist($user);
@@ -793,10 +793,10 @@ class UserManager
 
         global $app;
         // Adding user
-        /** @var Entity\User $user */
+        /** @var ChamiloLMS\Entity\User $user */
         $em = $app['orm.ems']['db_write'];
-        $user = $em->getRepository('Entity\User')->find($user_id);
-        $role = $em->getRepository('Entity\Role')->find($status);
+        $user = $em->getRepository('ChamiloLMS\Entity\User')->find($user_id);
+        $role = $em->getRepository('ChamiloLMS\Entity\Role')->find($status);
 
         $user->getRolesObj()->remove(0);
         $user->getRolesObj()->add($role);

+ 39 - 53
main/inc/services.php

@@ -9,17 +9,28 @@
 
 // Needed to use the "entity" option in symfony forms
 use Doctrine\Common\Persistence\AbstractManagerRegistry;
+use Symfony\Bridge\Doctrine\Form\DoctrineOrmExtension;
+use Symfony\Bridge\Doctrine\Validator\Constraints\UniqueEntityValidator;
+use Symfony\Component\Security\Core\Encoder\MessageDigestPasswordEncoder;
+use Symfony\Component\Security\Core\Authorization\AccessDecisionManager;
 use FranMoreno\Silex\Provider\PagerfantaServiceProvider;
 use Silex\Application;
 use Silex\ServiceProviderInterface;
-use Symfony\Component\Security\Core\Encoder\MessageDigestPasswordEncoder;
-use Symfony\Component\Security\Core\Authorization\AccessDecisionManager;
+use Silex\Provider\SecurityServiceProvider;
 use MediaAlchemyst\Alchemyst;
 use MediaAlchemyst\MediaAlchemystServiceProvider;
 use MediaVorus\MediaVorusServiceProvider;
 use FFMpeg\FFMpegServiceProvider;
 use PHPExiftool\PHPExiftoolServiceProvider;
+use Knp\Provider\ConsoleServiceProvider;
+
+use ChamiloLMS\Component\Auth\LoginSuccessHandler;
+use ChamiloLMS\Component\Auth\LogoutSuccessHandler;
+use ChamiloLMS\Component\Auth\LoginListener;
 use ChamiloLMS\Component\Editor\Connector;
+use ChamiloLMS\Component\Validator\ConstraintValidatorFactory;
+use ChamiloLMS\Component\Mail\MailGenerator;
+use ChamiloLMS\Component\DataFilesystem\DataFilesystem;
 
 // Flint
 $app->register(new Flint\Provider\ConfigServiceProvider());
@@ -66,8 +77,6 @@ if (isset($app['configuration']['services']['media-alchemyst'])) {
     ));
 }
 
-use Knp\Provider\ConsoleServiceProvider;
-
 $app->register(new ConsoleServiceProvider(), array(
     'console.name'              => 'Chamilo',
     'console.version'           => '1.0.0',
@@ -100,14 +109,6 @@ $app->register(new Silex\Provider\HttpCacheServiceProvider(), array(
     'http_cache.cache_dir' => $app['http_cache.cache_dir'].'/',
 ));*/
 
-class SecurityServiceProvider extends \Silex\Provider\SecurityServiceProvider
-{
-    public function addFakeRoute($method, $pattern, $name)
-    {
-        // Dont do anything otherwise the closures will be dumped and that leads to fatal errors.
-    }
-}
-
 $app->register(new SecurityServiceProvider, array(
     'security.firewalls' => array(
         'login' => array(
@@ -128,7 +129,7 @@ $app->register(new SecurityServiceProvider, array(
                 'target' => '/'
             ),
             'users' => $app->share(function() use ($app) {
-                return $app['orm.em']->getRepository('Entity\User');
+                return $app['orm.em']->getRepository('ChamiloLMS\Entity\User');
             }),
             'switch_user' => true,
             'anonymous' => true
@@ -141,22 +142,26 @@ $app['security.encoder.digest'] = $app->share(function($app) {
     // use the sha1 algorithm
     // don't base64 encode the password
     // use only 1 iteration
-    return new MessageDigestPasswordEncoder($app['configuration']['password_encryption'], false, 1);
+    return new MessageDigestPasswordEncoder(
+        $app['configuration']['password_encryption'],
+        false,
+        1
+    );
 });
 
 // What to do when login success?
 $app['security.authentication.success_handler.secured'] = $app->share(function($app) {
-    return new ChamiloLMS\Component\Auth\LoginSuccessHandler($app['url_generator'], $app['security']);
+    return new LoginSuccessHandler($app['url_generator'], $app['security']);
 });
 
 // What to do when logout?
 $app['security.authentication.logout_handler.secured'] = $app->share(function($app) {
-    return new ChamiloLMS\Component\Auth\LogoutSuccessHandler($app['url_generator'], $app['security']);
+    return new LogoutSuccessHandler($app['url_generator'], $app['security']);
 });
 
 // What to do when switch user?
 $app['security.authentication_listener.switch_user.secured'] = $app->share(function($app) {
-    return new ChamiloLMS\Component\Auth\LoginListener();
+    return new LoginListener();
 });
 
 // Role hierarchy
@@ -297,21 +302,28 @@ class ManagerRegistry extends AbstractManagerRegistry
 
 // Setting up the Manager registry in order to use entity in forms.
 $app['manager_registry'] = $app->share(function() use ($app) {
-    $managerRegistry = new ManagerRegistry(null, array('db'), array('orm.em'), null, null, $app['orm.proxies_namespace']);
+    $managerRegistry = new ManagerRegistry(
+        null,
+        array('db'),
+        array('orm.em'),
+        null,
+        null,
+        $app['orm.proxies_namespace']
+    );
     $managerRegistry->setContainer($app);
     return $managerRegistry;
 });
 
 // Needed to use the "entity" option in Symfony forms.
 $app['form.extensions'] = $app->share($app->extend('form.extensions', function ($extensions, $app) {
-    $extensions[] = new \Symfony\Bridge\Doctrine\Form\DoctrineOrmExtension($app['manager_registry']);
+    $extensions[] = new DoctrineOrmExtension($app['manager_registry']);
     return $extensions;
 }));
 
 // Needed to use the "UniqueEntity" validator.
 $app['validator.validator_factory'] = $app->share(function ($app) {
-    $uniqueValidator = new Symfony\Bridge\Doctrine\Validator\Constraints\UniqueEntityValidator($app['manager_registry']);
-    $factory = new ChamiloLMS\Component\Validator\ConstraintValidatorFactory();
+    $uniqueValidator = new UniqueEntityValidator($app['manager_registry']);
+    $factory = new ConstraintValidatorFactory();
     $factory->addInstance('doctrine.orm.validator.unique', $uniqueValidator);
     return $factory;
 });
@@ -376,8 +388,8 @@ if (isset($app['configuration']['main_database'])) {
             (Example: use Doctrine\ORM\Mapping AS ORM, @ORM\Entity)*/
             'use_simple_annotation_reader' => false,
             'type' => 'annotation',
-            'namespace' => 'Entity',
-            'path' => api_get_path(INCLUDE_PATH).'Entity',
+            'namespace' => 'ChamiloLMS\Entity',
+            'path' => api_get_path(SYS_PATH).'src/ChamiloLMS/Entity',
             // 'orm.default_cache' =>
         ),
         array(
@@ -500,32 +512,6 @@ $app->register(new Grom\Silex\ImagineServiceProvider(), array(
     'imagine.factory' => 'Gd'
 ));
 
-// Prompts Doctrine SQL queries using Monolog.
-
-/*$app['dbal_logger'] = $app->share(function() {
-    return new Doctrine\DBAL\Logging\DebugStack();
-});*/
-
-if ($app['debug']) {
-    /*$logger = new Doctrine\DBAL\Logging\DebugStack();
-    $app['db.config']->setSQLLogger($logger);
-    $app->after(function() use ($app, $logger) {
-        // Log all queries as DEBUG.
-        $app['monolog']->addDebug('---- Doctrine SQL queries ----');
-        foreach ($logger->queries as $query) {
-            $app['monolog']->addDebug(
-                $query['sql'],
-                array(
-                    'params' => $query['params'],
-                    'types'  => $query['types'],
-                    'executionMS' => $query['executionMS']
-                )
-            );
-        }
-        $app['monolog']->addDebug('---- End Doctrine SQL queries ----');
-    });*/
-}
-
 // Email service provider.
 $app->register(new Silex\Provider\SwiftmailerServiceProvider(), array(
     'swiftmailer.options' => array(
@@ -677,7 +663,7 @@ class ChamiloServiceProvider implements ServiceProviderInterface
 
             if (!empty($courseCode)) {
                 // Converting /courses/XXX/ to a Entity/Course object.
-                return $app['orm.em']->getRepository('Entity\Course')->findOneByCode($courseCode);
+                return $app['orm.em']->getRepository('ChamiloLMS\Entity\Course')->findOneByCode($courseCode);
                 //$app['template']->assign('course', $course);
                 return $course;
             }
@@ -692,7 +678,7 @@ class ChamiloServiceProvider implements ServiceProviderInterface
                 $sessionId = $session->get('id_session');
             }
             if (!empty($sessionId)) {
-                return $app['orm.em']->getRepository('Entity\Session')->findOneById($sessionId);
+                return $app['orm.em']->getRepository('ChamiloLMS\Entity\Session')->findOneById($sessionId);
 //                $app['template']->assign('course_session', $courseSession);
                 return $courseSession;
             }
@@ -705,7 +691,7 @@ class ChamiloServiceProvider implements ServiceProviderInterface
             if (isset($app['configuration']['services']['media-alchemyst'])) {
                 $mediaConverter = $app['media-alchemyst'];
             }
-            $filesystem = new ChamiloLMS\Component\DataFilesystem\DataFilesystem(
+            $filesystem = new DataFilesystem(
                 $app['paths'],
                 $app['filesystem'],
                 $app['editor_connector'],
@@ -722,7 +708,7 @@ class ChamiloServiceProvider implements ServiceProviderInterface
 
         // Mail template generator.
         $app['mail_generator'] = $app->share(function () use ($app) {
-            $mailGenerator = new ChamiloLMS\Component\Mail\MailGenerator($app['twig'], $app['mailer']);
+            $mailGenerator = new MailGenerator($app['twig'], $app['mailer']);
             return $mailGenerator;
         });
 

+ 16 - 16
main/link/link.class.php

@@ -12,8 +12,8 @@ namespace Link;
 
 /**
  * Model for Link/Urls
- * 
- * 
+ *
+ *
  * @author Laurent Opprecht <laurent@opprecht.info> for the Univesity of Genevas
  * @license /license.txt
  */
@@ -21,11 +21,11 @@ class Link
 {
 
     /**
-     * @return \Entity\Repository\LinkRepository
+     * @return \ChamiloLMS\Entity\Repository\LinkRepository
      */
     public static function repository()
     {
-        return \Entity\Repository\LinkRepository::instance();
+        return \ChamiloLMS\Entity\Repository\LinkRepository::instance();
     }
 
     /**
@@ -134,7 +134,7 @@ class Link
     /**
      * Get c_id
      *
-     * @return integer 
+     * @return integer
      */
     public function get_c_id()
     {
@@ -156,7 +156,7 @@ class Link
     /**
      * Get id
      *
-     * @return integer 
+     * @return integer
      */
     public function get_id()
     {
@@ -178,7 +178,7 @@ class Link
     /**
      * Get url
      *
-     * @return text 
+     * @return text
      */
     public function get_url()
     {
@@ -200,7 +200,7 @@ class Link
     /**
      * Get title
      *
-     * @return string 
+     * @return string
      */
     public function get_title()
     {
@@ -222,7 +222,7 @@ class Link
     /**
      * Get description
      *
-     * @return text 
+     * @return text
      */
     public function get_description()
     {
@@ -244,7 +244,7 @@ class Link
     /**
      * Get category_id
      *
-     * @return integer 
+     * @return integer
      */
     public function get_category_id()
     {
@@ -266,7 +266,7 @@ class Link
     /**
      * Get display_order
      *
-     * @return integer 
+     * @return integer
      */
     public function get_display_order()
     {
@@ -288,7 +288,7 @@ class Link
     /**
      * Get on_homepage
      *
-     * @return string 
+     * @return string
      */
     public function get_on_homepage()
     {
@@ -310,7 +310,7 @@ class Link
     /**
      * Get target
      *
-     * @return string 
+     * @return string
      */
     public function get_target()
     {
@@ -332,7 +332,7 @@ class Link
     /**
      * Get session_id
      *
-     * @return integer 
+     * @return integer
      */
     public function get_session_id()
     {
@@ -369,10 +369,10 @@ class Link
         if (!in_array('curl', get_loaded_extensions())) {
             true;
         }
-        
+
         $defaults = array(
             CURLOPT_URL => $url,
-            CURLOPT_FOLLOWLOCATION => true,                 
+            CURLOPT_FOLLOWLOCATION => true,
             CURLOPT_HEADER => 0,
             CURLOPT_NOBODY => true,
             CURLOPT_TIMEOUT => 4,

+ 11 - 11
main/newscorm/learnpath.class.php

@@ -10545,7 +10545,7 @@ EOD;
     {
         global $app;
         $em = $app['orm.ems']['db_write'];
-        $item = new Entity\CLpCategory();
+        $item = new ChamiloLMS\Entity\CLpCategory();
         $item->setName($params['name']);
         $item->setCId($params['c_id']);
         $em->persist($item);
@@ -10556,7 +10556,7 @@ EOD;
     {
         global $app;
         $em = $app['orm.ems']['db_write'];
-        $item = $em->find('Entity\CLpCategory', $params['id']);
+        $item = $em->find('ChamiloLMS\Entity\CLpCategory', $params['id']);
         if ($item) {
             $item->setName($params['name']);
             $item->setCId($params['c_id']);
@@ -10569,7 +10569,7 @@ EOD;
     {
         global $app;
         $em = $app['orm.ems']['db_write'];
-        $item = $em->find('Entity\CLpCategory', $id);
+        $item = $em->find('ChamiloLMS\Entity\CLpCategory', $id);
         if ($item) {
             $position = $item->getPosition() - 1;
             $item->setPosition($position);
@@ -10582,7 +10582,7 @@ EOD;
     {
         global $app;
         $em = $app['orm.ems']['db_write'];
-        $item = $em->find('Entity\CLpCategory', $id);
+        $item = $em->find('ChamiloLMS\Entity\CLpCategory', $id);
         if ($item) {
             $position = $item->getPosition() + 1;
             $item->setPosition($position);
@@ -10598,7 +10598,7 @@ EOD;
             return 0;
         }
         $em = $app['orm.em'];
-        $query = $em->createQuery('SELECT COUNT(u.id) FROM Entity\CLpCategory u WHERE u.cId = :id');
+        $query = $em->createQuery('SELECT COUNT(u.id) FROM ChamiloLMS\Entity\CLpCategory u WHERE u.cId = :id');
         $query->setParameter('id', $course_id);
         return $query->getSingleScalarResult();
     }
@@ -10609,13 +10609,13 @@ EOD;
         global $app;
         $em = $app['orm.em'];
         //Default behaviour
-        /*$items = $em->getRepository('Entity\CLpCategory')->findBy(
+        /*$items = $em->getRepository('ChamiloLMS\Entity\CLpCategory')->findBy(
             array('cId' => $course_id),
             array('name' => 'ASC')
         );*/
 
         //Using doctrine extensions
-        $items = $em->getRepository('Entity\CLpCategory')->getBySortableGroupsQuery(
+        $items = $em->getRepository('ChamiloLMS\Entity\CLpCategory')->getBySortableGroupsQuery(
             array('cId' => $course_id)
         )->getResult();
 
@@ -10626,7 +10626,7 @@ EOD;
     {
         global $app;
         $em = $app['orm.em'];
-        $item = $em->find('Entity\CLpCategory', $id);
+        $item = $em->find('ChamiloLMS\Entity\CLpCategory', $id);
 
         return $item;
     }
@@ -10634,7 +10634,7 @@ EOD;
     static function get_category_by_course($course_id)
     {
         global $app;
-        $items = $app['orm.em']->getRepository('Entity\CLpCategory')->findBy(array('cId' => $course_id));
+        $items = $app['orm.em']->getRepository('ChamiloLMS\Entity\CLpCategory')->findBy(array('cId' => $course_id));
 
         return $items;
     }
@@ -10643,11 +10643,11 @@ EOD;
     {
         global $app;
         $em = $app['orm.ems']['db_write'];
-        $item = $em->find('Entity\CLpCategory', $id);
+        $item = $em->find('ChamiloLMS\Entity\CLpCategory', $id);
         if ($item) {
 
             $courseId = $item->getCId();
-            $query = $em->createQuery('SELECT u FROM Entity\CLp u WHERE u.cId = :id AND u.categoryId = :catId');
+            $query = $em->createQuery('SELECT u FROM ChamiloLMS\Entity\CLp u WHERE u.cId = :id AND u.categoryId = :catId');
             $query->setParameter('id', $courseId);
             $query->setParameter('catId', $item->getId());
             $lps = $query->getResult();

+ 1 - 1
main/newscorm/lp_list.php

@@ -106,7 +106,7 @@ $token = Security::get_token();
 /* DISPLAY SCORM LIST */
 
 $categories_temp = learnpath::get_categories(api_get_course_int_id());
-$category_test = new Entity\CLpCategory();
+$category_test = new ChamiloLMS\Entity\CLpCategory();
 $category_test->setId(0);
 $category_test->setName(get_lang('WithOutCategory'));
 $category_test->setPosition(0);

+ 8 - 8
main/pages/index.php

@@ -44,7 +44,7 @@ class PagesController {
 
     function editAction(Application $app, $id) {
         $request = $app['request'];
-        $page = $app['orm.em']->find('Entity\Pages', $id);
+        $page = $app['orm.em']->find('ChamiloLMS\Entity\Pages', $id);
 
         if (empty($page)) {
             $app->abort(404, "Page $id does not exist.");
@@ -66,7 +66,7 @@ class PagesController {
     }
 
     function showAction(Application $app, $id) {
-        $page = $app['orm.em']->find('Entity\Pages', $id);
+        $page = $app['orm.em']->find('ChamiloLMS\Entity\Pages', $id);
         $actions = Display::url(Display::return_icon('list.png', get_lang('Listing'), array(), ICON_SIZE_MEDIUM), $app['url_generator']->generate('index'));
         return $app['template']->render_template('pages/show.tpl', array(
             'page' => $page,
@@ -76,7 +76,7 @@ class PagesController {
 
     function deleteAction(Application $app, $id) {
         $em = $app['orm.em'];
-        $page = $em->find('Entity\Pages', $id);
+        $page = $em->find('ChamiloLMS\Entity\Pages', $id);
         $em->remove($page);
         $em->flush();
         return $app->redirect($app['url_generator']->generate('index'), 201);
@@ -84,7 +84,7 @@ class PagesController {
 
     function listAction(Application $app, $page = 1) {
         /*
-        $source = new Entity('Entity\Pages');
+        $source = new Entity('ChamiloLMS\Entity\Pages');
         $grid = new Grid();
 
         // Attach the source to the grid
@@ -95,12 +95,12 @@ class PagesController {
         */
 
         $em = $app['orm.em'];
-        $dql = 'SELECT a FROM Entity\Pages a';
+        $dql = 'SELECT a FROM ChamiloLMS\Entity\Pages a';
         $query = $em->createQuery($dql)->setFirstResult(0)->setMaxResults(100);
 
         //or using the repository
         //
-        //$query = $em->getRepository('Entity\Pages')->getLatestPages();
+        //$query = $em->getRepository('ChamiloLMS\Entity\Pages')->getLatestPages();
 
         $adapter = new DoctrineORMAdapter($query);
         $pagerfanta = new Pagerfanta($adapter);
@@ -133,7 +133,7 @@ class PagesController {
 
     function getForm(Application $app, $entity = null) {
         if (empty($entity)) {
-            $entity = new Entity\Pages();
+            $entity = new ChamiloLMS\Entity\Pages();
         }
         $form = $app['form.factory']->createBuilder('form', $entity);
         $form->add('title', 'text', array(
@@ -163,4 +163,4 @@ $app->match('/edit/{id}', 'pages.controller:editAction', 'GET|POST')
     ->bind('edit')
     ->assert('id', '\d+');
 $app->match('/add', 'pages.controller:addAction', 'GET|POST')->bind('add');
-$app->run();
+$app->run();

+ 4 - 6
main/timeline/index.php

@@ -4,15 +4,13 @@ require_once '../inc/global.inc.php';
 
 use Silex\Application;
 use Symfony\Component\HttpFoundation\Response;
-use Entity\CTimeline;
+use ChamiloLMS\Entity\CTimeline;
 
 class TimeLineController {
 
     function indexAction(Application $app) {
-        $timeline_query = $app['orm.em']->getRepository('Entity\CTimeline')->findAll();
-
-        $timeline_query = $app['orm.em']->createQuery('SELECT a FROM Entity\CTimeline a');
-
+        $timeline_query = $app['orm.em']->getRepository('ChamiloLMS\Entity\CTimeline')->findAll();
+        $timeline_query = $app['orm.em']->createQuery('SELECT a FROM ChamiloLMS\Entity\CTimeline a');
 
         $paginator = new Doctrine\ORM\Tools\Pagination\Paginator($timeline_query, $fetchJoinCollection = true);
         $c = count($paginator);
@@ -86,4 +84,4 @@ $app->get('/', 'TimeLineController::indexAction')->bind('index');
 $app->get('/view/{id}', 'TimeLineController::viewAction')->bind('view');
 $app->get('/edit/{id}', 'TimeLineController::editAction')->bind('edit');
 $app->match('/add', 'TimeLineController::addAction', 'GET|POST')->bind('add');
-$app->run();
+$app->run();

+ 1 - 1
src/ChamiloLMS/Component/Auth/LoginListener.php

@@ -13,7 +13,7 @@ class LoginListener
      */
     public function onSecuritySwitchUser(SwitchUserEvent $event)
     {
-        /** @var \Entity\User $user */
+        /** @var \ChamiloLMS\Entity\User $user */
         $user = $event->getTargetUser();
         /*var_dump($user );
         var_dump($event->getRequest()->getUser());

+ 4 - 1
src/ChamiloLMS/Component/Auth/LoginSuccessHandler.php

@@ -9,6 +9,7 @@ use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\RedirectResponse;
 use Symfony\Component\Routing\Router;
 use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
+use ChamiloLMS\Entity\User;
 
 /**
  * Class LoginSuccessHandler
@@ -35,10 +36,12 @@ class LoginSuccessHandler implements AuthenticationSuccessHandlerInterface
      */
     public function onAuthenticationSuccess(Request $request, TokenInterface $token)
     {
-        /** @var \Entity\User $user */
+        /** @var User $user */
         $user = $token->getUser();
         $userId = $user->getUserId();
 
+        //$path = UserManager::get_user_picture_path_by_id($userId, 'system', true);
+
         $session = $request->getSession();
 
         \ChamiloSession::setSession($session);

+ 1 - 1
src/ChamiloLMS/Component/Auth/Role.php

@@ -6,7 +6,7 @@ namespace ChamiloLMS\Component\Auth;
 use Symfony\Component\Security\Core\Role\RoleInterface;
 use Symfony\Component\Security\Core\User\AdvancedUserInterface;
 use Doctrine\Common\Collections\ArrayCollection;
-use Entity\CourseRelUser;
+use ChamiloLMS\Entity\CourseRelUser;
 
 /**
  * Class Role

+ 1 - 1
src/ChamiloLMS/Component/Editor/CkEditor/CkEditor.php

@@ -72,7 +72,7 @@ class CkEditor extends Editor
         if (empty($templates)) {
             return null;
         }
-        /** @var \Entity\SystemTemplate $template */
+        /** @var \ChamiloLMS\Entity\SystemTemplate $template */
         $templateList = array();
 
         $search = array('{CSS}', '{IMG_DIR}', '{REL_PATH}', '{COURSE_DIR}');

+ 2 - 2
src/ChamiloLMS/Component/Editor/Connector.php

@@ -3,8 +3,8 @@
 namespace ChamiloLMS\Component\Editor;
 
 use Doctrine\ORM\EntityManager;
-use \Entity\User;
-use \Entity\Course;
+use ChamiloLMS\Entity\User;
+use ChamiloLMS\Entity\Course;
 
 use Symfony\Component\Translation\Translator;
 use Symfony\Component\Routing\Router;

+ 4 - 4
src/ChamiloLMS/Component/Editor/Driver/DropBoxDriver.php

@@ -2,7 +2,7 @@
 /* For licensing terms, see /license.txt */
 namespace ChamiloLMS\Component\Editor\Driver;
 
-use Entity\CDropboxFile;
+use ChamiloLMS\Entity\CDropboxFile;
 use ChamiloLMS\Component\Editor\Connector;
 
 /**
@@ -68,8 +68,8 @@ class DropBoxDriver extends \elFinderVolumeMySQL implements InterfaceDriver
     {
         if ($this->connector->security->isGranted('IS_AUTHENTICATED_FULLY')) {
 
-            /** @var \Entity\Repository\UserRepository $repository */
-            /*$repository = $this->connector->entityManager->getRepository('Entity\User');
+            /** @var \ChamiloLMS\Entity\Repository\UserRepository $repository */
+            /*$repository = $this->connector->entityManager->getRepository('ChamiloLMS\Entity\User');
             $courses = $repository->getCourses($this->connector->user);*/
 
             //if (!empty($courses)) {
@@ -205,7 +205,7 @@ class DropBoxDriver extends \elFinderVolumeMySQL implements InterfaceDriver
             return $this->returnDirectory();
         }
 
-        $file = $this->connector->entityManager->getRepository('Entity\CDropboxFile')->findOneBy($criteria);
+        $file = $this->connector->entityManager->getRepository('ChamiloLMS\Entity\CDropboxFile')->findOneBy($criteria);
 
         if ($file) {
             $stat = $this->transformFileInStat($file);

+ 12 - 10
src/ChamiloLMS/Controller/Admin/Administrator/BranchController.php

@@ -11,6 +11,8 @@ use Symfony\Component\HttpFoundation\Response;
 use Entity;
 use ChamiloLMS\Form\BranchType;
 use ChamiloLMS\Form\BranchUsersType;
+use ChamiloLMS\Entity\BranchUsers;
+use ChamiloLMS\Entity\BranchSync;
 
 use Symfony\Component\Routing\Annotation\Route;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Method;
@@ -53,7 +55,7 @@ class BranchController extends CommonController
         $query = $this->getManager()
             ->createQueryBuilder()
             ->select('node')
-            ->from('Entity\BranchSync', 'node')
+            ->from('ChamiloLMS\Entity\BranchSync', 'node')
             //->where('node.cId = 0')
             ->orderBy('node.root, node.lft', 'ASC')
             ->getQuery();
@@ -73,7 +75,7 @@ class BranchController extends CommonController
     public function addDirectorAction($id)
     {
         $type = new BranchUsersType();
-        $branchUsers =  new Entity\BranchUsers();
+        $branchUsers = new BranchUsers();
 
         $form = $this->createForm($type, $branchUsers);
         $request = $this->getRequest();
@@ -84,7 +86,7 @@ class BranchController extends CommonController
 
                 $userIdList = $item->getUserId();
                 $userId = ($userIdList[0]);
-                $user = $this->getManager()->getRepository('Entity\User')->find($userId);
+                $user = $this->getManager()->getRepository('ChamiloLMS\Entity\User')->find($userId);
                 if (!$user) {
                     throw new \Exception('Unable to found User');
                 }
@@ -127,7 +129,7 @@ class BranchController extends CommonController
             'branchId' => $id,
             'userId' => $userId
         );
-        $branchUser = $this->getManager()->getRepository('Entity\BranchUsers')->findOneBy($criteria);
+        $branchUser = $this->getManager()->getRepository('ChamiloLMS\Entity\BranchUsers')->findOneBy($criteria);
 
         if (!$branchUser) {
             $this->createNotFoundException();
@@ -150,7 +152,7 @@ class BranchController extends CommonController
         $template = $this->get('template');
         $template->assign('links', $this->generateLinks());
 
-        /** @var \Entity\Repository\BranchSyncRepository $repo */
+        /** @var \ChamiloLMS\Entity\Repository\BranchSyncRepository $repo */
         $repo = $this->getRepository();
         $item = $this->getEntity($id);
 
@@ -179,7 +181,7 @@ class BranchController extends CommonController
         $request = $this->getRequest();
         $formType = $this->getFormType();
 
-        $branch = new Entity\BranchSync();
+        $branch = new BranchSync();
         $branch->setParentId($id);
 
         $form = $this->get('form.factory')->create($formType, $branch);
@@ -254,7 +256,7 @@ class BranchController extends CommonController
         $entities = $repo->searchByKeyword($keyword);
         $data = array();
         if ($entities) {
-            /** Entity\BranchSync $entity */
+            /** @var BranchSync $entity */
             foreach ($entities as $entity) {
                 $data[] = array(
                     'key' => (string) $entity->getId(),
@@ -304,11 +306,11 @@ class BranchController extends CommonController
     }
 
     /**
-     * @return \Entity\Repository\BranchSyncRepository
+     * @return \ChamiloLMS\Entity\Repository\BranchSyncRepository
      */
     protected function getRepository()
     {
-        return $this->get('orm.em')->getRepository('Entity\BranchSync');
+        return $this->get('orm.em')->getRepository('ChamiloLMS\Entity\BranchSync');
     }
 
     /**
@@ -316,7 +318,7 @@ class BranchController extends CommonController
      */
     protected function getNewEntity()
     {
-        return new Entity\BranchSync();
+        return new BranchSync();
     }
 
     /**

+ 11 - 9
src/ChamiloLMS/Controller/Admin/Administrator/JuryController.php

@@ -12,6 +12,8 @@ use ChamiloLMS\Form\JuryType;
 use ChamiloLMS\Form\JuryUserType;
 use ChamiloLMS\Form\JuryMembersType;
 use Symfony\Component\HttpFoundation\JsonResponse;
+use ChamiloLMS\Entity\JuryMembers;
+use ChamiloLMS\Entity\Jury;
 
 use Symfony\Component\Routing\Annotation\Route;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Method;
@@ -85,7 +87,7 @@ class JuryController extends CommonController
     */
     public function removeMemberAction($id)
     {
-        $juryMembers = $this->getManager()->getRepository('Entity\JuryMembers')->find($id);
+        $juryMembers = $this->getManager()->getRepository('ChamiloLMS\Entity\JuryMembers')->find($id);
         if ($juryMembers) {
             $em = $this->getManager();
             $em->remove($juryMembers);
@@ -107,8 +109,8 @@ class JuryController extends CommonController
         $keyword = $request->get('tag');
 
         $role = $request->get('role');
-        /** @var Entity\Repository\UserRepository $repo */
-        $repo = $this->getManager()->getRepository('Entity\User');
+        /** @var \ChamiloLMS\Entity\Repository\UserRepository $repo */
+        $repo = $this->getManager()->getRepository('ChamiloLMS\Entity\User');
 
         if (empty($role)) {
             $entities = $repo->searchUserByKeyword($keyword);
@@ -118,7 +120,7 @@ class JuryController extends CommonController
 
         $data = array();
         if ($entities) {
-            /** @var \Entity\User $entity */
+            /** @var \ChamiloLMS\Entity\User $entity */
             foreach ($entities as $entity) {
                 $data[] = array(
                     'key' => (string) $entity->getUserId(),
@@ -136,19 +138,19 @@ class JuryController extends CommonController
     public function addMembersAction(Application $app, $id)
     {
         $juryUserType = new JuryMembersType();
-        $juryMember =  new Entity\JuryMembers();
+        $juryMember =  new JuryMembers();
         $juryMember->setJuryId($id);
         $form = $this->createForm($juryUserType, $juryMember);
         $request = $this->getRequest();
         if ($request->getMethod() == 'POST') {
             $form->bind($request);
             if ($form->isValid()) {
-                /** @var Entity\JuryMembers $item */
+                /** @var JuryMembers $item */
                 $item = $form->getData();
 
                 $userIdList = $item->getUserId();
                 $userId = ($userIdList[0]);
-                $user = $this->getManager()->getRepository('Entity\User')->find($userId);
+                $user = $this->getManager()->getRepository('ChamiloLMS\Entity\User')->find($userId);
                 if (!$user) {
                     throw new \Exception('Unable to found User');
                 }
@@ -204,7 +206,7 @@ class JuryController extends CommonController
      */
     protected function getRepository()
     {
-        return $this->get('orm.em')->getRepository('Entity\Jury');
+        return $this->get('orm.em')->getRepository('ChamiloLMS\Entity\Jury');
     }
 
     /**
@@ -212,7 +214,7 @@ class JuryController extends CommonController
      */
     protected function getNewEntity()
     {
-        return new Entity\Jury();
+        return new Jury();
     }
 
     /**

+ 4 - 3
src/ChamiloLMS/Controller/Admin/Administrator/QuestionScoreController.php

@@ -9,8 +9,9 @@ use Symfony\Component\Form\Extension\Validator\Constraints\FormValidator;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Routing\Annotation\Route;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Method;
-use Entity;
+use ChamiloLMS\Entity;
 use ChamiloLMS\Form\QuestionScoreType;
+use ChamiloLMS\Entity\QuestionScore;
 
 /**
  * Class QuestionScoreController
@@ -97,7 +98,7 @@ class QuestionScoreController extends CommonController
     */
     protected function getRepository()
     {
-        return $this->get('orm.em')->getRepository('Entity\QuestionScore');
+        return $this->get('orm.em')->getRepository('ChamiloLMS\Entity\QuestionScore');
     }
 
     /**
@@ -105,7 +106,7 @@ class QuestionScoreController extends CommonController
      */
     protected function getNewEntity()
     {
-        return new Entity\QuestionScore();
+        return new QuestionScore();
     }
 
     /**

+ 4 - 3
src/ChamiloLMS/Controller/Admin/Administrator/QuestionScoreNameController.php

@@ -9,8 +9,9 @@ use Symfony\Component\Form\Extension\Validator\Constraints\FormValidator;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Routing\Annotation\Route;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Method;
-use Entity;
+use ChamiloLMS\Entity;
 use ChamiloLMS\Form\QuestionScoreNameType;
+use ChamiloLMS\Entity\QuestionScoreName;
 
 /**
  * Class QuestionScoreController
@@ -78,7 +79,7 @@ class QuestionScoreNameController extends CommonController
      */
     protected function getRepository()
     {
-        return $this->get('orm.em')->getRepository('Entity\QuestionScoreName');
+        return $this->get('orm.em')->getRepository('ChamiloLMS\Entity\QuestionScoreName');
     }
 
      /**
@@ -86,7 +87,7 @@ class QuestionScoreNameController extends CommonController
      */
     protected function getNewEntity()
     {
-        return new Entity\QuestionScoreName();
+        return new QuestionScoreName();
     }
 
     /**

+ 4 - 3
src/ChamiloLMS/Controller/Admin/Administrator/RoleController.php

@@ -7,8 +7,9 @@ use ChamiloLMS\Controller\CommonController;
 use Silex\Application;
 use Symfony\Component\Form\Extension\Validator\Constraints\FormValidator;
 use Symfony\Component\HttpFoundation\Response;
-use Entity;
+use ChamiloLMS\Entity;
 use ChamiloLMS\Form\RoleType;
+use ChamiloLMS\Entity\Role;
 use Symfony\Component\Routing\Annotation\Route;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Method;
 
@@ -87,7 +88,7 @@ class RoleController extends CommonController
      */
     protected function getRepository()
     {
-        return $this->get('orm.em')->getRepository('Entity\Role');
+        return $this->get('orm.em')->getRepository('ChamiloLMS\Entity\Role');
     }
 
     /**
@@ -95,7 +96,7 @@ class RoleController extends CommonController
      */
     protected function getNewEntity()
     {
-        return new Entity\Role();
+        return new Role();
     }
 
     /**

+ 1 - 1
src/ChamiloLMS/Controller/Admin/Administrator/UpgradeController.php

@@ -194,7 +194,7 @@ class UpgradeController extends CommonController
     }
 
     /**
-     * @return \Entity\Repository\BranchSyncRepository
+     * @return \ChamiloLMS\Entity\Repository\BranchSyncRepository
      */
     protected function getRepository()
     {

+ 15 - 14
src/ChamiloLMS/Controller/Admin/Director/BranchDirectorController.php

@@ -6,13 +6,15 @@ namespace ChamiloLMS\Controller\Admin\Director;
 use ChamiloLMS\Controller\CommonController;
 use ChamiloLMS\Form\BranchType;
 use ChamiloLMS\Form\DirectorJuryUserType;
-
 use ChamiloLMS\Form\JuryType;
-use Entity;
+use ChamiloLMS\Entity;
+use ChamiloLMS\Entity\BranchSync;
+use ChamiloLMS\Entity\Jury;
+use ChamiloLMS\Entity\User;
+use ChamiloLMS\Entity\JuryMembers;
 use Silex\Application;
 use Symfony\Component\Form\Extension\Validator\Constraints\FormValidator;
 use Symfony\Component\HttpFoundation\Response;
-
 use Symfony\Component\Routing\Annotation\Route;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Method;
 
@@ -39,10 +41,10 @@ class BranchDirectorController extends CommonController
             'childOpen' => '<li>',
             'childClose' => '</li>',
             'nodeDecorator' => function ($row) {
-                /**  @var Entity\BranchSync $branch */
-                $branch = $this->getManager()->getRepository('Entity\BranchSync')->find($row['id']);
+                /**  @var BranchSync $branch */
+                $branch = $this->getManager()->getRepository('ChamiloLMS\Entity\BranchSync')->find($row['id']);
                 $juries = $branch->getJuries();
-                /** @var Entity\Jury $jury */
+                /** @var Jury $jury */
                 $juryList = null;
                 foreach ($juries as $jury) {
                     $juryId = $jury->getId();
@@ -70,7 +72,7 @@ class BranchDirectorController extends CommonController
         $query = $this->getManager()
             ->createQueryBuilder()
             ->select('node')
-            ->from('Entity\BranchSync', 'node')
+            ->from('ChamiloLMS\Entity\BranchSync', 'node')
             ->innerJoin('node.users', 'u')
             ->where('u.userId = :userId')
             ->setParameter('userId', $userId)
@@ -134,14 +136,13 @@ class BranchDirectorController extends CommonController
         $request = $this->getRequest();
 
         $type = new DirectorJuryUserType();
-
-        $user = new Entity\User();
+        $user = new User();
         $form = $this->createForm($type, $user);
 
         $form->handleRequest($request);
         if ($form->isValid()) {
 
-            $jury = $this->getManager()->getRepository('Entity\Jury')->find($juryId);
+            $jury = $this->getManager()->getRepository('ChamiloLMS\Entity\Jury')->find($juryId);
 
             $factory = $this->get('security.encoder_factory');
             $encoder = $factory->getEncoder($user);
@@ -160,7 +161,7 @@ class BranchDirectorController extends CommonController
             $user->getUserId();
             $role = current($user->getRoles());
 
-            $juryMember = new Entity\JuryMembers();
+            $juryMember = new JuryMembers();
             $juryMember->setJury($jury);
             $juryMember->setRole($role);
             $juryMember->setUser($user);
@@ -203,11 +204,11 @@ class BranchDirectorController extends CommonController
     }
 
     /**
-     * @return \Entity\Repository\BranchSyncRepository
+     * @return \ChamiloLMS\Entity\Repository\BranchSyncRepository
      */
     protected function getRepository()
     {
-        return $this->get('orm.em')->getRepository('Entity\BranchSync');
+        return $this->get('orm.em')->getRepository('ChamiloLMS\Entity\BranchSync');
     }
 
     /**
@@ -215,6 +216,6 @@ class BranchDirectorController extends CommonController
      */
     protected function getNewEntity()
     {
-        return new Entity\BranchSync();
+        return new BranchSync();
     }
 }

+ 25 - 25
src/ChamiloLMS/Controller/Admin/JuryMember/JuryMemberController.php

@@ -5,12 +5,15 @@ namespace ChamiloLMS\Controller\Admin\JuryMember;
 
 use ChamiloLMS\Controller\CommonController;
 use ChamiloLMS\Form\JuryType;
-use Entity;
+use ChamiloLMS\Entity\TrackExercise;
+use ChamiloLMS\Entity\Jury;
+use ChamiloLMS\Entity\TrackExerciseAttemptJury;
+use ChamiloLMS\Entity\JuryMembers;
+use ChamiloLMS\Entity;
 use Silex\Application;
 use Symfony\Component\Form\Extension\Validator\Constraints\FormValidator;
 use Symfony\Component\HttpFoundation\Response;
 use Doctrine\Common\Collections\Criteria;
-
 use Symfony\Component\Routing\Annotation\Route;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Method;
 
@@ -40,9 +43,7 @@ class JuryMemberController extends CommonController
     public function listUsersAction()
     {
         $userId = $this->getUser()->getUserId();
-
-        /** @var Entity\Jury $jury */
-
+        /** @var Jury $jury */
         $jury = $this->getRepository()->getJuryByUserId($userId);
 
         if (!$jury) {
@@ -54,7 +55,7 @@ class JuryMemberController extends CommonController
         $attempts = $jury->getExerciseAttempts();
 
         // @todo move logic in a repository
-        /** @var Entity\TrackExercise $attempt */
+        /** @var TrackExercise $attempt */
         $relations = array();
         $myStudentStatus = array();
         foreach ($attempts as $attempt) {
@@ -62,7 +63,7 @@ class JuryMemberController extends CommonController
             $user = $attempt->getUser();
             $juryAttempts = $attempt->getJuryAttempts();
 
-            /** @var Entity\TrackExerciseAttemptJury $juryAttempt */
+            /** @var TrackExerciseAttemptJury $juryAttempt */
             $tempAttempt = array();
             foreach ($juryAttempts as $juryAttempt) {
                 if (!isset($tempAttempt[$juryAttempt->getJuryUserId()])) {
@@ -85,8 +86,7 @@ class JuryMemberController extends CommonController
         }
 
         $members = $jury->getMembers();
-
-        /** @var Entity\JuryMembers $member */
+        /** @var JuryMembers $member */
         $studentsByMember = array();
         foreach ($members as $member) {
             $students = $member->getStudents();
@@ -122,7 +122,7 @@ class JuryMemberController extends CommonController
             $this->createNotFoundException();
         }
 
-        /** @var \Entity\Jury $jury */
+        /** @var \ChamiloLMS\Entity\Jury $jury */
         $jury = $this->getRepository()->find($juryId);
 
         if (empty($jury)) {
@@ -139,7 +139,7 @@ class JuryMemberController extends CommonController
             ->where(Criteria::expr()->eq("userId", $userId))
             ->setFirstResult(0)
             ->setMaxResults(1);
-        /** @var Entity\JuryMembers $member */
+        /** @var JuryMembers $member */
         $member = $members->matching($criteria)->first();
 
         if (empty($member)) {
@@ -152,7 +152,7 @@ class JuryMemberController extends CommonController
             ->where(Criteria::expr()->eq("userId", $trackExercise['exe_user_id']))
             ->setFirstResult(0)
             ->setMaxResults(1);
-        /** @var Entity\JuryMembers $member */
+        /** @var JuryMembers $member */
         $student = $students->matching($criteria)->first();
 
         if (empty($student)) {
@@ -165,7 +165,7 @@ class JuryMemberController extends CommonController
         if ($security->isGranted('ROLE_JURY_PRESIDENT')) {
             // Relating user with president
             if ($member) {
-                $this->getManager()->getRepository('Entity\JuryMembers')->assignUserToJuryMember(
+                $this->getManager()->getRepository('ChamiloLMS\Entity\JuryMembers')->assignUserToJuryMember(
                     $trackExercise['exe_user_id'],
                     $member->getId()
                 );
@@ -179,11 +179,11 @@ class JuryMemberController extends CommonController
             'juryUserId' => $userId
         );
 
-        $trackJury = $this->getManager()->getRepository('Entity\TrackExerciseAttemptJury')->findBy($criteria);
+        $trackJury = $this->getManager()->getRepository('ChamiloLMS\Entity\TrackExerciseAttemptJury')->findBy($criteria);
 
         if ($trackJury) {
             $this->get('session')->getFlashBag()->add('info', "You already review this exercise attempt.");
-            /** @var Entity\TrackExerciseAttemptJury $track */
+            /** @var TrackExerciseAttemptJury $track */
             foreach ($trackJury as $track) {
                 $questionScoreTypeModel[$track->getQuestionId()] = $track->getQuestionScoreNameId();
             }
@@ -207,11 +207,11 @@ class JuryMemberController extends CommonController
         $options = array();
 
         if ($modelType) {
-            /** @var \Entity\QuestionScore $questionScoreName */
-            $questionScore = $this->get('orm.em')->getRepository('Entity\QuestionScore')->find($modelType);
+            /** @var \ChamiloLMS\Entity\QuestionScore $questionScoreName */
+            $questionScore = $this->get('orm.em')->getRepository('ChamiloLMS\Entity\QuestionScore')->find($modelType);
             if ($questionScore) {
                 $items = $questionScore->getItems();
-                /** @var \Entity\QuestionScoreName  $score */
+                /** @var \ChamiloLMS\Entity\QuestionScoreName  $score */
                 foreach ($items as $score) {
                     $options[$score->getId().':'.$score->getScore()] = $score;
                 }
@@ -324,8 +324,8 @@ class JuryMemberController extends CommonController
     public function saveScoreAction($exeId, $juryId)
     {
         $questionsAndScore = $this->getRequest()->get('options');
-        /** @var \Entity\TrackExercise $attempt */
-        $attempt = $this->getManager()->getRepository('Entity\TrackExercise')->find($exeId);
+        /** @var \ChamiloLMS\Entity\TrackExercise $attempt */
+        $attempt = $this->getManager()->getRepository('ChamiloLMS\Entity\TrackExercise')->find($exeId);
 
         $totalScore = 0;
 
@@ -347,12 +347,12 @@ class JuryMemberController extends CommonController
 
                     $totalScore += $score;
 
-                    $obj = $this->getManager()->getRepository('Entity\TrackExerciseAttemptJury')->findOneBy($criteria);
+                    $obj = $this->getManager()->getRepository('ChamiloLMS\Entity\TrackExerciseAttemptJury')->findOneBy($criteria);
                     if ($obj) {
                         $obj->setQuestionScoreNameId($questionScoreNameId);
                         $obj->setScore($score);
                     } else {
-                        $obj = new Entity\TrackExerciseAttemptJury();
+                        $obj = new TrackExerciseAttemptJury();
                         $obj->setJuryUserId($userId);
                         $obj->setAttempt($attempt);
                         $obj->setQuestionScoreNameId($questionScoreNameId);
@@ -393,11 +393,11 @@ class JuryMemberController extends CommonController
     }
 
     /**
-     * @return \Entity\Repository\JuryRepository
+     * @return \ChamiloLMS\Entity\Repository\JuryRepository
      */
     protected function getRepository()
     {
-        return $this->get('orm.em')->getRepository('Entity\Jury');
+        return $this->get('orm.em')->getRepository('ChamiloLMS\Entity\Jury');
     }
 
     /**
@@ -405,7 +405,7 @@ class JuryMemberController extends CommonController
      */
     protected function getNewEntity()
     {
-        return new Entity\Jury();
+        return new Jury();
     }
 
     /**

+ 21 - 17
src/ChamiloLMS/Controller/Admin/JuryPresident/JuryPresidentController.php

@@ -6,7 +6,11 @@ namespace ChamiloLMS\Controller\Admin\JuryPresident;
 use ChamiloLMS\Controller\CommonController;
 use ChamiloLMS\Form\JuryType;
 use ChamiloLMS\Form\JuryUserType;
-use Entity;
+use ChamiloLMS\Entity\Jury;
+use ChamiloLMS\Entity\JuryMembers;
+use ChamiloLMS\Entity\TrackExerciseAttemptJury;
+use ChamiloLMS\Entity\TrackExercise;
+
 use Silex\Application;
 use Symfony\Component\Form\Extension\Validator\Constraints\FormValidator;
 use Symfony\Component\HttpFoundation\Response;
@@ -47,7 +51,7 @@ class JuryPresidentController extends CommonController
         // @todo where is get this value?
         $juryId = null;
 
-        /** @var Entity\Jury $jury */
+        /** @var Jury $jury */
 
         $jury = $this->getEntity($juryId);
         $jury->setOpeningDate(new \DateTime());
@@ -71,7 +75,7 @@ class JuryPresidentController extends CommonController
         // @todo where is get this value?
         $juryId = null;
 
-        /** @var Entity\Jury $jury */
+        /** @var Jury $jury */
         $jury = $this->getEntity($juryId);
         $jury->setClosureDate(new \DateTime());
         $jury->setClosureUserId($user->getUserId());
@@ -93,7 +97,7 @@ class JuryPresidentController extends CommonController
         // @todo where is get this value?
         $juryId = null;
 
-        /** @var Entity\Jury $jury */
+        /** @var Jury $jury */
         $jury = $this->getEntity($juryId);
 
         // @todo ???
@@ -110,7 +114,7 @@ class JuryPresidentController extends CommonController
     */
     public function assignUserToJuryMemberAction($userId, $juryMemberId)
     {
-        return $this->getManager()->getRepository('Entity\JuryMembers')->assignUserToJuryMember($userId, $juryMemberId);
+        return $this->getManager()->getRepository('ChamiloLMS\Entity\JuryMembers')->assignUserToJuryMember($userId, $juryMemberId);
     }
 
     /**
@@ -119,7 +123,7 @@ class JuryPresidentController extends CommonController
     */
     public function removeUserToJuryMemberAction($userId, $juryMemberId)
     {
-        return $this->getManager()->getRepository('Entity\JuryMembers')->removeUserToJuryMember($userId, $juryMemberId);
+        return $this->getManager()->getRepository('ChamiloLMS\Entity\JuryMembers')->removeUserToJuryMember($userId, $juryMemberId);
     }
 
     /**
@@ -130,7 +134,7 @@ class JuryPresidentController extends CommonController
     {
         $userId = $this->getUser()->getUserId();
 
-        /** @var \Entity\Jury $jury */
+        /** @var Jury $jury */
         $jury = $this->getRepository()->find($juryId);
 
         if (empty($jury)) {
@@ -144,7 +148,7 @@ class JuryPresidentController extends CommonController
             ->setFirstResult(0)
             ->setMaxResults(1);
 
-        /** @var Entity\JuryMembers $member */
+        /** @var JuryMembers $member */
         $member = $members->matching($criteria)->first();
 
         if (empty($member)) {
@@ -158,7 +162,7 @@ class JuryPresidentController extends CommonController
         // Nothing was saved and no assignation exists
         if (empty($trackJuryAttempts) && $hasStudents == false) {
             $userList = array();
-            /** @var Entity\TrackExercise $attempt  */
+            /** @var TrackExercise $attempt  */
             foreach ($exerciseAttempt as $attempt) {
                 $studentId = $attempt->getExeUserId();
                 if (!in_array($studentId, $userList)) {
@@ -177,7 +181,7 @@ class JuryPresidentController extends CommonController
                 $randomMembers = array_rand($members, $maxCount);
                 foreach ($randomMembers as $randomMember) {
                     $member = $members[$randomMember];
-                    $this->getManager()->getRepository('Entity\JuryMembers')->assignUserToJuryMember($userId, $member->getId());
+                    $this->getManager()->getRepository('ChamiloLMS\Entity\JuryMembers')->assignUserToJuryMember($userId, $member->getId());
                 }
             }
             $this->get('session')->getFlashBag()->add('success', "Los usuarios fueron asignados al azar");
@@ -196,7 +200,7 @@ class JuryPresidentController extends CommonController
         $user = $this->getUser();
         $userId = $user->getUserId();
 
-        /** @var Entity\Jury $jury */
+        /** @var Jury $jury */
 
         $jury = $this->getRepository()->getJuryByUserId($userId);
 
@@ -209,7 +213,7 @@ class JuryPresidentController extends CommonController
         $attempts = $jury->getExerciseAttempts();
 
         // @todo move logic in a repository
-        /** @var Entity\TrackExercise $attempt */
+        /** @var TrackExercise $attempt */
         $relations = array();
         $globalStudentStatus = array();
         $myStudentStatus = array();
@@ -217,7 +221,7 @@ class JuryPresidentController extends CommonController
             $user = $attempt->getUser();
             $juryAttempts = $attempt->getJuryAttempts();
 
-            /** @var Entity\TrackExerciseAttemptJury $juryAttempt */
+            /** @var TrackExerciseAttemptJury $juryAttempt */
             $tempAttempt = array();
             foreach ($juryAttempts as $juryAttempt) {
                 if (!isset($tempAttempt[$juryAttempt->getJuryUserId()])) {
@@ -246,7 +250,7 @@ class JuryPresidentController extends CommonController
         }
 
         $members = $jury->getMembers();
-        /** @var Entity\JuryMembers $member */
+        /** @var JuryMembers $member */
         $studentsByMember = array();
         foreach ($members as $member) {
             $students = $member->getStudents();
@@ -298,11 +302,11 @@ class JuryPresidentController extends CommonController
     }
 
     /**
-     * @return \Entity\Repository\JuryRepository
+     * @return \ChamiloLMS\Entity\Repository\JuryRepository
      */
     protected function getRepository()
     {
-        return $this->get('orm.em')->getRepository('Entity\Jury');
+        return $this->get('orm.em')->getRepository('ChamiloLMS\Entity\Jury');
     }
 
     /**
@@ -310,7 +314,7 @@ class JuryPresidentController extends CommonController
      */
     protected function getNewEntity()
     {
-        return new Entity\Jury();
+        return new Jury();
     }
 
     /**

+ 7 - 7
src/ChamiloLMS/Controller/Admin/QuestionManager/QuestionManagerController.php

@@ -99,7 +99,7 @@ class QuestionManagerController
     public function getCategoriesAction(Application $app, $id)
     {
         // Getting CQuizCategory repo.
-        $repo = $app['orm.em']->getRepository('Entity\CQuizCategory');
+        $repo = $app['orm.em']->getRepository('ChamiloLMS\Entity\CQuizCategory');
 
         $options  = array(
             'decorate'      => true,
@@ -136,9 +136,9 @@ class QuestionManagerController
         // Getting CQuizCategory repo.
         /** @var \Doctrine\ORM\EntityManager $em */
         $em   = $app['orm.em'];
-        $repo = $em->getRepository('Entity\CQuizCategory');
+        $repo = $em->getRepository('ChamiloLMS\Entity\CQuizCategory');
 
-        /** @var \Entity\CQuizCategory $category */
+        /** @var \ChamiloLMS\Entity\CQuizCategory $category */
         $category = $repo->find($categoryId);
 
         $questionColumns = \Question::getQuestionColumns();
@@ -210,7 +210,7 @@ class QuestionManagerController
 
         // Getting CQuizCategory repo.
         /** @var \Gedmo\Tree\Entity\Repository\NestedTreeRepository $repo */
-        $repo = $app['orm.em']->getRepository('Entity\CQuizCategory');
+        $repo = $app['orm.em']->getRepository('ChamiloLMS\Entity\CQuizCategory');
 
         $categoryId = $app['request']->get('categoryId');
         $subtree    = null;
@@ -259,7 +259,7 @@ class QuestionManagerController
         /** @var \Doctrine\ORM\QueryBuilder $qb */
         $qb = $app['orm.em']->createQueryBuilder()
             ->select('node')
-            ->from('Entity\CQuizCategory', 'node')
+            ->from('ChamiloLMS\Entity\CQuizCategory', 'node')
             ->where('node.cId <> 0 AND node.lvl = 0')
             ->orderBy('node.root, node.lft', 'ASC');
 
@@ -275,7 +275,7 @@ class QuestionManagerController
         $query = $app['orm.em']
             ->createQueryBuilder()
             ->select('node')
-            ->from('Entity\CQuizCategory', 'node')
+            ->from('ChamiloLMS\Entity\CQuizCategory', 'node')
             ->where('node.cId = 0 AND node.lvl = 0')
             ->orderBy('node.root, node.lft', 'ASC')
             ->getQuery();
@@ -375,7 +375,7 @@ class QuestionManagerController
      */
     public function deleteCategoryAction(Application $app, $id)
     {
-        $repo     = $app['orm.ems']['db_write']->getRepository('Entity\CQuizCategory');
+        $repo     = $app['orm.ems']['db_write']->getRepository('ChamiloLMS\Entity\CQuizCategory');
         $category = $repo->find($id);
         if (empty($category)) {
             $app->abort(404);

+ 4 - 6
src/ChamiloLMS/Controller/App/SessionPath/SessionPathController.php

@@ -10,11 +10,9 @@ use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Routing\Annotation\Route;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Method;
 
-use Entity\SessionPath;
-
+use ChamiloLMS\Entity\SessionPath;
 use ChamiloLMS\Form\SessionPathType;
 
-
 /**
  * @package ChamiloLMS.Controller
  * @author Julio Montoya <gugli100@gmail.com>
@@ -56,12 +54,12 @@ class SessionPathController extends CommonController
         );
 
         // @todo put this in a function
-        $repo = $this->get('orm.em')->getRepository('Entity\SessionTree');
+        $repo = $this->get('orm.em')->getRepository('ChamiloLMS\Entity\SessionTree');
 
         $query = $this->getManager()
             ->createQueryBuilder()
             ->select('node')
-            ->from('Entity\SessionTree', 'node')
+            ->from('ChamiloLMS\Entity\SessionTree', 'node')
             //->where('node.cId = 0')
             ->orderBy('node.root, node.lft', 'ASC')
             ->getQuery();
@@ -96,7 +94,7 @@ class SessionPathController extends CommonController
      */
     protected function getRepository()
     {
-        return $this->get('orm.em')->getRepository('Entity\SessionPath');
+        return $this->get('orm.em')->getRepository('ChamiloLMS\Entity\SessionPath');
     }
 
     /**

+ 2 - 3
src/ChamiloLMS/Controller/App/SessionPath/SessionTreeController.php

@@ -10,8 +10,7 @@ use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Routing\Annotation\Route;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Method;
 
-use Entity\SessionPath;
-
+use ChamiloLMS\Entity\SessionPath;
 use ChamiloLMS\Form\SessionTreeType;
 
 /**
@@ -56,7 +55,7 @@ class SessionTreeController extends CommonController
      */
     protected function getRepository()
     {
-        return $this->get('orm.em')->getRepository('Entity\SessionTree');
+        return $this->get('orm.em')->getRepository('ChamiloLMS\Entity\SessionTree');
     }
 
     /**

+ 3 - 3
src/ChamiloLMS/Controller/BaseController.php

@@ -78,7 +78,7 @@ abstract class BaseController extends FlintController
     }
 
     /**
-     * @return \Entity\Course
+     * @return \ChamiloLMS\Entity\Course
      */
     protected function getCourse()
     {
@@ -89,7 +89,7 @@ abstract class BaseController extends FlintController
     }
 
     /**
-     * @return \Entity\Session
+     * @return \ChamiloLMS\Entity\Session
      */
     protected function getSession()
     {
@@ -132,7 +132,7 @@ abstract class BaseController extends FlintController
     }
 
     /**
-     * @return \Entity\User
+     * @return \ChamiloLMS\Entity\User
      */
     public function getUser()
     {

+ 1 - 2
src/ChamiloLMS/Controller/EditorController.php

@@ -47,7 +47,7 @@ class EditorController extends CommonController
      */
     public function getTemplatesAction()
     {
-        $templates = $this->getManager()->getRepository('Entity\SystemTemplate')->findAll();
+        $templates = $this->getManager()->getRepository('ChamiloLMS\Entity\SystemTemplate')->findAll();
         $templates = $this->getHtmlEditor()->formatTemplates($templates);
         $this->getTemplate()->assign('templates', $templates);
         $response = $this->getTemplate()->renderTemplate('javascript/editor/ckeditor/templates.tpl');
@@ -63,7 +63,6 @@ class EditorController extends CommonController
     {
         error_reporting(-1);
         $connector = $this->getEditorConnector();
-
         $driverList = $this->getRequest()->get('driver_list');
 
         if (!empty($driverList)) {

+ 4 - 4
src/ChamiloLMS/Controller/IndexController.php

@@ -24,7 +24,7 @@ class IndexController extends CommonController
     {
         $template = $this->getTemplate();
 
-        /*$user = $this->getManager()->getRepository('Entity\User')->find(1);
+        /*$user = $this->getManager()->getRepository('ChamiloLMS\Entity\User')->find(1);
         foreach($user->getPortals() as $portal) {
             var_dump($portal->getUrl());
         }*/
@@ -54,10 +54,10 @@ class IndexController extends CommonController
         if ($app['security']->isGranted('ROLE_ADMIN')) {
         }*/
 
-        /** @var \Entity\User $user */
+        /** @var \ChamiloLMS\Entity\User $user */
         /*$em = $app['orm.ems']['db_write'];
-        $user = $em->getRepository('Entity\User')->find(6);
-        $role = $em->getRepository('Entity\Role')->findOneByRole('ROLE_STUDENT');
+        $user = $em->getRepository('ChamiloLMS\Entity\User')->find(6);
+        $role = $em->getRepository('ChamiloLMS\Entity\Role')->findOneByRole('ROLE_STUDENT');
         $user->getRolesObj()->add($role);
         $em->persist($user);
         $em->flush();*/

+ 9 - 9
src/ChamiloLMS/Controller/LearnpathController.php

@@ -58,14 +58,14 @@ class LearnpathController
         $sessionId = api_get_session_id();
         $session = null;
         if (!empty($sessionId)) {
-            $session = $app['orm.em']->getRepository('Entity\Session')->find($sessionId);
+            $session = $app['orm.em']->getRepository('ChamiloLMS\Entity\Session')->find($sessionId);
         }
 
         // Find course.
-        $course = $app['orm.em']->getRepository('Entity\Course')->find($courseId);
+        $course = $app['orm.em']->getRepository('ChamiloLMS\Entity\Course')->find($courseId);
 
         // Getting subscribe users to the course.
-        $subscribedUsers = $app['orm.em']->getRepository('Entity\Course')->getSubscribedStudents($course);
+        $subscribedUsers = $app['orm.em']->getRepository('ChamiloLMS\Entity\Course')->getSubscribedStudents($course);
         $subscribedUsers = $subscribedUsers->getQuery();
         $subscribedUsers = $subscribedUsers->execute();
 
@@ -76,7 +76,7 @@ class LearnpathController
         }
 
         // Getting subscribed users to a LP.
-        $subscribedUsersInLp = $app['orm.em']->getRepository('Entity\CItemProperty')->getUsersSubscribedToItem(
+        $subscribedUsersInLp = $app['orm.em']->getRepository('ChamiloLMS\Entity\CItemProperty')->getUsersSubscribedToItem(
             'learnpath',
             $lpId,
             $course,
@@ -122,7 +122,7 @@ class LearnpathController
         }
 
         //Subscribed groups to a LP
-        $subscribedGroupsInLp = $app['orm.em']->getRepository('Entity\CItemProperty')->getGroupsSubscribedToItem(
+        $subscribedGroupsInLp = $app['orm.em']->getRepository('ChamiloLMS\Entity\CItemProperty')->getGroupsSubscribedToItem(
             'learnpath',
             $lpId,
             $course,
@@ -149,7 +149,7 @@ class LearnpathController
                 'expanded' => false,
                 //'class' => 'Entity\Course',
                 //'property' => 'complete_name',
-                //'query_builder' => function(\Entity\Repository\CourseRepository $repo) use ($course) {
+                //'query_builder' => function(ChamiloLMS\Entity\Repository\CourseRepository $repo) use ($course) {
                     $repo =  $repo->getSubscribedStudents($course);
                     return $repo;
                 },
@@ -162,7 +162,7 @@ class LearnpathController
                 'required' => false,
                 //'class' => 'Entity\Course',
                 //'property' => 'complete_name',
-                //'query_builder' => function(\Entity\Repository\CourseRepository $repo) use ($course) {
+                //'query_builder' => function(ChamiloLMS\Entity\Repository\CourseRepository $repo) use ($course) {
                   //  return $repo->getSubscribedStudents($course);
                 //},
                 'choices' => $selectedChoices
@@ -181,7 +181,7 @@ class LearnpathController
             $users = $request->get('users');
             $userForm = $request->get('user_form');
             if (!empty($userForm)) {
-                $app['orm.em']->getRepository('Entity\CItemProperty')->subscribeUsersToItem(
+                $app['orm.em']->getRepository('ChamiloLMS\Entity\CItemProperty')->subscribeUsersToItem(
                     'learnpath',
                     $course,
                     $session,
@@ -195,7 +195,7 @@ class LearnpathController
             $groupForm = $request->get('group_form');
 
             if (!empty($groupForm)) {
-                $app['orm.em']->getRepository('Entity\CItemProperty')->subscribeGroupsToItem(
+                $app['orm.em']->getRepository('ChamiloLMS\Entity\CItemProperty')->subscribeGroupsToItem(
                     'learnpath',
                     $course,
                     $session,

+ 8 - 8
src/ChamiloLMS/Controller/Tool/CourseHome/CourseHomeController.php

@@ -8,7 +8,7 @@ use Symfony\Component\HttpFoundation\Response;
 use ChamiloLMS\Controller\CommonController;
 use Symfony\Component\Routing\Annotation\Route;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Method;
-use Entity\CTool;
+use ChamiloLMS\Entity\CTool;
 use ChamiloLMS\Form\CourseHomeToolType;
 use \Display;
 use Doctrine\Common\Collections\Criteria;
@@ -282,7 +282,7 @@ class CourseHomeController extends CommonController
         }
         $entityManager = $this->getManager();
         $criteria = array('cId' => api_get_course_int_id(), 'id' => $iconId);
-        $tool = $this->getRepository('Entity\CTool')->findOneBy($criteria);
+        $tool = $this->getRepository('ChamiloLMS\Entity\CTool')->findOneBy($criteria);
         if ($tool) {
             $tool->setVisibility(1);
         }
@@ -305,7 +305,7 @@ class CourseHomeController extends CommonController
 
         $entityManager = $this->getManager();
         $criteria = array('cId' => api_get_course_int_id(), 'id' => $iconId);
-        $tool = $this->getRepository('Entity\CTool')->findOneBy($criteria);
+        $tool = $this->getRepository('ChamiloLMS\Entity\CTool')->findOneBy($criteria);
         if ($tool) {
             $tool->setVisibility(0);
         }
@@ -328,7 +328,7 @@ class CourseHomeController extends CommonController
 
         $entityManager = $this->getManager();
         $criteria = array('cId' => api_get_course_int_id(), 'id' => $iconId, 'added_tool' => 1);
-        $tool = $this->getRepository('Entity\CTool')->findOneBy($criteria);
+        $tool = $this->getRepository('ChamiloLMS\Entity\CTool')->findOneBy($criteria);
         $entityManager->remove($tool);
         //$entityManager->flush();
         return Display::return_message(get_lang('Deleted'), 'confirmation');
@@ -349,7 +349,7 @@ class CourseHomeController extends CommonController
 
             $query = $this->getManager()->createQueryBuilder('a');
             $query->select('s');
-            $query->from('Entity\CTool', 's');
+            $query->from('ChamiloLMS\Entity\CTool', 's');
             $query->where('s.cId  = :courseId AND s.sessionId = :sessionId')
                 ->setParameters(
                     array(
@@ -367,7 +367,7 @@ class CourseHomeController extends CommonController
             //$itemsFromSession = $this->getRepository()->findBy($criteria);
             $query = $this->getManager()->createQueryBuilder('a');
             $query->select('s');
-            $query->from('Entity\CTool', 's');
+            $query->from('ChamiloLMS\Entity\CTool', 's');
             $query->where('s.cId  = :courseId AND s.sessionId = 0')
                 ->setParameters(
                     array(
@@ -426,7 +426,7 @@ class CourseHomeController extends CommonController
 
             $query = $this->getManager()->createQueryBuilder('a');
             $query->select('MAX(s.id) as id');
-            $query->from('Entity\CTool', 's');
+            $query->from('ChamiloLMS\Entity\CTool', 's');
             $query->where('s.cId  = :courseId')->setParameter('courseId', $this->getCourse()->getId());
             $result = $query->getQuery()->getArrayResult();
             $maxId = $result[0]['id'] + 1;
@@ -540,7 +540,7 @@ class CourseHomeController extends CommonController
      */
     protected function getRepository()
     {
-        return $this->get('orm.em')->getRepository('Entity\CTool');
+        return $this->get('orm.em')->getRepository('ChamiloLMS\Entity\CTool');
     }
 
     /**

+ 7 - 7
src/ChamiloLMS/Controller/Tool/Curriculum/CurriculumCategoryController.php

@@ -7,7 +7,7 @@ use ChamiloLMS\Controller\CommonController;
 use Silex\Application;
 use Symfony\Component\Form\Extension\Validator\Constraints\FormValidator;
 use Symfony\Component\HttpFoundation\Response;
-use Entity;
+use ChamiloLMS\Entity\CurriculumCategory;
 use ChamiloLMS\Form\CurriculumCategoryType;
 use Symfony\Component\Routing\Annotation\Route;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Method;
@@ -86,7 +86,7 @@ class CurriculumCategoryController extends CommonController
         $qb = $this->getManager()
             ->createQueryBuilder()
             ->select('node, i')
-            ->from('Entity\CurriculumCategory', 'node')
+            ->from('ChamiloLMS\Entity\CurriculumCategory', 'node')
             ->leftJoin('node.items', 'i')
             ->innerJoin('node.course', 'c')
             ->orderBy('node.root, node.lft', 'ASC');
@@ -190,7 +190,7 @@ class CurriculumCategoryController extends CommonController
         $request = $this->getRequest();
         $formType = $this->getFormType();
 
-        $entity = new Entity\CurriculumCategory();
+        $entity = new CurriculumCategory();
         $parentEntity = $this->getEntity($id);
         $entity->setParent($parentEntity);
         $entity->setCourse($this->getCourse());
@@ -204,7 +204,7 @@ class CurriculumCategoryController extends CommonController
         if ($request->getMethod() == 'POST') {
             $form->bind($request);
             if ($form->isValid()) {
-                /** @var Entity\CurriculumCategory $item */
+                /** @var CurriculumCategory $item */
                 $item = $form->getData();
                 $em = $this->getManager();
                 $em->persist($item);
@@ -325,7 +325,7 @@ class CurriculumCategoryController extends CommonController
         $qb = $this->getManager()
             ->createQueryBuilder()
             ->select('node.id, u.userId, SUM(i.score) as score')
-            ->from('Entity\CurriculumCategory', 'node')
+            ->from('ChamiloLMS\Entity\CurriculumCategory', 'node')
             ->innerJoin('node.course', 'c')
             ->innerJoin('node.items', 'i')
             ->innerJoin('i.userItems', 'u')
@@ -388,7 +388,7 @@ class CurriculumCategoryController extends CommonController
      */
     protected function getRepository()
     {
-        return $this->get('orm.em')->getRepository('Entity\CurriculumCategory');
+        return $this->get('orm.em')->getRepository('ChamiloLMS\Entity\CurriculumCategory');
     }
 
     /**
@@ -396,7 +396,7 @@ class CurriculumCategoryController extends CommonController
      */
     protected function getNewEntity()
     {
-        return new Entity\CurriculumCategory();
+        return new CurriculumCategory();
     }
 
     /**

+ 7 - 6
src/ChamiloLMS/Controller/Tool/Curriculum/CurriculumItemController.php

@@ -7,7 +7,8 @@ use ChamiloLMS\Controller\CommonController;
 use Silex\Application;
 use Symfony\Component\Form\Extension\Validator\Constraints\FormValidator;
 use Symfony\Component\HttpFoundation\Response;
-use Entity;
+use ChamiloLMS\Entity\CurriculumItem;
+use ChamiloLMS\Entity\CurriculumCategory;
 use ChamiloLMS\Form\CurriculumItemType;
 use Symfony\Component\Routing\Annotation\Route;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Method;
@@ -107,9 +108,9 @@ class CurriculumItemController extends CommonController
         $request = $this->getRequest();
         $formType = $this->getFormType();
 
-        $entity = new Entity\CurriculumItem();
+        $entity = new CurriculumItem();
 
-        $category = $this->get('orm.em')->getRepository('Entity\CurriculumCategory')->find($id);
+        $category = $this->get('orm.em')->getRepository('ChamiloLMS\Entity\CurriculumCategory')->find($id);
         $entity->setCategory($category);
 
         $form = $this->get('form.factory')->create($formType, $entity);
@@ -117,7 +118,7 @@ class CurriculumItemController extends CommonController
         if ($request->getMethod() == 'POST') {
             $form->bind($request);
             if ($form->isValid()) {
-                /** @var Entity\CurriculumCategory $item */
+                /** @var CurriculumCategory $item */
                 $item = $form->getData();
                 $em = $this->getManager();
                 $em->persist($item);
@@ -208,7 +209,7 @@ class CurriculumItemController extends CommonController
      */
     protected function getRepository()
     {
-        return $this->get('orm.em')->getRepository('Entity\CurriculumItem');
+        return $this->get('orm.em')->getRepository('ChamiloLMS\Entity\CurriculumItem');
     }
 
     /**
@@ -216,7 +217,7 @@ class CurriculumItemController extends CommonController
      */
     protected function getNewEntity()
     {
-        return new Entity\CurriculumItem();
+        return new CurriculumItem();
     }
 
     /**

+ 23 - 25
src/ChamiloLMS/Controller/Tool/Curriculum/CurriculumUserController.php

@@ -7,7 +7,9 @@ use ChamiloLMS\Controller\CommonController;
 use Silex\Application;
 use Symfony\Component\Form\Extension\Validator\Constraints\FormValidator;
 use Symfony\Component\HttpFoundation\Response;
-use Entity;
+use ChamiloLMS\Entity\CurriculumItemRelUser;
+use ChamiloLMS\Entity\CurriculumItem;
+use ChamiloLMS\Entity\Repository\CurriculumItemRelUserRepository;
 use ChamiloLMS\Form\CurriculumItemRelUserCollectionType;
 use Symfony\Component\OptionsResolver\OptionsResolverInterface;
 use Symfony\Component\Routing\Annotation\Route;
@@ -56,7 +58,7 @@ class CurriculumUserController extends CommonController
         $qb = $this->getManager()
             ->createQueryBuilder()
             ->select('node, i, u')
-            ->from('Entity\CurriculumCategory', 'node')
+            ->from('ChamiloLMS\Entity\CurriculumCategory', 'node')
             ->innerJoin('node.course', 'c')
             ->leftJoin('node.items', 'i')
             ->leftJoin('i.userItems', 'u', 'WITH', 'u.userId = :userId OR u.userId IS NULL')
@@ -70,12 +72,10 @@ class CurriculumUserController extends CommonController
         $categories = $query->getResult();
 
         $formList = array();
-        /** @var \Entity\CurriculumCategory $category */
-
+        /** @var \ChamiloLMS\Entity\CurriculumCategory $category */
         foreach ($categories as $category) {
 
-            /** @var \Entity\CurriculumItem $item */
-
+            /** @var \ChamiloLMS\Entity\CurriculumItem $item */
             foreach ($category->getItems() as $item) {
 
                 $formType = new CurriculumItemRelUserCollectionType($item->getId());
@@ -84,7 +84,7 @@ class CurriculumUserController extends CommonController
 
                 // If there are no items for the user, then create a new one!
                 if ($count == 0) {
-                    $userItem = new Entity\CurriculumItemRelUser();
+                    $userItem = new CurriculumItemRelUser();
                     $userItem->setItemId($item->getId());
                     $userItemList = array(
                         $userItem
@@ -125,10 +125,10 @@ class CurriculumUserController extends CommonController
             $form->bind($request);
             // @todo move this in a repo!
             if ($form->isValid()) {
-                /** @var Entity\CurriculumItem $item */
+                /** @var CurriculumItem $item */
                 $postedItem = $form->getData();
 
-                /** @var Entity\CurriculumItemRelUser $curriculumItemRelUser  */
+                /** @var CurriculumItemRelUser $curriculumItemRelUser  */
                 $postedItemId = null;
                 foreach ($postedItem->getUserItems() as $curriculumItemRelUser) {
                     $postedItemId = $curriculumItemRelUser->getItemId();
@@ -144,7 +144,7 @@ class CurriculumUserController extends CommonController
                 $query = $this->getManager()
                     ->createQueryBuilder()
                     ->select('node, i, u')
-                    ->from('Entity\CurriculumCategory', 'node')
+                    ->from('ChamiloLMS\Entity\CurriculumCategory', 'node')
                     ->innerJoin('node.items', 'i')
                     ->innerJoin('i.userItems', 'u')
                     ->orderBy('node.root, node.lft', 'ASC')
@@ -155,14 +155,14 @@ class CurriculumUserController extends CommonController
 
                 $categories = $query->getResult();
 
-                /** @var \Entity\CurriculumCategory $category */
+                /** @var \ChamiloLMS\Entity\CurriculumCategory $category */
                 $alreadyAdded = array();
 
                 foreach ($categories as $category) {
                     foreach ($category->getItems() as $item) {
                         if ($item->getId() == $postedItemId) {
                             // Now we can do stuff
-                            /** @var Entity\CurriculumItemRelUser $userItem */
+                            /** @var CurriculumItemRelUser $userItem */
                             foreach ($item->getUserItems() as $userItem) {
                                 $alreadyAdded[md5($userItem->getDescription())] = $userItem;
                             }
@@ -171,15 +171,15 @@ class CurriculumUserController extends CommonController
                 }
 
                 // @todo check this
-                $user = $this->get('orm.em')->getRepository('Entity\User')->find($user->getUserId());
+                $user = $this->get('orm.em')->getRepository('ChamiloLMS\Entity\User')->find($user->getUserId());
 
                 $counter = 1;
                 $parsed = array();
 
-                /** @var Entity\CurriculumItem $newItem */
+                /** @var CurriculumItem $newItem */
                 $newItem = $this->getCurriculumItemRepository()->find($postedItemId);
 
-                /** @var Entity\CurriculumItemRelUser $curriculumItemRelUser */
+                /** @var CurriculumItemRelUser $curriculumItemRelUser */
                 foreach ($postedItem->getUserItems() as $curriculumItemRelUser) {
                     $curriculumItemRelUser->setUser($user);
 
@@ -278,7 +278,7 @@ class CurriculumUserController extends CommonController
         $qb = $this->getManager()
             ->createQueryBuilder()
             ->select('node, i, u')
-            ->from('Entity\CurriculumCategory', 'node')
+            ->from('ChamiloLMS\Entity\CurriculumCategory', 'node')
             ->innerJoin('node.course', 'c')
             ->leftJoin('node.items', 'i')
             ->leftJoin('i.userItems', 'u', 'WITH', 'u.userId = :userId OR u.userId IS NULL')
@@ -286,11 +286,9 @@ class CurriculumUserController extends CommonController
             ->orderBy('node.root, node.lft, node.title', 'ASC');
         $this->setCourseParameters($qb, 'node');
         $query = $qb->getQuery();
-
         $categories = $query->getResult();
-
         foreach ($categories as $category) {
-            /** @var \Entity\CurriculumItem $item */
+            /** @var \ChamiloLMS\Entity\CurriculumItem $item */
             $score = 0;
             foreach ($category->getItems() as $item) {
 
@@ -315,7 +313,7 @@ class CurriculumUserController extends CommonController
     }
 
     /**
-     * @param Entity\CurriculumItemRelUser $object
+     * @param CurriculumItemRelUser $object
      * @return JsonResponse
      * @throws \Exception
      */
@@ -324,7 +322,7 @@ class CurriculumUserController extends CommonController
         if (false === $object) {
             throw new \Exception('Unable to create the entity');
         }
-        /** @var Entity\Repository\CurriculumItemRelUserRepository $repo */
+        /** @var CurriculumItemRelUserRepository $repo */
         $repo = $this->getRepository();
         if ($repo->isAllowToInsert($object->getItem(), $object->getUser())) {
             $this->createAction($object);
@@ -396,17 +394,17 @@ class CurriculumUserController extends CommonController
      */
     protected function getRepository()
     {
-        return $this->get('orm.em')->getRepository('Entity\CurriculumItemRelUser');
+        return $this->get('orm.em')->getRepository('ChamiloLMS\Entity\CurriculumItemRelUser');
     }
 
     private function getCurriculumCategoryRepository()
     {
-        return $this->get('orm.em')->getRepository('Entity\CurriculumCategory');
+        return $this->get('orm.em')->getRepository('ChamiloLMS\Entity\CurriculumCategory');
     }
 
     private function getCurriculumItemRepository()
     {
-        return $this->get('orm.em')->getRepository('Entity\CurriculumItem');
+        return $this->get('orm.em')->getRepository('ChamiloLMS\Entity\CurriculumItem');
     }
 
     /**
@@ -414,7 +412,7 @@ class CurriculumUserController extends CommonController
      */
     protected function getNewEntity()
     {
-        return new Entity\CurriculumItemRelUser();
+        return new CurriculumItemRelUser();
     }
 
     /**

+ 2 - 2
src/ChamiloLMS/Controller/Tool/Introduction/IntroductionController.php

@@ -3,7 +3,7 @@
 
 namespace ChamiloLMS\Controller\Tool\Introduction;
 
-use Entity\CToolIntro;
+use ChamiloLMS\Entity\CToolIntro;
 use Silex\Application;
 use Symfony\Component\HttpFoundation\Response;
 use ChamiloLMS\Controller\CommonController;
@@ -140,7 +140,7 @@ class IntroductionController extends CommonController
      */
     protected function getRepository()
     {
-        return $this->get('orm.em')->getRepository('Entity\CToolIntro');
+        return $this->get('orm.em')->getRepository('ChamiloLMS\Entity\CToolIntro');
     }
 
     /**

+ 9 - 3
src/ChamiloLMS/Controller/User/ProfileController.php

@@ -43,16 +43,22 @@ class ProfileController extends CommonController
         if ($this->getUser()->getUsername() != $username) {
             return $this->abort(401);
         }
+
         $userId = \UserManager::get_user_id_from_username($username);
         $userInfo = api_get_user_info($userId);
 
         $this->getTemplate()->assign('driver_list', 'PersonalDriver,DropBoxDriver');
-        $editor = $this->getTemplate()->renderTemplate($this->getHtmlEditor()->getEditorStandAloneTemplate());
+
+        $editor = $this->getTemplate()->renderTemplate(
+            $this->getHtmlEditor()->getEditorStandAloneTemplate()
+        );
 
         $this->getTemplate()->assign('user', $userInfo);
         $this->getTemplate()->assign('editor', $editor);
 
-        $response = $this->getTemplate()->renderTemplate($this->getTemplatePath().'files.tpl');
+        $response = $this->getTemplate()->renderTemplate(
+            $this->getTemplatePath().'files.tpl'
+        );
         return new Response($response, 200, array());
     }
 
@@ -74,4 +80,4 @@ class ProfileController extends CommonController
     {
         return 'user/';
     }
-}
+}

+ 1 - 1
main/inc/Entity/AccessUrl.php → src/ChamiloLMS/Entity/AccessUrl.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Entity;
+namespace ChamiloLMS\Entity;
 
 use Doctrine\ORM\Mapping as ORM;
 

+ 1 - 1
main/inc/Entity/AccessUrlRelCourse.php → src/ChamiloLMS/Entity/AccessUrlRelCourse.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Entity;
+namespace ChamiloLMS\Entity;
 
 use Doctrine\ORM\Mapping as ORM;
 

+ 1 - 1
main/inc/Entity/AccessUrlRelSession.php → src/ChamiloLMS/Entity/AccessUrlRelSession.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Entity;
+namespace ChamiloLMS\Entity;
 
 use Doctrine\ORM\Mapping as ORM;
 

+ 1 - 1
main/inc/Entity/AccessUrlRelUser.php → src/ChamiloLMS/Entity/AccessUrlRelUser.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Entity;
+namespace ChamiloLMS\Entity;
 
 use Doctrine\ORM\Mapping as ORM;
 

+ 2 - 2
main/inc/Entity/BranchSync.php → src/ChamiloLMS/Entity/BranchSync.php

@@ -1,5 +1,5 @@
 <?php
-namespace Entity;
+namespace ChamiloLMS\Entity;
 
 use Doctrine\ORM\Mapping as ORM;
 use Gedmo\Mapping\Annotation as Gedmo;
@@ -8,7 +8,7 @@ use Gedmo\Mapping\Annotation as Gedmo;
  * BranchSync
  *
  * @ORM\Table(name="branch_sync")
- * @ORM\Entity(repositoryClass="Entity\Repository\BranchSyncRepository")
+ * @ORM\Entity(repositoryClass="ChamiloLMS\Entity\Repository\BranchSyncRepository")
  * @Gedmo\Tree(type="nested")
 
  */

+ 1 - 1
main/inc/Entity/CDropboxFile.php → src/ChamiloLMS/Entity/CDropboxFile.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Entity;
+namespace ChamiloLMS\Entity;
 
 use Doctrine\ORM\Mapping as ORM;
 

+ 1 - 1
main/inc/Entity/CDropboxPost.php → src/ChamiloLMS/Entity/CDropboxPost.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Entity;
+namespace ChamiloLMS\Entity;
 
 use Doctrine\ORM\Mapping as ORM;
 

+ 1 - 1
main/inc/Entity/CGroupInfo.php → src/ChamiloLMS/Entity/CGroupInfo.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Entity;
+namespace ChamiloLMS\Entity;
 
 use Doctrine\ORM\Mapping as ORM;
 use Doctrine\Common\Collections\ArrayCollection;

+ 2 - 2
main/inc/Entity/CItemProperty.php → src/ChamiloLMS/Entity/CItemProperty.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Entity;
+namespace ChamiloLMS\Entity;
 
 use Doctrine\ORM\Mapping as ORM;
 
@@ -9,7 +9,7 @@ use Doctrine\ORM\Mapping as ORM;
  * CItemProperty
  *
  * @ORM\Table(name="c_item_property")
- * @ORM\Entity(repositoryClass="Entity\Repository\ItemPropertyRepository")
+ * @ORM\Entity(repositoryClass="ChamiloLMS\Entity\Repository\ItemPropertyRepository")
  */
 class CItemProperty
 {

+ 2 - 2
main/inc/Entity/CLp.php → src/ChamiloLMS/Entity/CLp.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Entity;
+namespace ChamiloLMS\Entity;
 
 use Doctrine\ORM\Mapping as ORM;
 
@@ -8,7 +8,7 @@ use Doctrine\ORM\Mapping as ORM;
  * CLp
  *
  * @ORM\Table(name="c_lp")
- * @ORM\Entity(repositoryClass="Entity\Repository\LpRepository")
+ * @ORM\Entity(repositoryClass="ChamiloLMS\Entity\Repository\LpRepository")
  */
 class CLp
 {

+ 1 - 1
main/inc/Entity/CLpCategory.php → src/ChamiloLMS/Entity/CLpCategory.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Entity;
+namespace ChamiloLMS\Entity;
 use Gedmo\Mapping\Annotation as Gedmo;
 use Doctrine\ORM\Mapping as ORM;
 

+ 1 - 1
main/inc/Entity/CQuiz.php → src/ChamiloLMS/Entity/CQuiz.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Entity;
+namespace ChamiloLMS\Entity;
 
 use Doctrine\ORM\Mapping as ORM;
 

+ 1 - 1
main/inc/Entity/CQuizCategory.php → src/ChamiloLMS/Entity/CQuizCategory.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Entity;
+namespace ChamiloLMS\Entity;
 
 use Doctrine\ORM\Mapping as ORM;
 use Gedmo\Mapping\Annotation as Gedmo;

+ 2 - 2
main/inc/Entity/CQuizQuestion.php → src/ChamiloLMS/Entity/CQuizQuestion.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Entity;
+namespace ChamiloLMS\Entity;
 
 use Doctrine\ORM\Mapping as ORM;
 use Gedmo\Mapping\Annotation as Gedmo;
@@ -10,7 +10,7 @@ use Doctrine\Common\Collections\ArrayCollection;
  * CQuizQuestion
  *
  * @ORM\Table(name="c_quiz_question")
- * @ORM\Entity(repositoryClass="Entity\Repository\CQuizQuestionRepository")
+ * @ORM\Entity(repositoryClass="ChamiloLMS\Entity\Repository\CQuizQuestionRepository")
  */
 class CQuizQuestion
 {

+ 2 - 2
main/inc/Entity/CQuizQuestionRelCategory.php → src/ChamiloLMS/Entity/CQuizQuestionRelCategory.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Entity;
+namespace ChamiloLMS\Entity;
 
 use Doctrine\ORM\Mapping as ORM;
 
@@ -8,7 +8,7 @@ use Doctrine\ORM\Mapping as ORM;
  * CQuizQuestionRelCategory
  *
  * @ORM\Table(name="c_quiz_question_rel_category")
- * @ORM\Entity(repositoryClass="Entity\Repository\CQuizQuestionRelCategoryRepository")
+ * @ORM\Entity(repositoryClass="ChamiloLMS\Entity\Repository\CQuizQuestionRelCategoryRepository")
  */
 class CQuizQuestionRelCategory
 {

+ 1 - 1
main/inc/Entity/CQuizRelQuestion.php → src/ChamiloLMS/Entity/CQuizRelQuestion.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Entity;
+namespace ChamiloLMS\Entity;
 
 use Doctrine\ORM\Mapping as ORM;
 

+ 1 - 1
main/inc/Entity/CTimeline.php → src/ChamiloLMS/Entity/CTimeline.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Entity;
+namespace ChamiloLMS\Entity;
 
 use Doctrine\ORM\Mapping as ORM;
 

+ 1 - 1
main/inc/Entity/CTool.php → src/ChamiloLMS/Entity/CTool.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Entity;
+namespace ChamiloLMS\Entity;
 
 use Doctrine\ORM\Mapping as ORM;
 use Symfony\Component\Validator\Constraints as Assert;

+ 1 - 1
main/inc/Entity/CToolIntro.php → src/ChamiloLMS/Entity/CToolIntro.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Entity;
+namespace ChamiloLMS\Entity;
 
 use Doctrine\ORM\Mapping as ORM;
 

+ 2 - 2
main/inc/Entity/Course.php → src/ChamiloLMS/Entity/Course.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Entity;
+namespace ChamiloLMS\Entity;
 
 use Doctrine\ORM\Mapping as ORM;
 use Doctrine\Common\Collections\ArrayCollection;
@@ -9,7 +9,7 @@ use Doctrine\Common\Collections\ArrayCollection;
  * Course
  *
  * @ORM\Table(name="course")
- * @ORM\Entity(repositoryClass="Entity\Repository\CourseRepository")
+ * @ORM\Entity(repositoryClass="ChamiloLMS\Entity\Repository\CourseRepository")
  */
 class Course
 {

+ 1 - 1
main/inc/Entity/CourseFieldValues.php → src/ChamiloLMS/Entity/CourseFieldValues.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Entity;
+namespace ChamiloLMS\Entity;
 
 use Doctrine\ORM\Mapping as ORM;
 use Gedmo\Mapping\Annotation as Gedmo;

+ 1 - 1
main/inc/Entity/CourseRelUser.php → src/ChamiloLMS/Entity/CourseRelUser.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Entity;
+namespace ChamiloLMS\Entity;
 
 use Doctrine\ORM\Mapping as ORM;
 

+ 1 - 1
main/inc/Entity/CurriculumCategory.php → src/ChamiloLMS/Entity/CurriculumCategory.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Entity;
+namespace ChamiloLMS\Entity;
 
 use Doctrine\ORM\Mapping as ORM;
 use Gedmo\Mapping\Annotation as Gedmo;

+ 1 - 1
main/inc/Entity/CurriculumItem.php → src/ChamiloLMS/Entity/CurriculumItem.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Entity;
+namespace ChamiloLMS\Entity;
 
 use Doctrine\ORM\Mapping as ORM;
 use Doctrine\Common\Collections\ArrayCollection;

+ 2 - 2
main/inc/Entity/CurriculumItemRelUser.php → src/ChamiloLMS/Entity/CurriculumItemRelUser.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Entity;
+namespace ChamiloLMS\Entity;
 
 use Doctrine\ORM\Mapping as ORM;
 
@@ -8,7 +8,7 @@ use Doctrine\ORM\Mapping as ORM;
  * CurriculumItemRelUser
  *
  * @ORM\Table(name="curriculum_item_rel_user")
- * @ORM\Entity(repositoryClass="Entity\Repository\CurriculumItemRelUserRepository")
+ * @ORM\Entity(repositoryClass="ChamiloLMS\Entity\Repository\CurriculumItemRelUserRepository")
  */
 class CurriculumItemRelUser
 {

+ 1 - 1
main/inc/Entity/CurriculumRelUser.php → src/ChamiloLMS/Entity/CurriculumRelUser.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Entity;
+namespace ChamiloLMS\Entity;
 
 use Doctrine\ORM\Mapping as ORM;
 

+ 1 - 1
main/inc/Entity/ExtraField.php → src/ChamiloLMS/Entity/ExtraField.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Entity;
+namespace ChamiloLMS\Entity;
 
 use Doctrine\ORM\Mapping as ORM;
 

+ 1 - 1
main/inc/Entity/ExtraFieldOptionRelFieldOption.php → src/ChamiloLMS/Entity/ExtraFieldOptionRelFieldOption.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Entity;
+namespace ChamiloLMS\Entity;
 
 use Doctrine\ORM\Mapping as ORM;
 

+ 1 - 1
main/inc/Entity/ExtraFieldValues.php → src/ChamiloLMS/Entity/ExtraFieldValues.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Entity;
+namespace ChamiloLMS\Entity;
 
 use Doctrine\ORM\Mapping as ORM;
 use Gedmo\Mapping\Annotation as Gedmo;

+ 1 - 1
main/inc/Entity/Groups.php → src/ChamiloLMS/Entity/Groups.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Entity;
+namespace ChamiloLMS\Entity;
 
 use Doctrine\ORM\Mapping as ORM;
 

+ 2 - 2
main/inc/Entity/Jury.php → src/ChamiloLMS/Entity/Jury.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Entity;
+namespace ChamiloLMS\Entity;
 
 use Doctrine\ORM\Mapping as ORM;
 use Doctrine\Common\Collections\ArrayCollection;
@@ -9,7 +9,7 @@ use Doctrine\Common\Collections\ArrayCollection;
  * Jury
  *
  * @ORM\Table(name="jury")
- * @ORM\Entity(repositoryClass="Entity\Repository\JuryRepository")
+ * @ORM\Entity(repositoryClass="ChamiloLMS\Entity\Repository\JuryRepository")
  */
 class Jury
 {

+ 1 - 1
main/inc/Entity/JuryMembers.php → src/ChamiloLMS/Entity/JuryMembers.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Entity;
+namespace ChamiloLMS\Entity;
 
 use Doctrine\ORM\Mapping as ORM;
 

+ 2 - 2
main/inc/Entity/Pages.php → src/ChamiloLMS/Entity/Pages.php

@@ -1,5 +1,5 @@
 <?php
-namespace Entity;
+namespace ChamiloLMS\Entity;
 
 use Gedmo\Mapping\Annotation as Gedmo;
 use Doctrine\ORM\Mapping as ORM;
@@ -10,7 +10,7 @@ use Doctrine\ORM\Mapping as ORM;
  * EntityPages
  *
  * @ORM\@Table(name="pages")
- * @ORM\Entity(repositoryClass="Entity\Repository\PagesRepository")
+ * @ORM\Entity(repositoryClass="ChamiloLMS\Entity\Repository\PagesRepository")
  * @ORM\HasLifecycleCallbacks()
  * @GRID\Source(columns="id, title")
  */

+ 1 - 1
main/inc/Entity/QuestionField.php → src/ChamiloLMS/Entity/QuestionField.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Entity;
+namespace ChamiloLMS\Entity;
 
 use Doctrine\ORM\Mapping as ORM;
 

+ 0 - 0
main/inc/Entity/QuestionFieldOptions.php → src/ChamiloLMS/Entity/QuestionFieldOptions.php


+ 1 - 1
main/inc/Entity/QuestionFieldValues.php → src/ChamiloLMS/Entity/QuestionFieldValues.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Entity;
+namespace ChamiloLMS\Entity;
 
 use Doctrine\ORM\Mapping as ORM;
 use Gedmo\Mapping\Annotation as Gedmo;

+ 2 - 2
main/inc/Entity/QuestionScore.php → src/ChamiloLMS/Entity/QuestionScore.php

@@ -1,12 +1,12 @@
 <?php
 
-namespace Entity;
+namespace ChamiloLMS\Entity;
 
 use Doctrine\ORM\Mapping as ORM;
 
 /**
  * @ORM\Table(name="question_score")
- * @ORM\Entity(repositoryClass="Entity\Repository\QuestionScoreRepository")
+ * @ORM\Entity(repositoryClass="ChamiloLMS\Entity\Repository\QuestionScoreRepository")
  */
 class QuestionScore
 {

+ 1 - 1
main/inc/Entity/QuestionScoreName.php → src/ChamiloLMS/Entity/QuestionScoreName.php

@@ -1,5 +1,5 @@
 <?php
-namespace Entity;
+namespace ChamiloLMS\Entity;
 
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\ORM\Mapping as ORM;

+ 3 - 3
main/inc/Entity/Repository/BranchSyncRepository.php → src/ChamiloLMS/Entity/Repository/BranchSyncRepository.php

@@ -1,13 +1,13 @@
 <?php
 
-namespace Entity\Repository;
+namespace ChamiloLMS\Entity\Repository;
 
 use Doctrine\Common\Collections\Criteria;
 use Gedmo\Tree\Entity\Repository\NestedTreeRepository;
 
 /**
  * Class BranchSyncRepository
- * @package Entity\Repository
+ * @package ChamiloLMS\Entity\Repository
  */
 class BranchSyncRepository extends NestedTreeRepository
 {
@@ -22,7 +22,7 @@ class BranchSyncRepository extends NestedTreeRepository
         //Selecting user info
         $qb->select('DISTINCT b');
 
-        $qb->from('Entity\BranchSync', 'b');
+        $qb->from('ChamiloLMS\Entity\BranchSync', 'b');
 
         //Selecting courses for users
         //$qb->innerJoin('u.courses', 'c');

+ 2 - 2
main/inc/Entity/Repository/CQuizCategoryRepository.php → src/ChamiloLMS/Entity/Repository/CQuizCategoryRepository.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Entity\Repository;
+namespace ChamiloLMS\Entity\Repository;
 
 use Doctrine\ORM\EntityRepository;
 use Doctrine\Common\Collections\Criteria;
@@ -12,4 +12,4 @@ use Doctrine\Common\Collections\Criteria;
 class CQuizCategoryRepository extends EntityRepository
 {
 
-}
+}

+ 2 - 2
main/inc/Entity/Repository/CQuizQuestionRelCategoryRepository.php → src/ChamiloLMS/Entity/Repository/CQuizQuestionRelCategoryRepository.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Entity\Repository;
+namespace ChamiloLMS\Entity\Repository;
 
 use Doctrine\ORM\EntityRepository;
 use Doctrine\Common\Collections\Criteria;
@@ -20,4 +20,4 @@ class CQuizQuestionRelCategoryRepository extends EntityRepository
             ->getQuery()
             ->getSingleScalarResult();
     }
-}
+}

+ 1 - 1
main/inc/Entity/Repository/CQuizQuestionRepository.php → src/ChamiloLMS/Entity/Repository/CQuizQuestionRepository.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Entity\Repository;
+namespace ChamiloLMS\Entity\Repository;
 
 use Doctrine\ORM\EntityRepository;
 use Doctrine\Common\Collections\Criteria;

+ 4 - 4
main/inc/Entity/Repository/CourseRepository.php → src/ChamiloLMS/Entity/Repository/CourseRepository.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Entity\Repository;
+namespace ChamiloLMS\Entity\Repository;
 
 use Doctrine\ORM\EntityRepository;
 use Doctrine\Common\Collections\Criteria;
@@ -25,7 +25,7 @@ class CourseRepository extends EntityRepository
         $queryBuilder->select('DISTINCT u');
 
         // Loading EntityUser.
-        $queryBuilder->from('Entity\User', 'u');
+        $queryBuilder->from('ChamiloLMS\Entity\User', 'u');
 
         // Selecting courses for users.
         $queryBuilder->innerJoin('u.courses', 'c');
@@ -63,11 +63,11 @@ class CourseRepository extends EntityRepository
 
     /**
      * Gets the students subscribed in the course
-     * @param \Entity\Course $course
+     * @param \ChamiloLMS\Entity\Course $course
      *
      * @return \Doctrine\ORM\QueryBuilder
      */
-    public function getSubscribedCoaches(Course $course)
+    public function getSubscribedCoaches(\ChamiloLMS\Entity\Course $course)
     {
         $queryBuilder = $this->getSubscribedUsers($course);
         return $queryBuilder;

+ 3 - 3
main/inc/Entity/Repository/CurriculumItemRelUserRepository.php → src/ChamiloLMS/Entity/Repository/CurriculumItemRelUserRepository.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Entity\Repository;
+namespace ChamiloLMS\Entity\Repository;
 
 use Doctrine\ORM\EntityRepository;
 use Doctrine\Common\Collections\Criteria;
@@ -14,10 +14,10 @@ class CurriculumItemRelUserRepository extends EntityRepository
     /**
      * Get all users that are registered in the course. No matter the status
      *
-     * @param \Entity\CurriculumItem $course
+     * @param \ChamiloLMS\Entity\CurriculumItem $course
      * @return bool
      */
-    public function isAllowToInsert(\Entity\CurriculumItem $item, \Entity\User $user)
+    public function isAllowToInsert(\ChamiloLMS\Entity\CurriculumItem $item, \ChamiloLMS\Entity\User $user)
     {
         $max = $item->getMaxRepeat();
         $count = $this->createQueryBuilder('a')

+ 24 - 20
main/inc/Entity/Repository/ItemPropertyRepository.php → src/ChamiloLMS/Entity/Repository/ItemPropertyRepository.php

@@ -1,8 +1,11 @@
 <?php
 
-namespace Entity\Repository;
+namespace ChamiloLMS\Entity\Repository;
 
 use Doctrine\ORM\EntityRepository;
+use ChamiloLMS\Entity\Course;
+use ChamiloLMS\Entity\Session;
+use ChamiloLMS\Entity\Group;
 
 /**
  * ItemPropertyRepository
@@ -18,13 +21,13 @@ class ItemPropertyRepository extends EntityRepository
      *
      * @param $tool learnpath | document | etc
      * @param $itemId
-     * @param \Entity\Course $course
+     * @param Course $course
      * @param int $sessionId
      * @param int $groupId
      *
      * @return \Doctrine\ORM\QueryBuilder
      */
-    public function getUsersSubscribedToItem($tool, $itemId, \Entity\Course $course, \Entity\Session $session = null, \Entity\Group $group = null)
+    public function getUsersSubscribedToItem($tool, $itemId, Course $course, Session $session = null, Group $group = null)
     {
         $criteria = array(
             'tool' => $tool,
@@ -60,11 +63,11 @@ class ItemPropertyRepository extends EntityRepository
      * Get Groups subscribed to a item: LP, Doc, etc
      * @param $tool learnpath | document | etc
      * @param $itemId
-     * @param \Entity\Course $course
-     * @param \Entity\Session $session
+     * @param Course $course
+     * @param Session $session
      * @return array
      */
-    public function getGroupsSubscribedToItem($tool, $itemId, \Entity\Course $course, \Entity\Session $session = null)
+    public function getGroupsSubscribedToItem($tool, $itemId, Course $course, Session $session = null)
     {
         $criteria = array(
             'tool' => $tool,
@@ -80,12 +83,12 @@ class ItemPropertyRepository extends EntityRepository
     /**
      * Subscribe groups to a LP, doc (itemproperty)
      * @param $tool learnpath | document | etc
-     * @param \Entity\Course $course
-     * @param \Entity\Session $session
+     * @param Course $course
+     * @param Session $session
      * @param $itemId
      * @param array $newList
      */
-    public function subscribeGroupsToItem($tool, \Entity\Course $course, \Entity\Session $session = null, $itemId, $newList = array())
+    public function subscribeGroupsToItem($tool, Course $course, Session $session = null, $itemId, $newList = array())
     {
         $em = $this->getEntityManager();
         $groupsSubscribedToItem = $this->getGroupsSubscribedToItem($tool, $itemId, $course, $session);
@@ -110,7 +113,7 @@ class ItemPropertyRepository extends EntityRepository
         foreach ($newList as $groupId) {
             if (!in_array($groupId, $alreadyAdded)) {
                 $item = new \Entity\CItemProperty($course);
-                $groupObj = $em->find('Entity\CGroupInfo', $groupId);
+                $groupObj = $em->find('ChamiloLMS\Entity\CGroupInfo', $groupId);
                 $item->setGroup($groupObj);
                 $item->setTool($tool);
                 $item->setRef($itemId);
@@ -145,12 +148,12 @@ class ItemPropertyRepository extends EntityRepository
     /**
      * Unsubscribe groups to item
      * @param $tool
-     * @param \Entity\Course $course
-     * @param \Entity\Session $session
+     * @param Course $course
+     * @param Session $session
      * @param $itemId
      * @param $groups
      */
-    function unsubscribeGroupsToItem($tool, \Entity\Course $course, \Entity\Session $session = null, $itemId, $groups, $unsubscribeUserToo = false)
+    function unsubscribeGroupsToItem($tool, Course $course, Session $session = null, $itemId, $groups, $unsubscribeUserToo = false)
     {
         if (!empty($groups)) {
             $em = $this->getEntityManager();
@@ -193,15 +196,15 @@ class ItemPropertyRepository extends EntityRepository
      * Subscribe users to a LP, doc (itemproperty)
      *
      * @param $tool
-     * @param \Entity\Course $course
-     * @param \Entity\Session $session
+     * @param Course $course
+     * @param Session $session
      * @param $itemId
      * @param array $newUserList
      */
-    public function subscribeUsersToItem($tool, \Entity\Course $course, \Entity\Session $session = null, $itemId, $newUserList = array())
+    public function subscribeUsersToItem($tool, Course $course, Session $session = null, $itemId, $newUserList = array())
     {
         $em = $this->getEntityManager();
-        $user = $em->getRepository('Entity\User');
+        $user = $em->getRepository('ChamiloLMS\Entity\User');
 
         $usersSubscribedToItem = $this->getUsersSubscribedToItem($tool, $itemId, $course, $session);
 
@@ -243,13 +246,14 @@ class ItemPropertyRepository extends EntityRepository
 
     /**
      * Unsubscribe users to item
+     *
      * @param $tool
-     * @param \Entity\Course $course
-     * @param \Entity\Session $session
+     * @param Course $course
+     * @param Session $session
      * @param $itemId
      * @param $usersToDelete
      */
-    public function unsubcribeUsersToItem($tool, \Entity\Course $course, \Entity\Session $session = null, $itemId, $usersToDelete)
+    public function unsubcribeUsersToItem($tool, Course $course, Session $session = null, $itemId, $usersToDelete)
     {
         $em = $this->getEntityManager();
 

+ 3 - 3
main/inc/Entity/Repository/JuryRepository.php → src/ChamiloLMS/Entity/Repository/JuryRepository.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Entity\Repository;
+namespace ChamiloLMS\Entity\Repository;
 
 use Doctrine\ORM\EntityRepository;
 use Doctrine\Common\Collections\Criteria;
@@ -14,7 +14,7 @@ class JuryRepository extends EntityRepository
     /**
      * Get all users that are registered in the course. No matter the status
      *
-     * @param \Entity\Course $course
+     * @param \ChamiloLMS\Entity\Course $course
      * @return \Doctrine\ORM\QueryBuilder
      */
     public function getJuryByPresidentId($userId)
@@ -25,7 +25,7 @@ class JuryRepository extends EntityRepository
         $qb->select('DISTINCT u');
 
         // Loading EntityUser
-        $qb->from('Entity\Jury', 'u');
+        $qb->from('ChamiloLMS\Entity\Jury', 'u');
 
         // Selecting members
         $qb->innerJoin('u.members', 'c');

+ 1 - 1
main/inc/Entity/Repository/LpRepository.php → src/ChamiloLMS/Entity/Repository/LpRepository.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Entity\Repository;
+namespace ChamiloLMS\Entity\Repository;
 
 use Doctrine\ORM\EntityRepository;
 

+ 1 - 1
main/inc/Entity/Repository/PagesRepository.php → src/ChamiloLMS/Entity/Repository/PagesRepository.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Entity\Repository;
+namespace ChamiloLMS\Entity\Repository;
 
 use Doctrine\ORM\EntityRepository;
 

+ 1 - 1
main/inc/Entity/Repository/QuestionScoreRepository.php → src/ChamiloLMS/Entity/Repository/QuestionScoreRepository.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Entity\Repository;
+namespace ChamiloLMS\Entity\Repository;
 
 use Doctrine\ORM\EntityRepository;
 

この差分においてかなりの量のファイルが変更されているため、一部のファイルを表示していません