Update old lib files

main/inc/lib/course.lib.php

@@ -1,6 +1,7 @@
 <?php
 /* For licensing terms, see /license.txt*/
 
+use Chamilo\CourseBundle\ToolChain;
 use Chamilo\CoreBundle\Entity\ExtraField as EntityExtraField;
 use ChamiloSession as Session;
 use Chamilo\CourseBundle\Component\CourseCopy\CourseBuilder;
@@ -29,6 +30,55 @@ class CourseManager
     const USER_SEPARATOR = ' |';
     const COURSE_FIELD_TYPE_CHECKBOX = 10;
     public $columns = [];
+    public static $em;
+    private static $manager;
+    public static $toolList;
+    public static $courseSettingsManager;
+
+    /**
+     * @param \Doctrine\ORM\EntityManager
+     */
+    public static function setEntityManager($em)
+    {
+        self::$em = $em;
+    }
+
+    /**
+     * @return \Doctrine\ORM\EntityManager
+     */
+    public static function getEntityManager()
+    {
+        return self::$em;
+    }
+
+    public static function setCourseManager($manager)
+    {
+        self::$manager = $manager;
+    }
+
+    /**
+     * @return SettingsManager
+     */
+    public static function getCourseSettingsManager()
+    {
+        return self::$courseSettingsManager;
+    }
+
+    /**
+     * @param SettingsManager $courseSettingsManager
+     */
+    public static function setCourseSettingsManager($courseSettingsManager)
+    {
+        self::$courseSettingsManager = $courseSettingsManager;
+    }
+
+    /**
+     * @return Chamilo\CoreBundle\Entity\Manager\CourseManager
+     */
+    public static function getManager()
+    {
+        return self::$manager;
+    }
 
     /**
      * Creates a course
@@ -6485,4 +6535,20 @@ class CourseManager
         }
         return '';
     }
+
+    /**
+     * @param ToolChain $toolList
+     */
+    public static function setToolList($toolList)
+    {
+        self::$toolList = $toolList;
+    }
+
+    /**
+     * @return ToolChain
+     */
+    public static function getToolList()
+    {
+        return self::$toolList;
+    }
 }

main/inc/lib/database.lib.php

@@ -143,6 +143,7 @@ class Database
 
         $config->setEntityNamespaces(
             array(
+                'ChamiloPageBundle' => 'Chamilo\PageBundle\Entity',
                 'ChamiloUserBundle' => 'Chamilo\UserBundle\Entity',
                 'ChamiloCoreBundle' => 'Chamilo\CoreBundle\Entity',
                 'ChamiloCourseBundle' => 'Chamilo\CourseBundle\Entity',
@@ -156,38 +157,34 @@ class Database
         $entityManager = EntityManager::create($params, $config);
         $sysPath = !empty($sysPath) ? $sysPath : api_get_path(SYS_PATH);
 
-        // Registering Constraints
-        /*AnnotationRegistry::registerAutoloadNamespace(
-            'Symfony\Component',
-            $sysPath."vendor/"
-        );*/
-
-        AnnotationRegistry::registerLoader(
-            function ($class) use ($sysPath) {
-                $file = str_replace("\\", DIRECTORY_SEPARATOR, $class).".php";
-                $file = str_replace('Symfony/Component/Validator', '', $file);
-                $file = str_replace('Symfony\Component\Validator', '', $file);
-                $fileToInclude = $sysPath.'vendor/symfony/validator/'.$file;
-
-                if (file_exists($fileToInclude)) {
-                    // file exists makes sure that the loader fails silently
-                    require_once $fileToInclude;
-
-                    return true;
-                }
-
-                $fileToInclude = $sysPath.'vendor/symfony/validator/Constraints/'.$file;
-                if (file_exists($fileToInclude)) {
-                    // file exists makes sure that the loader fails silently
-                    require_once $fileToInclude;
-
-                    return true;
+        $uniqueEntityPath = $sysPath.'vendor/symfony/symfony/src/Symfony/Bridge/Doctrine/Validator/Constraints/UniqueEntity.php';
+
+        // Folder symfony/symfony/src doesn't exists in chash use the component folder
+        if (!file_exists($uniqueEntityPath)) {
+            $uniqueEntityPath = $sysPath.'vendor/symfony/doctrine-bridge/Validator/Constraints/UniqueEntity.php';
+
+            AnnotationRegistry::registerLoader(
+                function ($class) use ($sysPath) {
+                    $file = str_replace("\\", DIRECTORY_SEPARATOR, $class).".php";
+                    $file = str_replace('Symfony/Component/Validator', '', $file);
+                    $file = $sysPath.'vendor/symfony/validator'.$file;
+                    if (file_exists($file)) {
+                        // file exists makes sure that the loader fails silently
+                        require_once $file;
+                        return true;
+                    }
                 }
-            }
-        );
+            );
+        } else {
+            // Registering Constraints
+            AnnotationRegistry::registerAutoloadNamespace(
+                'Symfony\Component\Validator\Constraint',
+                $sysPath.'vendor/symfony/symfony/src'
+            );
+        }
 
         AnnotationRegistry::registerFile(
-            $sysPath."vendor/symfony/doctrine-bridge/Validator/Constraints/UniqueEntity.php"
+            $uniqueEntityPath
         );
 
         // Registering gedmo extensions
@@ -719,19 +716,19 @@ class Database
         $paths = array(
             //$path.'src/Chamilo/ClassificationBundle/Entity',
             //$path.'src/Chamilo/MediaBundle/Entity',
-            //$path.'src/Chamilo/PageBundle/Entity',
-            $path.'src/Chamilo/CoreBundle/Entity',
-            $path.'src/Chamilo/UserBundle/Entity',
-            $path.'src/Chamilo/CourseBundle/Entity',
-            $path.'src/Chamilo/TicketBundle/Entity',
-            $path.'src/Chamilo/SkillBundle/Entity',
-            $path.'src/Chamilo/PluginBundle/Entity',
+            $path.'src/PageBundle/Entity',
+            $path.'src/CoreBundle/Entity',
+            $path.'src/UserBundle/Entity',
+            $path.'src/CourseBundle/Entity',
+            $path.'src/TicketBundle/Entity',
+            $path.'src/SkillBundle/Entity',
+            $path.'src/PluginBundle/Entity',
             //$path.'vendor/sonata-project/user-bundle/Entity',
             //$path.'vendor/sonata-project/user-bundle/Model',
             //$path.'vendor/friendsofsymfony/user-bundle/FOS/UserBundle/Entity',
         );
 
-        $proxyDir = $path.'app/cache/';
+        $proxyDir = $path.'var/cache/';
 
         $config = \Doctrine\ORM\Tools\Setup::createAnnotationMetadataConfiguration(
             $paths,

main/inc/lib/template.lib.php

@@ -615,6 +615,52 @@ class Template
         $this->assign('_s', $_s);
     }
 
+    /**
+     * Set legacy twig globals in order to be hook in the LegacyListener.php
+     * @return array
+     */
+    public static function getGlobals()
+    {
+        $_p = array(
+            'web' => api_get_path(WEB_PATH),
+            'web_relative' => api_get_path(REL_PATH),
+            'web_course' => api_get_path(WEB_COURSE_PATH),
+            'web_main' => api_get_path(WEB_CODE_PATH),
+            'web_css' => api_get_path(WEB_CSS_PATH),
+            //'web_css_theme' => api_get_path(WEB_CSS_PATH) . 'themes/' . $this->theme . '/',
+            'web_ajax' => api_get_path(WEB_AJAX_PATH),
+            'web_img' => api_get_path(WEB_IMG_PATH),
+            'web_plugin' => api_get_path(WEB_PLUGIN_PATH),
+            'web_plugin_asset' => api_get_path(WEB_PLUGIN_ASSET_PATH),
+            'web_lib' => api_get_path(WEB_LIBRARY_PATH),
+            'web_upload' => api_get_path(WEB_UPLOAD_PATH),
+            'web_self' => api_get_self(),
+            'web_query_vars' => api_htmlentities($_SERVER['QUERY_STRING']),
+            'web_self_query_vars' => api_htmlentities($_SERVER['REQUEST_URI']),
+            'web_cid_query' => api_get_cidreq(),
+        );
+
+        $_s = array(
+            'software_name' => api_get_configuration_value('software_name'),
+            'system_version' => api_get_configuration_value('system_version'),
+            'site_name' => api_get_setting('siteName'),
+            'institution' => api_get_setting('Institution'),
+            'date' => api_format_date('now', DATE_FORMAT_LONG),
+            'timezone' => api_get_timezone(),
+            'gamification_mode' => api_get_setting('gamification_mode')
+        );
+
+        //$user_info = api_get_user_info();
+
+        return [
+            '_p' => $_p,
+            '_s' => $_s,
+            //       '_u' => $user_info,
+            'template' => 'default' // @todo setup template folder in config.yml;
+        ];
+    }
+
+
     /**
      * Set theme, include mainstream CSS files
      * @return void