diff --git a/main/admin/index.php b/main/admin/index.php
index 3bd5a616b7..9865fde252 100644
--- 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());
}
diff --git a/main/course_info/infocours.php b/main/course_info/infocours.php
index f9a405ec92..8820ccebd5 100755
--- 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',
diff --git a/main/inc/lib/add_course.lib.inc.php b/main/inc/lib/add_course.lib.inc.php
index 2050e47dd0..2965f16f50 100755
--- a/main/inc/lib/add_course.lib.inc.php
+++ b/main/inc/lib/add_course.lib.inc.php
@@ -1,10 +1,10 @@
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 */
/*
diff --git a/main/inc/lib/api.lib.php b/main/inc/lib/api.lib.php
index 9de7793a52..2113dea77c 100644
--- 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.
diff --git a/main/inc/lib/display.lib.php b/main/inc/lib/display.lib.php
index 01c34d18ff..42e95c264c 100755
--- 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 = <<
'; // end session cat block
$htmlCategory .= Display::panel($htmlSessionCategory, '');
-
}
$userCategoryHtml .= $htmlCategory;
}
diff --git a/main/install/index.php b/main/install/index.php
index 7c0bad9dcf..0e4bf03150 100755
--- 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(
diff --git a/main/install/install.lib.php b/main/install/install.lib.php
index 918dcbe103..e32a13b4ac 100755
--- 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)
{
diff --git a/src/CoreBundle/Controller/CourseController.php b/src/CoreBundle/Controller/CourseController.php
index 01580a00cb..61a670d868 100644
--- 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
diff --git a/src/CoreBundle/Controller/FrontController.php b/src/CoreBundle/Controller/FrontController.php
index 888059f58e..3debd28479 100644
--- 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
diff --git a/src/CoreBundle/Controller/IndexController.php b/src/CoreBundle/Controller/IndexController.php
index 0b8eb7f75d..6f0b8995f5 100644
--- 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
diff --git a/src/CoreBundle/Controller/ResourceController.php b/src/CoreBundle/Controller/ResourceController.php
index 7a288f88b0..a5558e3a62 100644
--- 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 .
*
* @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
diff --git a/src/CoreBundle/Controller/User/ProfileController.php b/src/CoreBundle/Controller/User/ProfileController.php
index 1e069f9dd7..f347f208af 100644
--- 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()
{
diff --git a/src/CoreBundle/Controller/User/UserController.php b/src/CoreBundle/Controller/User/UserController.php
index bc99fd5dd3..b7978c9cc7 100644
--- 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
*/
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)
{
diff --git a/src/CoreBundle/Controller/UserPortalController.php b/src/CoreBundle/Controller/UserPortalController.php
index 13076ffa86..efa589bb69 100644
--- 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 .
+ *
* @Route("/userportal")
+ *
* @package Chamilo\CoreBundle\Controller
*/
class UserPortalController extends BaseController
diff --git a/src/CoreBundle/EventListener/LegacyLoginListener.php b/src/CoreBundle/EventListener/LegacyLoginListener.php
index c35106de03..4a2321171d 100644
--- 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.
diff --git a/src/CoreBundle/EventListener/LoginSuccessHandler.php b/src/CoreBundle/EventListener/LoginSuccessHandler.php
index adc9cf5360..3dd2772761 100644
--- 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;
}
diff --git a/src/CoreBundle/EventListener/LogoutSuccessHandler.php b/src/CoreBundle/EventListener/LogoutSuccessHandler.php
index ec38733243..e5af74db32 100644
--- 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,
diff --git a/src/CoreBundle/EventListener/OnlineListener.php b/src/CoreBundle/EventListener/OnlineListener.php
index b6e146b74c..14cf79c3ed 100644
--- 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)
{
diff --git a/src/CoreBundle/Framework/Exporter.php b/src/CoreBundle/Framework/Exporter.php
index 31029348be..114c821818 100644
--- 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
diff --git a/src/CoreBundle/Security/Authorization/Voter/CourseVoter.php b/src/CoreBundle/Security/Authorization/Voter/CourseVoter.php
index 3d2081a796..568a0b9154 100644
--- 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;
diff --git a/src/CoreBundle/Settings/ProfileSettingsSchema.php b/src/CoreBundle/Settings/ProfileSettingsSchema.php
index dbdff2f6a8..4d49f7d3f8 100644
--- 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(
diff --git a/src/CoreBundle/Settings/SessionSettingsSchema.php b/src/CoreBundle/Settings/SessionSettingsSchema.php
index 4fdb78337b..9d97d1987f 100644
--- 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',
]
)
;
diff --git a/src/CoreBundle/Twig/Extension/ChamiloExtension.php b/src/CoreBundle/Twig/Extension/ChamiloExtension.php
index bf2e0a1544..31111e16f7 100644
--- 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'),
-
];
}
diff --git a/src/CourseBundle/Controller/Home/HomeController.php b/src/CourseBundle/Controller/Home/HomeController.php
index 7095723f3d..fc6fee63d4 100644
--- 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)
{
diff --git a/src/CourseBundle/Entity/CTool.php b/src/CourseBundle/Entity/CTool.php
index ba051dcc40..d2b49e3834 100644
--- 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",
diff --git a/src/CourseBundle/Resources/config/admin.yml b/src/CourseBundle/Resources/config/admin.yml
index a5007a23d7..f1fd287971 100644
--- 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
diff --git a/src/ThemeBundle/EventListener/TwigListener.php b/src/ThemeBundle/EventListener/TwigListener.php
index c75c35d6a5..ca973647f4 100644
--- 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]],
];
}
-
}
diff --git a/src/UserBundle/Admin/UserAdmin.php b/src/UserBundle/Admin/UserAdmin.php
index b624f1992d..f0f0b737a5 100644
--- 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',