Internal - Add travis behat, fix course creation, add psalm checks

Author: jmontoyaa

.travis.yml

@@ -102,6 +102,7 @@ script:
   - sed -i "s/APP_ENV='dev'/APP_ENV='test'/g" .env.local
   - cd tests/behat
   - ../../vendor/behat/behat/bin/behat features/adminFillUsers.feature -vvv
+  - ../../vendor/behat/behat/bin/behat features/actionUserLogin.feature -vvv
   - ../../vendor/behat/behat/bin/behat features/adminSettings.feature -vvv
   - ../../vendor/behat/behat/bin/behat features/career.feature -vvv
   - ../../vendor/behat/behat/bin/behat features/class.feature -vvv
@@ -114,7 +115,7 @@ script:
 #  - ../../vendor/behat/behat/bin/behat features/profile.feature -v
 #  - ../../vendor/behat/behat/bin/behat features/promotion.feature -v
 #  - ../../vendor/behat/behat/bin/behat features/registration.feature -v
-#  - ../../vendor/behat/behat/bin/behat features/sessionAccess.feature -v
+  - ../../vendor/behat/behat/bin/behat features/sessionAccess.feature -v
 #  - ../../vendor/behat/behat/bin/behat features/sessionManagement.feature -v
 #  - ../../vendor/behat/behat/bin/behat features/socialGroup.feature -v
 #  - ../../vendor/behat/behat/bin/behat features/systemAnnouncements.feature -v

public/main/admin/course_add.php

@@ -2,9 +2,6 @@
 
 /* For licensing terms, see /license.txt */
 
-use Chamilo\CoreBundle\Entity\CourseCategory;
-use Chamilo\CoreBundle\Repository\CourseCategoryRepository;
-
 $cidReset = true;
 require_once __DIR__.'/../inc/global.inc.php';
 $this_section = SECTION_PLATFORM_ADMIN;
@@ -16,8 +13,6 @@
 $interbreadcrumb[] = ['url' => 'course_list.php', 'name' => get_lang('Course list')];
 
 $em = Database::getManager();
-/** @var CourseCategoryRepository $courseCategoriesRepo */
-$courseCategoriesRepo = $em->getRepository('ChamiloCoreBundle:CourseCategory');
 // Get all possible teachers.
 $accessUrlId = api_get_current_access_url_id();
 

public/main/admin/course_category.php

@@ -49,10 +49,10 @@
             $ret = $categoryInfo['id'];
 
             //Delete Picture Category
-            $deletePicture = isset($_POST['delete_picture']) ? $_POST['delete_picture'] : '';
+            /*$deletePicture = isset($_POST['delete_picture']) ? $_POST['delete_picture'] : '';
             if ($deletePicture) {
                 CourseCategory::deletePictureCategory($ret);
-            }
+            }*/
 
             $errorMsg = Display::return_message(get_lang('Update successful'));
         }

public/main/admin/course_edit.php

@@ -2,10 +2,7 @@
 
 /* For licensing terms, see /license.txt */
 
-use Chamilo\CoreBundle\Entity\CourseCategory;
 use Chamilo\CoreBundle\Entity\User;
-use Chamilo\CoreBundle\Repository\CourseCategoryRepository;
-use Chamilo\CoreBundle\Repository\CourseRepository;
 use Chamilo\CoreBundle\Framework\Container;
 
 $cidReset = true;
@@ -164,7 +161,7 @@
     $courseCategoryNames,
     [
         'url' => api_get_path(WEB_AJAX_PATH).'course.ajax.php?a=search_category',
-        'multiple' => 'multiple'
+        'multiple' => 'multiple',
     ]
 );
 $courseInfo['course_categories'] = $courseCategoryIds;
@@ -297,7 +294,8 @@
     $course = $form->getSubmitValues();
     $visibility = $course['visibility'];
 
-    global $_configuration;
+    // @todo should be check in the CourseListener
+    /*global $_configuration;
 
     if (isset($_configuration[$urlId]) &&
         isset($_configuration[$urlId]['hosting_limit_active_courses']) &&
@@ -312,14 +310,18 @@
                 api_warn_hosting_contact('hosting_limit_active_courses');
 
                 Display::addFlash(
-                    Display::return_message(get_lang('Sorry, this installation has an active courses limit, which has now been reached. You can still create new courses, but only if you hide/disable at least one existing active course. To do this, edit a course from the administration courses list, and change the visibility to \'hidden\', then try creating this course again. To increase the maximum number of active courses allowed on this Chamilo installation, please contact your hosting provider or, if available, upgrade to a superior hosting plan.'))
+                    Display::return_message(
+                        get_lang(
+                            'Sorry, this installation has an active courses limit, which has now been reached. You can still create new courses, but only if you hide/disable at least one existing active course. To do this, edit a course from the administration courses list, and change the visibility to \'hidden\', then try creating this course again. To increase the maximum number of active courses allowed on this Chamilo installation, please contact your hosting provider or, if available, upgrade to a superior hosting plan.'
+                        )
+                    )
                 );
 
                 header('Location: course_list.php');
                 exit;
             }
         }
-    }
+    }*/
 
     $visual_code = $course['visual_code'];
     $visual_code = CourseManager::generate_course_code($visual_code);

public/main/admin/course_list.php

@@ -103,7 +103,7 @@ function get_course_data($from, $number_of_items, $column, $direction, $dataFunc
                 unsubscribe LIKE '".$keyword_unsubscribe."'";
 
         if (!empty($keyword_category)) {
-            $sql .= " AND category.id = ".$keyword_category . " ";
+            $sql .= " AND category.id = ".$keyword_category." ";
         }
     }
 
@@ -141,7 +141,7 @@ function get_course_data($from, $number_of_items, $column, $direction, $dataFunc
         // get categories
         $sqlCategoriesByCourseId = "SELECT category.name FROM $tblCourseCategory category
             INNER JOIN $tblCourseRelCategory course_rel_category ON category.id = course_rel_category.course_category_id
-            WHERE course_rel_category.course_id = " . $course['id'];
+            WHERE course_rel_category.course_id = ".$course['id'];
         $resultCategories = Database::query($sqlCategoriesByCourseId);
         $categories = [];
 
@@ -151,7 +151,7 @@ function get_course_data($from, $number_of_items, $column, $direction, $dataFunc
 
         // Place colour icons in front of courses.
         $show_visual_code = $course['visual_code'] != $course[2] ? Display::label($course['visual_code'], 'info') : null;
-        $course[1] = get_course_visibility_icon($course[8]).PHP_EOL
+        $course[1] = get_course_visibility_icon($courseInfo['visibility']).PHP_EOL
             .Display::url(Security::remove_XSS($course[1]), $courseInfo['course_public_url']).PHP_EOL
             .$show_visual_code;
         $course[5] = SUBSCRIBE_ALLOWED == $course[5] ? get_lang('Yes') : get_lang('No');
@@ -260,7 +260,7 @@ function get_course_data_by_session($from, $number_of_items, $column, $direction
     while ($course = Database::fetch_array($res)) {
         // Place colour icons in front of courses.
         $showVisualCode = $course['visual_code'] != $course[2] ? Display::label($course['visual_code'], 'info') : null;
-        $course[1] = get_course_visibility_icon($course[8]).
+        $course[1] = get_course_visibility_icon($course['col8']).
             '<a href="'.$courseUrl.$course[9].'/index.php">'.
             $course[1].
             '</a> '.
@@ -286,12 +286,14 @@ function get_course_data_by_session($from, $number_of_items, $column, $direction
 /**
  * Return an icon representing the visibility of the course.
  *
- * @param string $visibility
+ * @param int $visibility
  *
  * @return string
  */
 function get_course_visibility_icon($visibility)
 {
+    $visibility = (int) $visibility;
+
     $style = 'margin-bottom:0;margin-right:5px;';
     switch ($visibility) {
         case 0:
@@ -453,8 +455,7 @@ function get_course_visibility_icon($visibility)
         FormValidator::LAYOUT_INLINE
     );
     $url = api_get_path(WEB_AJAX_PATH).'session.ajax.php?a=search_session';
-    $sessionSelect = $sessionFilter->addElement(
-        'select_ajax',
+    $sessionSelect = $sessionFilter->addSelectAjax(
         'session_name',
         get_lang('Search course by session'),
         null,
@@ -504,7 +505,6 @@ function get_course_visibility_icon($visibility)
                 if (!sessionId) {
                     return;
                 }
-
                 window.location = "'.$courseListUrl.'?session_id="+sessionId;
             });
         });

public/main/admin/course_request_edit.php

@@ -15,7 +15,7 @@
 api_protect_admin_script();
 
 // A check whether the course validation feature is enabled.
-$course_validation_feature = 'true' == api_get_setting('course_validation');
+$course_validation_feature = 'true' === api_get_setting('course_validation');
 
 // Filtering passed to this page parameters.
 $id = (int) ($_GET['id']);
@@ -55,8 +55,7 @@
         // Course category.
         $url = api_get_path(WEB_AJAX_PATH).'course.ajax.php?a=search_category';
 
-        $courseSelect = $form->addElement(
-            'select_ajax',
+        $courseSelect = $form->addSelectAjax(
             'category_code',
             get_lang('Category'),
             null,
@@ -69,7 +68,12 @@
         }
 
         // Course code.
-        $form->addText('wanted_code', get_lang('Course code'), false, ['size' => '$maxlength', 'maxlength' => $maxlength]);
+        $form->addText(
+            'wanted_code',
+            get_lang('Course code'),
+            false,
+            ['size' => '$maxlength', 'maxlength' => $maxlength]
+        );
         $form->applyFilter('wanted_code', 'html_filter');
         $form->addRule('wanted_code', get_lang('max. 20 characters, e.g. <i>INNOV21</i>'), 'maxlength', $maxlength);
         $form->addRule('wanted_code', get_lang('Required field'), 'required');

public/main/admin/extra_field_workflow.php

@@ -93,20 +93,20 @@ function setHidden(obj) {
         }
     }
 
-    $(function() {        
+    $(function() {
         $("#workflow_status").on("change", function() {
-            var roleId = $(this).find(":selected").val();            
+            var roleId = $(this).find(":selected").val();
             if (roleId != 0) {
                 window.location.replace("'.api_get_self().'?'.$paramsNoRole.'&roleId="+roleId);
             }
         });
-        
+
         $("[name=select_all]").on("click", function() {
             $("#workflow :checkbox").prop("checked", 1);
             $("#workflow :hidden").prop("value", 1);
             return false;
         });
-        
+
         $("[name=unselect_all]").on("click", function() {
             $("#workflow :checkbox").prop("checked", 0);
             $("#workflow :hidden").prop("value", 0);
@@ -147,7 +147,7 @@ function setHidden(obj) {
 $form->addElement('select', 'status', get_lang('Select role'), $options);
 
 $em = Database::getManager();
-$repo = $em->getRepository('ChamiloCoreBundle:ExtraFieldOptionRelFieldOption');
+$repo = $em->getRepository(ExtraFieldOptionRelFieldOption::class);
 
 $checks = $repo->findBy(
     ['fieldId' => $field_id, 'roleId' => $roleId]

public/main/admin/gradebook_dependency.php

@@ -15,7 +15,7 @@
 $categoryId = isset($_REQUEST['id']) ? (int) $_REQUEST['id'] : 1;
 
 $em = Database::getManager();
-$repo = $em->getRepository('ChamiloCoreBundle:GradebookCategory');
+$repo = $em->getRepository(GradebookCategory::class);
 /** @var GradebookCategory $category */
 $category = $repo->find($categoryId);
 if (!$category) {

public/main/admin/gradebook_list.php

@@ -16,7 +16,7 @@
 }
 
 $em = Database::getManager();
-$repo = $em->getRepository('ChamiloCoreBundle:GradebookCategory');
+$repo = $em->getRepository(GradebookCategory::class);
 
 $maxItems = 20;
 
@@ -178,7 +178,7 @@
             );
             $form->addText('name', get_lang('Name'));
             $form->addText('weight', get_lang('Weight'));
-            $form->addLabel(get_lang('Course'), $category->getCourseCode());
+            $form->addLabel(get_lang('Course'), $category->getCourse()->getCode());
 
             $sql = "SELECT
                         depends,

public/main/admin/index.php

@@ -434,7 +434,7 @@
         'label' => get_lang('Tickets'),
     ];
 
-    if (true == api_get_configuration_value('db_manager_enabled') &&
+    /*if (true == api_get_configuration_value('db_manager_enabled') &&
         api_is_global_platform_admin()
     ) {
         $host = $_configuration['db_host'];
@@ -445,7 +445,7 @@
             'url' => "db.php?username=$username&db=$databaseName&server=$host",
             'label' => get_lang('Database manager'),
         ];
-    }
+    }*/
 
     $blocks['settings']['items'] = $items;
     $blocks['settings']['extra'] = null;