Minor - flint fixes

7 years ago · 447932aa3b
parent 04cbf04fdd
commit 447932aa3b
30 changed files with 77 additions and 87 deletions
--- a/main/admin/index.php
+++ b/main/admin/index.php
@ -725,7 +725,7 @@ if (api_is_platform_admin()) {
        get_lang('Save'),
        'submit_extra_content'
    );
-//var_dump($extraContentForm->returnForm());
+
    $tpl->assign('extraDataForm', $extraContentForm->returnForm());
 }

--- a/main/course_info/infocours.php
+++ b/main/course_info/infocours.php
@ -400,7 +400,6 @@ $group[] = $form->createElement(
 );
 $globalGroup[get_lang('NewHomeworkEmailAlert')] = $group;

-
 $group = [];
 $group[] = $form->createElement(
    'radio',
@ -493,7 +492,6 @@ $form->addPanelOption(
    $globalGroup
 );

-
 $group = [];
 $group[] = $form->createElement(
    'radio',
--- a/main/inc/lib/add_course.lib.inc.php
+++ b/main/inc/lib/add_course.lib.inc.php
@ -1,10 +1,10 @@
 <?php
 /* For licensing terms, see /license.txt */

+use Chamilo\CoreBundle\Framework\Container;
 use Chamilo\CourseBundle\Entity\CTool;
 use Chamilo\CourseBundle\Entity\CToolIntro;
 use Chamilo\CourseBundle\Tool\BaseTool;
-use Chamilo\CoreBundle\Framework\Container;

 /**
 * Class AddCourse.
@ -451,38 +451,38 @@ class AddCourse
        //$toolList = $toolList->getTools();

        /** @var BaseTool $tool */
-       /* foreach ($toolList as $tool) {
-            $toolName = $tool->getName();
-            $visibility = self::string2binary(
-                api_get_setting_in_list('course.active_tools_on_create', $toolName)
-            );
-            $toolObject = new CTool();
-            $toolObject
-                ->setName($tool->getName())
-                ->setCategory($tool->getCategory())
-                ->setLink($tool->getLink())
-                ->setImage($tool->getImage())
-                ->setVisibility($visibility)
-                ->setAddedTool(0)
-                ->setAdmin(0)
-                ->setTarget($tool->getTarget())
-            ;
-            $tools[] = $toolObject;
-            //$settings = $settingsManager->load($toolName);
-            //var_dump($settings);
-            //$settingsManager->save($settings);
-        }
-
-        $course->setTools($tools);
-        $em->persist($course);
-        $em->flush($course);
-
-
-        foreach ($tools as $tool) {
-            $tool->setId($tool->getIid());
-            $em->refresh($course);
-        }
-        $em->flush($course);*/
+        /* foreach ($toolList as $tool) {
+             $toolName = $tool->getName();
+             $visibility = self::string2binary(
+                 api_get_setting_in_list('course.active_tools_on_create', $toolName)
+             );
+             $toolObject = new CTool();
+             $toolObject
+                 ->setName($tool->getName())
+                 ->setCategory($tool->getCategory())
+                 ->setLink($tool->getLink())
+                 ->setImage($tool->getImage())
+                 ->setVisibility($visibility)
+                 ->setAddedTool(0)
+                 ->setAdmin(0)
+                 ->setTarget($tool->getTarget())
+             ;
+             $tools[] = $toolObject;
+             //$settings = $settingsManager->load($toolName);
+             //var_dump($settings);
+             //$settingsManager->save($settings);
+         }
+
+         $course->setTools($tools);
+         $em->persist($course);
+         $em->flush($course);
+
+
+         foreach ($tools as $tool) {
+             $tool->setId($tool->getIid());
+             $em->refresh($course);
+         }
+         $em->flush($course);*/

        /*    Course tools  */
        /*
--- a/main/inc/lib/api.lib.php
+++ b/main/inc/lib/api.lib.php
@ -2108,7 +2108,6 @@ function api_get_url_entity($id = 0)
    return Database::getManager()->getRepository('ChamiloCoreBundle:AccessUrl')->find($id);
 }

-
 /**
 * Returns the current course info array.

--- a/main/inc/lib/display.lib.php
+++ b/main/inc/lib/display.lib.php
@ -2630,7 +2630,7 @@ class Display
            $contentClass = 'panel-collapse collapse ';
            $contentClass .= $open ? 'in' : '';
            $ariaExpanded = $open ? 'true' : 'false';
-$html = <<<HTML
+            $html = <<<HTML
            
                <div class="card" id="$id">
                    <div class="card-header">                        
--- a/main/inc/lib/template.lib.php
+++ b/main/inc/lib/template.lib.php
@ -134,7 +134,7 @@ class Template
        }

        //$this->twig = new Twig_Environment($loader, $options);
-        $this->twig  = Container::getTwig();
+        $this->twig = Container::getTwig();

        if ($isTestMode) {
            //$this->twig->addExtension(new Twig_Extension_Debug());
@ -680,6 +680,7 @@ class Template

    /**
     * Set theme, include mainstream CSS files.
+     *
     * @deprecated
     * @see setCssCustomFiles() for additional CSS sheets
     */
--- a/main/inc/lib/userportal.lib.php
+++ b/main/inc/lib/userportal.lib.php
@ -1971,7 +1971,6 @@ class IndexManager
                    }
                    $htmlSessionCategory .= '</div>'; // end session cat block
                    $htmlCategory .= Display::panel($htmlSessionCategory, '');
-
                }
                $userCategoryHtml .= $htmlCategory;
            }
--- a/main/install/index.php
+++ b/main/install/index.php
@ -789,12 +789,12 @@ if (@$_POST['step2']) {

            // No errors
            //if ($result == 0) {
-                // Boot kernel and get the doctrine from Symfony container
-                $kernel->boot();
-                $containerDatabase = $kernel->getContainer();
-                $sysPath = api_get_path(SYS_PATH);
-                updateWithContainer($containerDatabase);
-            //}
+            // Boot kernel and get the doctrine from Symfony container
+            $kernel->boot();
+            $containerDatabase = $kernel->getContainer();
+            $sysPath = api_get_path(SYS_PATH);
+            updateWithContainer($containerDatabase);
+        //}
        } else {
            set_file_folder_permissions();
            $database = connectToDatabase(
--- a/main/install/install.lib.php
+++ b/main/install/install.lib.php
@ -2993,7 +2993,7 @@ function updateEnvFile($distFile, $envFile, $params)

 /**
 * @param SymfonyContainer $container
- * @param EntityManager $manager
+ * @param EntityManager    $manager
 */
 function installGroups($container, $manager)
 {
@ -3059,7 +3059,6 @@ function installGroups($container, $manager)

 /**
 * @param SymfonyContainer $container
- *
 */
 function installPages($container)
 {
@ -3159,7 +3158,7 @@ function installPages($container)

 /**
 * @param SymfonyContainer $container
- * @param EntityManager $manager
+ * @param EntityManager    $manager
 */
 function installSchemas($container, $manager)
 {
--- a/src/CoreBundle/Controller/CourseController.php
+++ b/src/CoreBundle/Controller/CourseController.php
@ -15,7 +15,9 @@ use Symfony\Component\HttpFoundation\Response;

 /**
 * Class CourseController.
+ *
 * @Route("/course")
+ *
 * @package Chamilo\CoreBundle\Controller
 */
 class CourseController extends Controller
--- a/src/CoreBundle/Controller/FrontController.php
+++ b/src/CoreBundle/Controller/FrontController.php
@ -14,8 +14,11 @@ use Symfony\Component\HttpFoundation\Request;

 /**
 * Class FrontController.
+ *
 * @Route("/front")
+ *
 * @deprecated not used for now
+ *
 * @package Chamilo\CoreBundle\Controller
 */
 class FrontController extends Controller
--- a/src/CoreBundle/Controller/IndexController.php
+++ b/src/CoreBundle/Controller/IndexController.php
@ -4,17 +4,12 @@
 namespace Chamilo\CoreBundle\Controller;

 //use Chamilo\CoreBundle\Admin\CourseAdmin;
-use Chamilo\CoreBundle\Entity\ExtraField;
-use Chamilo\CoreBundle\Entity\ExtraFieldValues;
 use Chamilo\CoreBundle\Framework\PageController;
 use Chamilo\PageBundle\Entity\Block;
-use Chamilo\UserBundle\Entity\User;
-use Symfony\Component\Routing\Annotation\Route;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Security;
-use Sylius\Component\Attribute\AttributeType\TextAttributeType;
-use Sylius\Component\Attribute\Model\AttributeValueInterface;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\Routing\Annotation\Route;

 /**
 * Class IndexController
--- a/src/CoreBundle/Controller/ResourceController.php
+++ b/src/CoreBundle/Controller/ResourceController.php
@ -3,14 +3,15 @@

 namespace Chamilo\CoreBundle\Controller;

-use League\Flysystem\Filesystem;
 use League\Flysystem\Adapter\Local;
+use League\Flysystem\Filesystem;
 use Symfony\Component\HttpFoundation\BinaryFileResponse;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Routing\Annotation\Route;

 /**
- * Class ResourceController
+ * Class ResourceController.
+ *
 * @author Julio Montoya <gugli100@gmail.com>.
 *
 * @Route("/resource")
@ -52,7 +53,6 @@ class ResourceController extends BaseController
            /** @var Filesystem $fs */
            $fs = $this->container->get('oneup_flysystem.courses_filesystem');

-
            $path = $course.'/document/'.$file;

            // Has folder
--- a/src/CoreBundle/Controller/User/ProfileController.php
+++ b/src/CoreBundle/Controller/User/ProfileController.php
@ -18,7 +18,6 @@ class ProfileController extends BaseController
     * My files.
     *
     * @Route("/{username}/files", methods={"GET"})
-     *
     */
    public function fileAction($username)
    {
@ -52,7 +51,6 @@ class ProfileController extends BaseController
     * Gets that rm.wav sound.
     *
     * @Route("/{username}/sounds/{file}", methods={"GET"})
-     *
     */
    public function getSoundAction()
    {
--- a/src/CoreBundle/Controller/User/UserController.php
+++ b/src/CoreBundle/Controller/User/UserController.php
@ -16,13 +16,13 @@ use Symfony\Component\Routing\Annotation\Route;
 *
 * @package Chamilo\CoreBundle\Controller
 * @Route("/user")
+ *
 * @author Julio Montoya <gugli100@gmail.com>
 */
 class UserController extends BaseController
 {
    /**
     * @Route("/me", methods={"GET"})
-     *
     */
    public function indexAction(Request $request)
    {
@ -63,7 +63,6 @@ class UserController extends BaseController

    /**
     * @Route("/me/my_courses", methods={"GET"}, options={"expose"=true})
-     *
     */
    public function myCoursesAction()
    {
@ -87,7 +86,6 @@ class UserController extends BaseController

    /**
     * @Route("/online", methods={"GET"})
-     *
     */
    public function onlineAction($app)
    {
--- a/src/CoreBundle/Controller/UserPortalController.php
+++ b/src/CoreBundle/Controller/UserPortalController.php
@ -13,7 +13,9 @@ use Symfony\Component\HttpFoundation\Response;
 /**
 * Class UserPortalController
 * author Julio Montoya <gugli100@gmail.com>.
+ *
 * @Route("/userportal")
+ *
 * @package Chamilo\CoreBundle\Controller
 */
 class UserPortalController extends BaseController
--- a/src/CoreBundle/EventListener/LegacyLoginListener.php
+++ b/src/CoreBundle/EventListener/LegacyLoginListener.php
@ -10,9 +10,9 @@ use Symfony\Component\HttpFoundation\RedirectResponse;
 use Symfony\Component\HttpKernel\Event\FilterResponseEvent;
 use Symfony\Component\HttpKernel\Event\GetResponseEvent;
 use Symfony\Component\HttpKernel\KernelEvents;
+use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
 use Symfony\Component\Security\Core\Authentication\Token\UsernamePasswordToken;
 use Symfony\Component\Security\Http\Event\InteractiveLoginEvent;
-use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;

 /**
 * Class LegacyLoginListener.
--- a/src/CoreBundle/EventListener/LoginSuccessHandler.php
+++ b/src/CoreBundle/EventListener/LoginSuccessHandler.php
@ -24,7 +24,8 @@ class LoginSuccessHandler implements AuthenticationSuccessHandlerInterface
     * @param UrlGeneratorInterface         $urlGenerator
     * @param AuthorizationCheckerInterface $checker
     */
-    public function __construct(UrlGeneratorInterface $urlGenerator, AuthorizationCheckerInterface $checker) {
+    public function __construct(UrlGeneratorInterface $urlGenerator, AuthorizationCheckerInterface $checker)
+    {
        $this->router = $urlGenerator;
        $this->checker = $checker;
    }
--- a/src/CoreBundle/EventListener/LogoutSuccessHandler.php
+++ b/src/CoreBundle/EventListener/LogoutSuccessHandler.php
@ -21,9 +21,9 @@ class LogoutSuccessHandler implements LogoutSuccessHandlerInterface
    protected $storage;

    /**
-     * @param UrlGeneratorInterface $urlGenerator
-     * @param AuthorizationCheckerInterface  $checker
-     * @param TokenStorageInterface          $storage
+     * @param UrlGeneratorInterface         $urlGenerator
+     * @param AuthorizationCheckerInterface $checker
+     * @param TokenStorageInterface         $storage
     */
    public function __construct(
        UrlGeneratorInterface $urlGenerator,
--- a/src/CoreBundle/EventListener/OnlineListener.php
+++ b/src/CoreBundle/EventListener/OnlineListener.php
@ -23,7 +23,7 @@ class OnlineListener

    /**
     * @param TokenStorageInterface $context
-     * @param ObjectManager   $em
+     * @param ObjectManager         $em
     */
    public function __construct(TokenStorageInterface $context, ObjectManager $em)
    {
--- a/src/CoreBundle/Framework/Exporter.php
+++ b/src/CoreBundle/Framework/Exporter.php
@ -11,7 +11,8 @@ use Exporter\Writer\XmlWriter;
 use Symfony\Component\HttpFoundation\StreamedResponse;

 /**
- * Class Exporter
+ * Class Exporter.
+ *
 * @package Chamilo\CoreBundle\Framework\Exporter
 */
 class Exporter
--- a/src/CoreBundle/Security/Authorization/Voter/CourseVoter.php
+++ b/src/CoreBundle/Security/Authorization/Voter/CourseVoter.php
@ -6,8 +6,8 @@ namespace Chamilo\CoreBundle\Security\Authorization\Voter;
 use Chamilo\CoreBundle\Entity\Course;
 use Chamilo\CoreBundle\Entity\Manager\CourseManager;
 use Chamilo\UserBundle\Entity\User;
-use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\EntityManager;
+use Doctrine\ORM\EntityManagerInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
 use Symfony\Component\Security\Core\Authorization\Voter\Voter;
--- a/src/CoreBundle/Settings/ProfileSettingsSchema.php
+++ b/src/CoreBundle/Settings/ProfileSettingsSchema.php
@ -36,7 +36,7 @@ class ProfileSettingsSchema extends AbstractSettingsSchema
                    'enable_profile_user_address_geolocalization' => '',
                    'allow_show_skype_account' => '',
                    'allow_show_linkedin_url' => '',
-                    'is_editable' => 'true'
+                    'is_editable' => 'true',
                ]
            )
            ->setTransformer(
--- a/src/CoreBundle/Settings/SessionSettingsSchema.php
+++ b/src/CoreBundle/Settings/SessionSettingsSchema.php
@ -45,7 +45,7 @@ class SessionSettingsSchema extends AbstractSettingsSchema
                    'session_days_after_coach_access' => '',
                    'session_days_before_coach_access' => '',
                    'show_session_description' => 'false',
-                    'remove_session_url' => 'false'
+                    'remove_session_url' => 'false',
                ]
            )
        ;
--- a/src/CoreBundle/Twig/Extension/ChamiloExtension.php
+++ b/src/CoreBundle/Twig/Extension/ChamiloExtension.php
@ -27,7 +27,6 @@ class ChamiloExtension extends \Twig_Extension
            new \Twig_SimpleFilter('format_date', 'Template::format_date'),
            new \Twig_SimpleFilter('date_to_time_ago', 'Display::dateToStringAgoAndLongDate'),
            new \Twig_SimpleFilter('api_get_configuration_value', 'api_get_configuration_value'),
-
        ];
    }

--- a/src/CourseBundle/Controller/Home/HomeController.php
+++ b/src/CourseBundle/Controller/Home/HomeController.php
@ -347,7 +347,6 @@ class HomeController extends ToolBaseController

    /**
     * @Route("/{itemId}/edit", methods={"GET"})
-     *
     */
    public function editIconAction($itemId)
    {
@ -389,7 +388,6 @@ class HomeController extends ToolBaseController

    /**
     * @Route("/{itemId}/delete", methods={"GET"})
-     *
     */
    public function deleteIconAction($itemId)
    {
--- a/src/CourseBundle/Entity/CTool.php
+++ b/src/CourseBundle/Entity/CTool.php
@ -9,6 +9,7 @@ use Doctrine\ORM\Mapping as ORM;

 /**
 * CTool.
+ *
 * @ORM\HasLifecycleCallbacks
 * @ORM\Table(
 *  name="c_tool",
--- a/src/CourseBundle/Resources/config/admin.yml
+++ b/src/CourseBundle/Resources/config/admin.yml
@ -2,14 +2,14 @@ services:
    sonata.admin.course:
        class: Chamilo\CourseBundle\Admin\CourseAdmin
        tags:
-            - { name: sonata.admin, manager_type: orm, group: "LMS", label: "Course" }
+            - {name: sonata.admin, manager_type: orm, group: "LMS", label: "Course"}
        arguments:
            - ~
            - Chamilo\CoreBundle\Entity\Course
            - ~
        calls:
-            - [ setTranslationDomain, [ChamiloCoreBundle]]
-            - [ setToolChain, ['@chamilo_course.tool_chain']]
+            - [setTranslationDomain, [ChamiloCoreBundle]]
+            - [setToolChain, ['@chamilo_course.tool_chain']]

    sonata.admin.course_rel_user:
        class: Chamilo\CourseBundle\Admin\CourseRelUserAdmin
--- a/src/ThemeBundle/EventListener/TwigListener.php
+++ b/src/ThemeBundle/EventListener/TwigListener.php
@ -7,21 +7,18 @@ use Chamilo\CoreBundle\Framework\Container;
 use Symfony\Component\DependencyInjection\ContainerAwareTrait;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
-use Symfony\Component\HttpKernel\Event\FilterControllerEvent;
-use Symfony\Component\HttpKernel\Event\FilterResponseEvent;
 use Symfony\Component\HttpKernel\Event\GetResponseEvent;
 use Symfony\Component\HttpKernel\KernelEvents;
-use Symfony\Component\Routing\Route;

 class TwigListener implements EventSubscriberInterface
 {
+    use ContainerAwareTrait;
+
    public function __construct(ContainerInterface $container)
    {
        $this->container = $container;
    }

-    use ContainerAwareTrait;
-
    /**
     * @param GetResponseEvent $event
     */
@ -51,5 +48,4 @@ class TwigListener implements EventSubscriberInterface
            KernelEvents::REQUEST => [['onKernelRequest', 15]],
        ];
    }
-
 }
--- a/src/UserBundle/Admin/UserAdmin.php
+++ b/src/UserBundle/Admin/UserAdmin.php
@ -66,8 +66,8 @@ class UserAdmin extends BaseUserAdmin
                )*/
            ->add('firstname', null, ['required' => false])
            ->add('lastname', null, ['required' => false])
-            ->add('website', 'url', array('required' => false))
-            ->add('biography', 'text', array('required' => false))
+            ->add('website', 'url', ['required' => false])
+            ->add('biography', 'text', ['required' => false])
            /*->add(
                'gender',
                'sonata_user_gender',