Merge remote-tracking branch 'origin/1.11.x' into 1.11.x

main/admin/special_exports.php

@@ -12,6 +12,10 @@
 // including the global file
 $cidReset = true;
 require_once  '../inc/global.inc.php';
+
+use Chamilo\CourseBundle\Component\CourseCopy\CourseBuilder;
+use Chamilo\CourseBundle\Component\CourseCopy\CourseSelectForm;
+
 // setting the section (for the tabs)
 $this_section = SECTION_PLATFORM_ADMIN;
 // setting breadcrumbs
@@ -22,10 +26,6 @@ $nameTools = get_lang('SpecialExports');
 $export = '';
 
 // include additional libraries
-require_once '../coursecopy/classes/CourseBuilder.class.php';
-require_once '../coursecopy/classes/CourseArchiver.class.php';
-require_once '../coursecopy/classes/CourseRestorer.class.php';
-require_once '../coursecopy/classes/CourseSelectForm.class.php';
 
 if (function_exists('ini_set')) {
 	api_set_memory_limit('256M');

main/inc/lib/course.lib.php

@@ -3,6 +3,8 @@
 
 use Chamilo\CoreBundle\Entity\ExtraField as EntityExtraField;
 use ChamiloSession as Session;
+use Chamilo\CourseBundle\Component\CourseCopy\CourseBuilder;
+use Chamilo\CourseBundle\Component\CourseCopy\CourseRestorer;
 
 /**
  * Class CourseManager
@@ -141,9 +143,6 @@ class CourseManager
 
                     if ($useTemplate) {
                         // Include the necessary libraries to generate a course copy
-                        require_once api_get_path(SYS_CODE_PATH) . 'coursecopy/classes/CourseBuilder.class.php';
-                        require_once api_get_path(SYS_CODE_PATH) . 'coursecopy/classes/CourseRestorer.class.php';
-                        require_once api_get_path(SYS_CODE_PATH) . 'coursecopy/classes/CourseSelectForm.class.php';
                         // Call the course copy object
                         $originCourse['official_code'] = $originCourse['code'];
                         $cb = new CourseBuilder(null, $originCourse);
@@ -4150,10 +4149,6 @@ class CourseManager
         $destination_session_id,
         $params = array()
     ) {
-        require_once api_get_path(SYS_CODE_PATH) . 'coursecopy/classes/CourseBuilder.class.php';
-        require_once api_get_path(SYS_CODE_PATH) . 'coursecopy/classes/CourseRestorer.class.php';
-        require_once api_get_path(SYS_CODE_PATH) . 'coursecopy/classes/CourseSelectForm.class.php';
-
         $course_info = api_get_course_info($source_course_code);
 
         if (!empty($course_info)) {

main/newscorm/learnpath.class.php

@@ -3,6 +3,8 @@
 
 use Chamilo\CourseBundle\Entity\CLpCategory;
 use ChamiloSession as Session;
+use Chamilo\CourseBundle\Component\CourseCopy\CourseBuilder;
+use Chamilo\CourseBundle\Component\CourseCopy\CourseRestorer;
 
 /**
  * Class learnpath
@@ -10237,10 +10239,6 @@ EOD;
     public function copy()
     {
         $main_path = api_get_path(SYS_CODE_PATH);
-        require_once $main_path.'coursecopy/classes/CourseBuilder.class.php';
-        require_once $main_path.'coursecopy/classes/CourseArchiver.class.php';
-        require_once $main_path.'coursecopy/classes/CourseRestorer.class.php';
-        require_once $main_path.'coursecopy/classes/CourseSelectForm.class.php';
 
         //Course builder
         $cb = new CourseBuilder();

src/Chamilo/CourseBundle/Component/CourseCopy/Resources/DummyCourseCreator.php

@@ -2,6 +2,8 @@
 /* For licensing terms, see /license.txt */
 
 namespace Chamilo\CourseBundle\Component\CourseCopy\Resources;
+use Chamilo\CourseBundle\Component\CourseCopy\Course;
+use Chamilo\CourseBundle\Component\CourseCopy\CourseRestorer;
 
 /**
  * Dummy course creator